gephex--main--0.4--patch-1805
[email protected] Fri, 15 Oct 2004 15:04:31 +0200 (CEST)
Newsgroups
gmane.comp.video.gephex.devel
Message-ID
<[email protected] >
Archive: [email protected]
New revision: gephex--main--0.4--patch-1805
--
Revision: gephex--main--0.4--patch-1805
Archive: [email protected]
Creator: GePhex <[email protected] >
Date: Fri Oct 15 15:03:48 CEST 2004
Standard-date: 2004-10-15 13:03:48 GMT
New-files: modules/src/ffmpegoutmodule/.arch-ids/ffmpegoutmodule.dsp.id
modules/src/ffmpegoutmodule/ffmpegoutmodule.dsp
modules/src/libcolorconv/.arch-ids/libcolorconv.dep.id
modules/src/libcolorconv/.arch-ids/libcolorconv.mak.id
modules/src/libcolorconv/libcolorconv.dep
modules/src/libcolorconv/libcolorconv.mak
modules/src/noisemodule/.arch-ids/noisemodule.dep.id
modules/src/noisemodule/.arch-ids/noisemodule.dsp.id
modules/src/noisemodule/.arch-ids/noisemodule.mak.id
modules/src/noisemodule/noisemodule.dep
modules/src/noisemodule/noisemodule.dsp
modules/src/noisemodule/noisemodule.mak
modules/src/y4minmodule/.arch-ids/=id
modules/src/y4minmodule/.arch-ids/Makefile.am.id
modules/src/y4minmodule/.arch-ids/y4minmodule.c.id
modules/src/y4minmodule/.arch-ids/y4minmodule.dep.id
modules/src/y4minmodule/.arch-ids/y4minmodule.dsp.id
modules/src/y4minmodule/.arch-ids/y4minmodule.mak.id
modules/src/y4minmodule/.arch-ids/y4minmodule.spec.id
modules/src/y4minmodule/.arch-ids/y4minmodule.xpm.id
modules/src/y4minmodule/Makefile.am
modules/src/y4minmodule/y4minmodule.c
modules/src/y4minmodule/y4minmodule.dep
modules/src/y4minmodule/y4minmodule.dsp
modules/src/y4minmodule/y4minmodule.mak
modules/src/y4minmodule/y4minmodule.spec
modules/src/y4minmodule/y4minmodule.xpm
modules/src/yuv4mpeg2module/.arch-ids/y4moutputmodule.dep.id
modules/src/yuv4mpeg2module/.arch-ids/y4moutputmodule.dsp.id
modules/src/yuv4mpeg2module/.arch-ids/y4moutputmodule.mak.id
modules/src/yuv4mpeg2module/y4moutputmodule.dep
modules/src/yuv4mpeg2module/y4moutputmodule.dsp
modules/src/yuv4mpeg2module/y4moutputmodule.mak
util/src/libjoystick/.arch-ids/directinjoystickdriver.cpp.id
util/src/libjoystick/.arch-ids/directinjoystickdriver.h.id
util/src/libjoystick/directinjoystickdriver.cpp
util/src/libjoystick/directinjoystickdriver.h
New-directories: modules/src/y4minmodule
modules/src/y4minmodule/.arch-ids
Modified-files: base/src/net/protocol.cpp
build/dummy/dummy.dep build/dummy/dummy.mak
build/gephex.dsw config_h.win32 configure.ac
modules/pluc.py modules/src/Makefile.am
modules/src/ffmpegoutmodule/Makefile.am
modules/src/ffmpegoutmodule/ffmpegoutmodule.cpp
modules/src/frboutmodule/gdioutput.c
modules/src/gradnormmodule/gradnormmodule.cpp
modules/src/ifsmodule/ifsmodule.cpp
modules/src/joystickmodule/Makefile.am
modules/src/joystickmodule/joystickmodule.cpp
modules/src/joystickmodule/joystickmodule.dep
modules/src/joystickmodule/joystickmodule.dsp
modules/src/joystickmodule/joystickmodule.mak
modules/src/joystickmodule/joystickmodule.spec
modules/src/libcolorconv/Makefile.am
modules/src/libcolorconv/libcolorconv.h
modules/src/noisemodule/Makefile.am
modules/src/noisemodule/noisemodule.cpp
modules/src/overlaymodule/overlaymodule.cpp
modules/src/yuv4mpeg2module/Makefile.am
modules/src/yuv4mpeg2module/y4moutputmodule.cpp
types/src/framebuffertype/framebuffertype.h
util/include/basic_types.h
util/src/libjoystick/libjoystick.cpp
util/src/libjoystick/libjoystick.dep
util/src/libjoystick/libjoystick.mak
util/src/libjoystick/win32joystickdriver.cpp
New-patches: [email protected] /gephex--georg--0.4--patch-297
[email protected] /gephex--georg--0.4--patch-298
[email protected] /gephex--georg--0.4--patch-299
[email protected] /gephex--georg--0.4--patch-300
[email protected] /gephex--georg--0.4--patch-301
[email protected] /gephex--georg--0.4--patch-302
[email protected] /gephex--georg--0.4--patch-303
[email protected] /gephex--georg--0.4--patch-304
[email protected] /gephex--georg--0.4--patch-305
[email protected] /gephex--georg--0.4--patch-306
[email protected] /gephex--main--0.4--patch-1805
Summary: added y4minputmodule, included y4minput, y4moutput and noisemodule to vs6 build, added support for more buttons to win32 joystick driver
Keywords:
Patches applied:
* [email protected] /gephex--georg--0.4--patch-297
Merge in --main--
* [email protected] /gephex--georg--0.4--patch-298
First version of the y4mpeg2 input module
* [email protected] /gephex--georg--0.4--patch-299
Add vs6 dsp files for noisemodule, y4m in and out module to dist
* [email protected] /gephex--georg--0.4--patch-300
Miscelleanous win32 build fixes (_MSC_VER == 1200 instead of 1100)
* [email protected] /gephex--georg--0.4--patch-301
Build fixes for win32, includes noisemodule and yuv4mpeg in and output modules into win32 build
* [email protected] /gephex--georg--0.4--patch-302
More vs6 build fixes, began to fix libjoystick for win32 (now supports up to 32 buttons but still only 6 axes), joystickmodule now allows to select driver (default or sdl)
* [email protected] /gephex--georg--0.4--patch-303
Remove some windows line endings...
* [email protected] /gephex--georg--0.4--patch-304
Better scanning of the y4m2 stream header in the y4minmodule
* [email protected] /gephex--georg--0.4--patch-305
Added .yuv to filemask of y4minput, added scaling support to y4minput
* [email protected] /gephex--georg--0.4--patch-306
Minor fixes in pluc.py (no more mkdir ../../../dlls/modules in the dsp, EXTRA_DIST in Makefile.am to add vs6 build files to dist), added ffmpegoutmodule.dsp
* added directories
modules/src/y4minmodule
modules/src/y4minmodule/.arch-ids
* added files
modules/src/ffmpegoutmodule/.arch-ids/ffmpegoutmodule.dsp.id
modules/src/ffmpegoutmodule/ffmpegoutmodule.dsp
modules/src/libcolorconv/.arch-ids/libcolorconv.dep.id
modules/src/libcolorconv/.arch-ids/libcolorconv.mak.id
modules/src/libcolorconv/libcolorconv.dep
modules/src/libcolorconv/libcolorconv.mak
modules/src/noisemodule/.arch-ids/noisemodule.dep.id
modules/src/noisemodule/.arch-ids/noisemodule.dsp.id
modules/src/noisemodule/.arch-ids/noisemodule.mak.id
modules/src/noisemodule/noisemodule.dep
modules/src/noisemodule/noisemodule.dsp
modules/src/noisemodule/noisemodule.mak
modules/src/y4minmodule/.arch-ids/=id
modules/src/y4minmodule/.arch-ids/Makefile.am.id
modules/src/y4minmodule/.arch-ids/y4minmodule.c.id
modules/src/y4minmodule/.arch-ids/y4minmodule.dep.id
modules/src/y4minmodule/.arch-ids/y4minmodule.dsp.id
modules/src/y4minmodule/.arch-ids/y4minmodule.mak.id
modules/src/y4minmodule/.arch-ids/y4minmodule.spec.id
modules/src/y4minmodule/.arch-ids/y4minmodule.xpm.id
modules/src/y4minmodule/Makefile.am
modules/src/y4minmodule/y4minmodule.c
modules/src/y4minmodule/y4minmodule.dep
modules/src/y4minmodule/y4minmodule.dsp
modules/src/y4minmodule/y4minmodule.mak
modules/src/y4minmodule/y4minmodule.spec
modules/src/y4minmodule/y4minmodule.xpm
modules/src/yuv4mpeg2module/.arch-ids/y4moutputmodule.dep.id
modules/src/yuv4mpeg2module/.arch-ids/y4moutputmodule.dsp.id
modules/src/yuv4mpeg2module/.arch-ids/y4moutputmodule.mak.id
modules/src/yuv4mpeg2module/y4moutputmodule.dep
modules/src/yuv4mpeg2module/y4moutputmodule.dsp
modules/src/yuv4mpeg2module/y4moutputmodule.mak
util/src/libjoystick/.arch-ids/directinjoystickdriver.cpp.id
util/src/libjoystick/.arch-ids/directinjoystickdriver.h.id
util/src/libjoystick/directinjoystickdriver.cpp
util/src/libjoystick/directinjoystickdriver.h
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-297
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-298
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-299
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-300
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-301
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-302
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-303
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-304
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-305
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-306
{arch}/gephex/gephex--main/gephex--main--0.4/[email protected] /patch-log/patch-1805
* file metadata changed
./build/dummy/dummy.dep
--permissions 600
=> --permissions 644
./build/dummy/dummy.mak
--permissions 600
=> --permissions 644
./modules/src/joystickmodule/joystickmodule.dep
--permissions 755
=> --permissions 644
./util/src/libjoystick/libjoystick.dep
--permissions 755
=> --permissions 644
* modified files
--- orig/base/src/net/protocol.cpp
+++ mod/base/src/net/protocol.cpp
@@ -34,7 +34,7 @@
// for the min and max templates
// #if defined (COMP_VC)
// vc7 gets confused with this, so only include for vc6
-#if _MSC_VER == 1100
+#if _MSC_VER == 1200
#include "minmax.h"
#else
#include <algorithm>
--- orig/build/dummy/dummy.mak
+++ mod/build/dummy/dummy.mak
@@ -39,16 +39,16 @@
!ELSE
-ALL : "chromakeymodule - Win32 Release" "dplmodule - Win32 Release" "xfademodule - Win32 Release" "twolayermodule - Win32 Release" "tunnelmodule - Win32 Release" "stringtype - Win32 Release" "stringtokenizermodule - Win32 Release" "staticcolormodule - Win32 Release" "signalgenmodule - Win32 Release" "sdlfontmodule - Win32 Release" "rotozoommodule - Win32 Release" "rgbtype - Win32 Release" "resultmodule - Win32 Release" "rangeconvertmodule - Win32 Release" "posnummodule - Win32 Release" "positiontype - Win32 Release" "plasmamodule - Win32 Release" "planemodule - Win32 Release" "pixelizemodule - Win32 Release" "overlaymodule - Win32 Release" "numxfadermodule - Win32 Release" "numposmodule - Win32 Release" "numlfomodule - Win32 Release" "numenvmodule - Win32 Release" "numbertype - Win32 Release" "numbermodule - Win32 Release" "number2colormodule - Win32 Release" "numarithmodule - Win32 Rel
ease" "netcontrolmodule - Win32 Release" "miditype - Win32 Release" "midiinmodule - Win32
Release" "lfotype - Win32 Release" "jumpmodule - Win32 Release" "joystickmodule - Win32 Release" "isingnoizemodule - Win32 Release" "imgarithmodule - Win32 Release" "imagebuffermodule - Win32 Release"\
- "ifsxfadermodule - Win32 Release" "ifstype - Win32 Release" "ifsmodule - Win32 Release" "ifsgenmodule - Win32 Release" "gradnormmodule - Win32 Release" "funparsemodule - Win32 Release" "frboutmodule - Win32 Release" "frbinmodule - Win32 Release" "framebuffertype - Win32 Release" "fpsmodule - Win32 Release" "fonttype - Win32 Release" "font3Dmodule - Win32 Release" "flipflopmodule - Win32 Release" "flashmodule - Win32 Release" "envtype - Win32 Release" "effectvsparkmodule - Win32 Release" "effectvquarkmodule - Win32 Release" "effectvpuzzlemodule - Win32 Release" "effectvlifemodule - Win32 Release" "effectvlensmodule - Win32 Release" "effectvfiremodule - Win32 Release" "effectvedgemodule - Win32 Release" "effectvdotmodule - Win32 Release" "effectvcyclemodule - Win32 Release" "effectvburnmodule - Win32 Release" "effectvagingmodule - Win32 Release" "doepfermodule - Win32 Release" "diffmodul
e - Win32 Release" "color2numbermodule - Win32 Release" "capturemodule - Win32 Release" "b
wmodule - Win32 Release" "blurmodule - Win32 Release" "audiowavegenmodule - Win32 Release" "audiovismodule - Win32 Release" "audiotype - Win32 Release" "audiosynthmodule - Win32 Release"\
- "audiospecmodule - Win32 Release" "audiooutmodule - Win32 Release" "audioinmodule - Win32 Release" "audioenergymodule - Win32 Release" "audiobdmodule - Win32 Release" "audioaddmodule - Win32 Release" "$(OUTDIR)\dummy.exe"
+ALL : "y4moutputmodule - Win32 Release" "y4minmodule - Win32 Release" "noisemodule - Win32 Release" "chromakeymodule - Win32 Release" "dplmodule - Win32 Release" "xfademodule - Win32 Release" "twolayermodule - Win32 Release" "tunnelmodule - Win32 Release" "stringtype - Win32 Release" "stringtokenizermodule - Win32 Release" "staticcolormodule - Win32 Release" "signalgenmodule - Win32 Release" "sdlfontmodule - Win32 Release" "rotozoommodule - Win32 Release" "rgbtype - Win32 Release" "resultmodule - Win32 Release" "rangeconvertmodule - Win32 Release" "posnummodule - Win32 Release" "positiontype - Win32 Release" "plasmamodule - Win32 Release" "planemodule - Win32 Release" "pixelizemodule - Win32 Release" "overlaymodule - Win32 Release" "numxfadermodule - Win32 Release" "numposmodule - Win32 Release" "numlfomodule - Win32 Release" "numenvmodule - Win32 Release" "numbertype - Win32 Release" "
numbermodule - Win32 Release" "number2colormodule - Win32 Release" "numarithmodule - Win32
Release" "netcontrolmodule - Win32 Release" "miditype - Win32 Release" "midiinmodule - Win32 Release" "lfotype - Win32 Release" "jumpmodule - Win32 Release" "joystickmodule - Win32 Release"\
+ "isingnoizemodule - Win32 Release" "imgarithmodule - Win32 Release" "imagebuffermodule - Win32 Release" "ifsxfadermodule - Win32 Release" "ifstype - Win32 Release" "ifsmodule - Win32 Release" "ifsgenmodule - Win32 Release" "gradnormmodule - Win32 Release" "funparsemodule - Win32 Release" "frboutmodule - Win32 Release" "frbinmodule - Win32 Release" "framebuffertype - Win32 Release" "fpsmodule - Win32 Release" "fonttype - Win32 Release" "font3Dmodule - Win32 Release" "flipflopmodule - Win32 Release" "flashmodule - Win32 Release" "envtype - Win32 Release" "effectvsparkmodule - Win32 Release" "effectvquarkmodule - Win32 Release" "effectvpuzzlemodule - Win32 Release" "effectvlifemodule - Win32 Release" "effectvlensmodule - Win32 Release" "effectvfiremodule - Win32 Release" "effectvedgemodule - Win32 Release" "effectvdotmodule - Win32 Release" "effectvcyclemodule - Win32 Release" "effectvbur
nmodule - Win32 Release" "effectvagingmodule - Win32 Release" "doepfermodule - Win32 Relea
se" "diffmodule - Win32 Release" "color2numbermodule - Win32 Release" "capturemodule - Win32 Release" "bwmodule - Win32 Release" "blurmodule - Win32 Release" "audiowavegenmodule - Win32 Release"\
+ "audiovismodule - Win32 Release" "audiotype - Win32 Release" "audiosynthmodule - Win32 Release" "audiospecmodule - Win32 Release" "audiooutmodule - Win32 Release" "audioinmodule - Win32 Release" "audioenergymodule - Win32 Release" "audiobdmodule - Win32 Release" "audioaddmodule - Win32 Release" "$(OUTDIR)\dummy.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
CLEAN :"audioaddmodule - Win32 ReleaseCLEAN" "audiobdmodule - Win32 ReleaseCLEAN" "audioenergymodule - Win32 ReleaseCLEAN" "audioinmodule - Win32 ReleaseCLEAN" "audiooutmodule - Win32 ReleaseCLEAN" "audiospecmodule - Win32 ReleaseCLEAN" "audiosynthmodule - Win32 ReleaseCLEAN" "audiotype - Win32 ReleaseCLEAN" "audiovismodule - Win32 ReleaseCLEAN" "audiowavegenmodule - Win32 ReleaseCLEAN" "blurmodule - Win32 ReleaseCLEAN" "bwmodule - Win32 ReleaseCLEAN" "capturemodule - Win32 ReleaseCLEAN" "color2numbermodule - Win32 ReleaseCLEAN" "diffmodule - Win32 ReleaseCLEAN" "doepfermodule - Win32 ReleaseCLEAN" "effectvagingmodule - Win32 ReleaseCLEAN" "effectvburnmodule - Win32 ReleaseCLEAN" "effectvcyclemodule - Win32 ReleaseCLEAN" "effectvdotmodule - Win32 ReleaseCLEAN" "effectvedgemodule - Win32 ReleaseCLEAN" "effectvfiremodule - Win32 ReleaseCLEAN" "effectvlensmodule - Win32 ReleaseCLEAN" "effe
ctvlifemodule - Win32 ReleaseCLEAN" "effectvpuzzlemodule - Win32 ReleaseCLEAN" "effectvqua
rkmodule - Win32 ReleaseCLEAN" "effectvsparkmodule - Win32 ReleaseCLEAN" "envtype - Win32 ReleaseCLEAN" "flashmodule - Win32 ReleaseCLEAN" "flipflopmodule - Win32 ReleaseCLEAN"\
"font3Dmodule - Win32 ReleaseCLEAN" "fonttype - Win32 ReleaseCLEAN" "fpsmodule - Win32 ReleaseCLEAN" "framebuffertype - Win32 ReleaseCLEAN" "frbinmodule - Win32 ReleaseCLEAN" "frboutmodule - Win32 ReleaseCLEAN" "funparsemodule - Win32 ReleaseCLEAN" "gradnormmodule - Win32 ReleaseCLEAN" "ifsgenmodule - Win32 ReleaseCLEAN" "ifsmodule - Win32 ReleaseCLEAN" "ifstype - Win32 ReleaseCLEAN" "ifsxfadermodule - Win32 ReleaseCLEAN" "imagebuffermodule - Win32 ReleaseCLEAN" "imgarithmodule - Win32 ReleaseCLEAN" "isingnoizemodule - Win32 ReleaseCLEAN" "joystickmodule - Win32 ReleaseCLEAN" "jumpmodule - Win32 ReleaseCLEAN" "lfotype - Win32 ReleaseCLEAN" "midiinmodule - Win32 ReleaseCLEAN" "miditype - Win32 ReleaseCLEAN" "netcontrolmodule - Win32 ReleaseCLEAN" "numarithmodule - Win32 ReleaseCLEAN" "number2colormodule - Win32 ReleaseCLEAN" "numbermodule - Win32 ReleaseCLEAN" "numbertype - Win32 Releas
eCLEAN" "numenvmodule - Win32 ReleaseCLEAN" "numlfomodule - Win32 ReleaseCLEAN" "numposmod
ule - Win32 ReleaseCLEAN" "numxfadermodule - Win32 ReleaseCLEAN" "overlaymodule - Win32 ReleaseCLEAN" "pixelizemodule - Win32 ReleaseCLEAN" "planemodule - Win32 ReleaseCLEAN" "plasmamodule - Win32 ReleaseCLEAN"\
- "positiontype - Win32 ReleaseCLEAN" "posnummodule - Win32 ReleaseCLEAN" "rangeconvertmodule - Win32 ReleaseCLEAN" "resultmodule - Win32 ReleaseCLEAN" "rgbtype - Win32 ReleaseCLEAN" "rotozoommodule - Win32 ReleaseCLEAN" "sdlfontmodule - Win32 ReleaseCLEAN" "signalgenmodule - Win32 ReleaseCLEAN" "staticcolormodule - Win32 ReleaseCLEAN" "stringtokenizermodule - Win32 ReleaseCLEAN" "stringtype - Win32 ReleaseCLEAN" "tunnelmodule - Win32 ReleaseCLEAN" "twolayermodule - Win32 ReleaseCLEAN" "xfademodule - Win32 ReleaseCLEAN" "dplmodule - Win32 ReleaseCLEAN" "chromakeymodule - Win32 ReleaseCLEAN"
+ "positiontype - Win32 ReleaseCLEAN" "posnummodule - Win32 ReleaseCLEAN" "rangeconvertmodule - Win32 ReleaseCLEAN" "resultmodule - Win32 ReleaseCLEAN" "rgbtype - Win32 ReleaseCLEAN" "rotozoommodule - Win32 ReleaseCLEAN" "sdlfontmodule - Win32 ReleaseCLEAN" "signalgenmodule - Win32 ReleaseCLEAN" "staticcolormodule - Win32 ReleaseCLEAN" "stringtokenizermodule - Win32 ReleaseCLEAN" "stringtype - Win32 ReleaseCLEAN" "tunnelmodule - Win32 ReleaseCLEAN" "twolayermodule - Win32 ReleaseCLEAN" "xfademodule - Win32 ReleaseCLEAN" "dplmodule - Win32 ReleaseCLEAN" "chromakeymodule - Win32 ReleaseCLEAN" "noisemodule - Win32 ReleaseCLEAN" "y4minmodule - Win32 ReleaseCLEAN" "y4moutputmodule - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -167,7 +167,10 @@
"..\..\modules\src wolayermodule\Release wolayermodule.lib" \
"..\..\modules\src\xfademodule\Release\xfademodule.lib" \
"..\..\modules\src\dplmodule\Release\dplmodule.lib" \
- "..\..\modules\srchromakeymodule\Releasehromakeymodule.lib"
+ "..\..\modules\srchromakeymodule\Releasehromakeymodule.lib" \
+ "..\..\modules\src
oisemodule\Release
oisemodule.lib" \
+ "..\..\modules\src\y4minmodule\Release\y4minmodule.lib" \
+ "..\..\modules\src\yuv4mpeg2module\Release\y4moutputmodule.lib"
"$(OUTDIR)\dummy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -188,16 +191,16 @@
!ELSE
-ALL : "chromakeymodule - Win32 Debug" "dplmodule - Win32 Debug" "xfademodule - Win32 Debug" "twolayermodule - Win32 Debug" "tunnelmodule - Win32 Debug" "stringtype - Win32 Debug" "stringtokenizermodule - Win32 Debug" "staticcolormodule - Win32 Debug" "signalgenmodule - Win32 Debug" "sdlfontmodule - Win32 Debug" "rotozoommodule - Win32 Debug" "rgbtype - Win32 Debug" "resultmodule - Win32 Debug" "rangeconvertmodule - Win32 Debug" "posnummodule - Win32 Debug" "positiontype - Win32 Debug" "plasmamodule - Win32 Debug" "planemodule - Win32 Debug" "pixelizemodule - Win32 Debug" "overlaymodule - Win32 Debug" "numxfadermodule - Win32 Debug" "numposmodule - Win32 Debug" "numlfomodule - Win32 Debug" "numenvmodule - Win32 Debug" "numbertype - Win32 Debug" "numbermodule - Win32 Debug" "number2colormodule - Win32 Debug" "numarithmodule - Win32 Debug" "netcontrolmodule - Win32 Debug" "miditype - Win32
Debug" "midiinmodule - Win32 Debug" "lfotype - Win32 Debug" "jumpmodule - Win32 Debug" "j
oystickmodule - Win32 Debug" "isingnoizemodule - Win32 Debug" "imgarithmodule - Win32 Debug" "imagebuffermodule - Win32 Debug" "ifsxfadermodule - Win32 Debug" "ifstype - Win32 Debug" "ifsmodule - Win32 Debug"\
- "ifsgenmodule - Win32 Debug" "gradnormmodule - Win32 Debug" "funparsemodule - Win32 Debug" "frboutmodule - Win32 Debug" "frbinmodule - Win32 Debug" "framebuffertype - Win32 Debug" "fpsmodule - Win32 Debug" "fonttype - Win32 Debug" "font3Dmodule - Win32 Debug" "flipflopmodule - Win32 Debug" "flashmodule - Win32 Debug" "envtype - Win32 Debug" "effectvsparkmodule - Win32 Debug" "effectvquarkmodule - Win32 Debug" "effectvpuzzlemodule - Win32 Debug" "effectvlifemodule - Win32 Debug" "effectvlensmodule - Win32 Debug" "effectvfiremodule - Win32 Debug" "effectvedgemodule - Win32 Debug" "effectvdotmodule - Win32 Debug" "effectvcyclemodule - Win32 Debug" "effectvburnmodule - Win32 Debug" "effectvagingmodule - Win32 Debug" "doepfermodule - Win32 Debug" "diffmodule - Win32 Debug" "color2numbermodule - Win32 Debug" "capturemodule - Win32 Debug" "bwmodule - Win32 Debug" "blurmodule - Win32 Debug" "a
udiowavegenmodule - Win32 Debug" "audiovismodule - Win32 Debug" "audiotype - Win32 Debug"
"audiosynthmodule - Win32 Debug" "audiospecmodule - Win32 Debug" "audiooutmodule - Win32 Debug" "audioinmodule - Win32 Debug" "audioenergymodule - Win32 Debug" "audiobdmodule - Win32 Debug"\
- "audioaddmodule - Win32 Debug" "$(OUTDIR)\dummy.exe"
+ALL : "y4moutputmodule - Win32 Debug" "y4minmodule - Win32 Debug" "noisemodule - Win32 Debug" "chromakeymodule - Win32 Debug" "dplmodule - Win32 Debug" "xfademodule - Win32 Debug" "twolayermodule - Win32 Debug" "tunnelmodule - Win32 Debug" "stringtype - Win32 Debug" "stringtokenizermodule - Win32 Debug" "staticcolormodule - Win32 Debug" "signalgenmodule - Win32 Debug" "sdlfontmodule - Win32 Debug" "rotozoommodule - Win32 Debug" "rgbtype - Win32 Debug" "resultmodule - Win32 Debug" "rangeconvertmodule - Win32 Debug" "posnummodule - Win32 Debug" "positiontype - Win32 Debug" "plasmamodule - Win32 Debug" "planemodule - Win32 Debug" "pixelizemodule - Win32 Debug" "overlaymodule - Win32 Debug" "numxfadermodule - Win32 Debug" "numposmodule - Win32 Debug" "numlfomodule - Win32 Debug" "numenvmodule - Win32 Debug" "numbertype - Win32 Debug" "numbermodule - Win32 Debug" "number2colormodule - Win32
Debug" "numarithmodule - Win32 Debug" "netcontrolmodule - Win32 Debug" "miditype - Win32 D
ebug" "midiinmodule - Win32 Debug" "lfotype - Win32 Debug" "jumpmodule - Win32 Debug" "joystickmodule - Win32 Debug" "isingnoizemodule - Win32 Debug" "imgarithmodule - Win32 Debug"\
+ "imagebuffermodule - Win32 Debug" "ifsxfadermodule - Win32 Debug" "ifstype - Win32 Debug" "ifsmodule - Win32 Debug" "ifsgenmodule - Win32 Debug" "gradnormmodule - Win32 Debug" "funparsemodule - Win32 Debug" "frboutmodule - Win32 Debug" "frbinmodule - Win32 Debug" "framebuffertype - Win32 Debug" "fpsmodule - Win32 Debug" "fonttype - Win32 Debug" "font3Dmodule - Win32 Debug" "flipflopmodule - Win32 Debug" "flashmodule - Win32 Debug" "envtype - Win32 Debug" "effectvsparkmodule - Win32 Debug" "effectvquarkmodule - Win32 Debug" "effectvpuzzlemodule - Win32 Debug" "effectvlifemodule - Win32 Debug" "effectvlensmodule - Win32 Debug" "effectvfiremodule - Win32 Debug" "effectvedgemodule - Win32 Debug" "effectvdotmodule - Win32 Debug" "effectvcyclemodule - Win32 Debug" "effectvburnmodule - Win32 Debug" "effectvagingmodule - Win32 Debug" "doepfermodule - Win32 Debug" "diffmodule - Win32 Debug" "co
lor2numbermodule - Win32 Debug" "capturemodule - Win32 Debug" "bwmodule - Win32 Debug" "bl
urmodule - Win32 Debug" "audiowavegenmodule - Win32 Debug" "audiovismodule - Win32 Debug" "audiotype - Win32 Debug" "audiosynthmodule - Win32 Debug" "audiospecmodule - Win32 Debug" "audiooutmodule - Win32 Debug"\
+ "audioinmodule - Win32 Debug" "audioenergymodule - Win32 Debug" "audiobdmodule - Win32 Debug" "audioaddmodule - Win32 Debug" "$(OUTDIR)\dummy.exe"
!ENDIF
!IF "$(RECURSE)" == "1"
CLEAN :"audioaddmodule - Win32 DebugCLEAN" "audiobdmodule - Win32 DebugCLEAN" "audioenergymodule - Win32 DebugCLEAN" "audioinmodule - Win32 DebugCLEAN" "audiooutmodule - Win32 DebugCLEAN" "audiospecmodule - Win32 DebugCLEAN" "audiosynthmodule - Win32 DebugCLEAN" "audiotype - Win32 DebugCLEAN" "audiovismodule - Win32 DebugCLEAN" "audiowavegenmodule - Win32 DebugCLEAN" "blurmodule - Win32 DebugCLEAN" "bwmodule - Win32 DebugCLEAN" "capturemodule - Win32 DebugCLEAN" "color2numbermodule - Win32 DebugCLEAN" "diffmodule - Win32 DebugCLEAN" "doepfermodule - Win32 DebugCLEAN" "effectvagingmodule - Win32 DebugCLEAN" "effectvburnmodule - Win32 DebugCLEAN" "effectvcyclemodule - Win32 DebugCLEAN" "effectvdotmodule - Win32 DebugCLEAN" "effectvedgemodule - Win32 DebugCLEAN" "effectvfiremodule - Win32 DebugCLEAN" "effectvlensmodule - Win32 DebugCLEAN" "effectvlifemodule - Win32 DebugCLEAN" "effectvpuzz
lemodule - Win32 DebugCLEAN" "effectvquarkmodule - Win32 DebugCLEAN" "effectvsparkmodule -
Win32 DebugCLEAN" "envtype - Win32 DebugCLEAN" "flashmodule - Win32 DebugCLEAN" "flipflopmodule - Win32 DebugCLEAN" "font3Dmodule - Win32 DebugCLEAN" "fonttype - Win32 DebugCLEAN"\
"fpsmodule - Win32 DebugCLEAN" "framebuffertype - Win32 DebugCLEAN" "frbinmodule - Win32 DebugCLEAN" "frboutmodule - Win32 DebugCLEAN" "funparsemodule - Win32 DebugCLEAN" "gradnormmodule - Win32 DebugCLEAN" "ifsgenmodule - Win32 DebugCLEAN" "ifsmodule - Win32 DebugCLEAN" "ifstype - Win32 DebugCLEAN" "ifsxfadermodule - Win32 DebugCLEAN" "imagebuffermodule - Win32 DebugCLEAN" "imgarithmodule - Win32 DebugCLEAN" "isingnoizemodule - Win32 DebugCLEAN" "joystickmodule - Win32 DebugCLEAN" "jumpmodule - Win32 DebugCLEAN" "lfotype - Win32 DebugCLEAN" "midiinmodule - Win32 DebugCLEAN" "miditype - Win32 DebugCLEAN" "netcontrolmodule - Win32 DebugCLEAN" "numarithmodule - Win32 DebugCLEAN" "number2colormodule - Win32 DebugCLEAN" "numbermodule - Win32 DebugCLEAN" "numbertype - Win32 DebugCLEAN" "numenvmodule - Win32 DebugCLEAN" "numlfomodule - Win32 DebugCLEAN" "numposmodule - Win32 DebugCLEAN" "num
xfadermodule - Win32 DebugCLEAN" "overlaymodule - Win32 DebugCLEAN" "pixelizemodule - Win3
2 DebugCLEAN" "planemodule - Win32 DebugCLEAN" "plasmamodule - Win32 DebugCLEAN" "positiontype - Win32 DebugCLEAN" "posnummodule - Win32 DebugCLEAN" "rangeconvertmodule - Win32 DebugCLEAN"\
- "resultmodule - Win32 DebugCLEAN" "rgbtype - Win32 DebugCLEAN" "rotozoommodule - Win32 DebugCLEAN" "sdlfontmodule - Win32 DebugCLEAN" "signalgenmodule - Win32 DebugCLEAN" "staticcolormodule - Win32 DebugCLEAN" "stringtokenizermodule - Win32 DebugCLEAN" "stringtype - Win32 DebugCLEAN" "tunnelmodule - Win32 DebugCLEAN" "twolayermodule - Win32 DebugCLEAN" "xfademodule - Win32 DebugCLEAN" "dplmodule - Win32 DebugCLEAN" "chromakeymodule - Win32 DebugCLEAN"
+ "resultmodule - Win32 DebugCLEAN" "rgbtype - Win32 DebugCLEAN" "rotozoommodule - Win32 DebugCLEAN" "sdlfontmodule - Win32 DebugCLEAN" "signalgenmodule - Win32 DebugCLEAN" "staticcolormodule - Win32 DebugCLEAN" "stringtokenizermodule - Win32 DebugCLEAN" "stringtype - Win32 DebugCLEAN" "tunnelmodule - Win32 DebugCLEAN" "twolayermodule - Win32 DebugCLEAN" "xfademodule - Win32 DebugCLEAN" "dplmodule - Win32 DebugCLEAN" "chromakeymodule - Win32 DebugCLEAN" "noisemodule - Win32 DebugCLEAN" "y4minmodule - Win32 DebugCLEAN" "y4moutputmodule - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -331,7 +334,10 @@
"..\..\modules\src wolayermodule\Debug wolayermodule.lib" \
"..\..\modules\src\xfademodule\Debug\xfademodule.lib" \
"..\..\modules\src\dplmodule\Debug\dplmodule.lib" \
- "..\..\modules\srchromakeymodule\Debughromakeymodule.lib"
+ "..\..\modules\srchromakeymodule\Debughromakeymodule.lib" \
+ "..\..\modules\src
oisemodule\Debug
oisemodule.lib" \
+ "..\..\modules\src\y4minmodule\Debug\y4minmodule.lib" \
+ "..\..\modules\src\yuv4mpeg2module\Debug\y4moutputmodule.lib"
"$(OUTDIR)\dummy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -2416,6 +2422,84 @@
!ENDIF
+!IF "$(CFG)" == "dummy - Win32 Release"
+
+"noisemodule - Win32 Release" :
+ cd "ode\gephex-0.4\modules\src
oisemodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".
oisemodule.mak" CFG="noisemodule - Win32 Release"
+ cd "..\..\..uild\dummy"
+
+"noisemodule - Win32 ReleaseCLEAN" :
+ cd "ode\gephex-0.4\modules\src
oisemodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".
oisemodule.mak" CFG="noisemodule - Win32 Release" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ELSEIF "$(CFG)" == "dummy - Win32 Debug"
+
+"noisemodule - Win32 Debug" :
+ cd "ode\gephex-0.4\modules\src
oisemodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".
oisemodule.mak" CFG="noisemodule - Win32 Debug"
+ cd "..\..\..uild\dummy"
+
+"noisemodule - Win32 DebugCLEAN" :
+ cd "ode\gephex-0.4\modules\src
oisemodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".
oisemodule.mak" CFG="noisemodule - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ENDIF
+
+!IF "$(CFG)" == "dummy - Win32 Release"
+
+"y4minmodule - Win32 Release" :
+ cd "ode\gephex-0.4\modules\src\y4minmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4minmodule.mak" CFG="y4minmodule - Win32 Release"
+ cd "..\..\..uild\dummy"
+
+"y4minmodule - Win32 ReleaseCLEAN" :
+ cd "ode\gephex-0.4\modules\src\y4minmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4minmodule.mak" CFG="y4minmodule - Win32 Release" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ELSEIF "$(CFG)" == "dummy - Win32 Debug"
+
+"y4minmodule - Win32 Debug" :
+ cd "ode\gephex-0.4\modules\src\y4minmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4minmodule.mak" CFG="y4minmodule - Win32 Debug"
+ cd "..\..\..uild\dummy"
+
+"y4minmodule - Win32 DebugCLEAN" :
+ cd "ode\gephex-0.4\modules\src\y4minmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4minmodule.mak" CFG="y4minmodule - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ENDIF
+
+!IF "$(CFG)" == "dummy - Win32 Release"
+
+"y4moutputmodule - Win32 Release" :
+ cd "ode\gephex-0.4\modules\src\yuv4mpeg2module"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4moutputmodule.mak" CFG="y4moutputmodule - Win32 Release"
+ cd "..\..\..uild\dummy"
+
+"y4moutputmodule - Win32 ReleaseCLEAN" :
+ cd "ode\gephex-0.4\modules\src\yuv4mpeg2module"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4moutputmodule.mak" CFG="y4moutputmodule - Win32 Release" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ELSEIF "$(CFG)" == "dummy - Win32 Debug"
+
+"y4moutputmodule - Win32 Debug" :
+ cd "ode\gephex-0.4\modules\src\yuv4mpeg2module"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4moutputmodule.mak" CFG="y4moutputmodule - Win32 Debug"
+ cd "..\..\..uild\dummy"
+
+"y4moutputmodule - Win32 DebugCLEAN" :
+ cd "ode\gephex-0.4\modules\src\yuv4mpeg2module"
+ $(MAKE) /$(MAKEFLAGS) /F ".\y4moutputmodule.mak" CFG="y4moutputmodule - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ENDIF
+
!ENDIF
--- orig/build/gephex.dsw
+++ mod/build/gephex.dsw
@@ -542,6 +542,15 @@
Begin Project Dependency
Project_Dep_Name chromakeymodule
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name noisemodule
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name y4minmodule
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name y4moutputmodule
+ End Project Dependency
}}}
###############################################################################
@@ -1113,6 +1122,18 @@
###############################################################################
+Project: "libcolorconv"="..\modules\src\libcolorconv\libcolorconv.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "libdshow"="..\modules\src\libdshow\libdshow.dsp" - Package Owner=<4>
Package=<5>
@@ -1284,6 +1305,18 @@
###############################################################################
+Project: "noisemodule"="..\modules\src
oisemodule
oisemodule.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "numarithmodule"="..\modules\src
umarithmodule
umarithmodule.dsp" - Package Owner=<4>
Package=<5>
@@ -1650,6 +1683,36 @@
###############################################################################
+Project: "y4minmodule"="..\modules\src\y4minmodule\y4minmodule.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libcolorconv
+ End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "y4moutputmodule"="..\modules\src\yuv4mpeg2module\y4moutputmodule.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+ Begin Project Dependency
+ Project_Dep_Name libcolorconv
+ End Project Dependency
+}}}
+
+###############################################################################
+
Global:
Package=<5>
--- orig/config_h.win32
+++ mod/config_h.win32
@@ -16,5 +16,6 @@
#define FRBINMODULE_CACHE_SIZE 128
#define WITH_FFMPEG
+#define WITH_SDL
#endif
\ No newline at end of file
--- orig/configure.ac
+++ mod/configure.ac
@@ -467,6 +467,7 @@
modules/src/tunnelmodule/Makefile
modules/src/twolayermodule/Makefile
modules/src/xfademodule/Makefile
+modules/src/y4minmodule/Makefile
modules/src/yuv4mpeg2module/Makefile
effectvmodules/Makefile
effectvmodules/src/Makefile
--- orig/modules/pluc.py
+++ mod/modules/pluc.py
@@ -936,6 +936,8 @@
DISTCLEANFILES = XXX_NAME_XXX.h XXX_NAME_XXX_auto.c
+
+#EXTRA_DIST = XXX_NAME_XXX.dsp XXX_NAME_XXX.mak XXX_NAME_XXX.dep
"""
usedtypes = createUsedTypes(inputs,outputs)
typedirs = map(lambda y: string.replace(y,'typ_',''),
@@ -1047,7 +1049,7 @@
TargetPath=.\Release\X_NAME_X.dll
SOURCE="$(InputPath)"
PostBuild_Desc=Kopiere Dll...
-PostBuild_Cmds=mkdir ..\..\..\dlls\modules copy $(TargetPath) ..\..\..\dlls\modules
+PostBuild_Cmds=copy $(TargetPath) ..\..\..\dlls\modules
# End Special Build Tool
!ELSEIF "$(CFG)" == "X_NAME_X - Win32 Debug"
@@ -1080,7 +1082,7 @@
TargetPath=.\Debug\X_NAME_X.dll
SOURCE="$(InputPath)"
PostBuild_Desc=Kopiere Dll...
-PostBuild_Cmds=mkdir ..\..\..\dlls\modules copy $(TargetPath) ..\..\..\dlls\modules
+PostBuild_Cmds=copy $(TargetPath) ..\..\..\dlls\modules
# End Special Build Tool
!ENDIF
--- orig/modules/src/Makefile.am
+++ mod/modules/src/Makefile.am
@@ -84,6 +84,6 @@
stringtokenizermodule \
tunnelmodule \
twolayermodule \
- yuv4mpeg2module \
- xfademodule $(JOYSTICK_DIRS) $(SDL_TTF_DIRS) $(V4L_DIRS) $(PNG_DIRS) $(AUDIO_DIRS) $(FFMPEG_DIRS)
-
+ xfademodule \
+ y4minmodule \
+ yuv4mpeg2module $(JOYSTICK_DIRS) $(SDL_TTF_DIRS) $(V4L_DIRS) $(PNG_DIRS) $(AUDIO_DIRS) $(FFMPEG_DIRS)
--- orig/modules/src/ffmpegoutmodule/Makefile.am
+++ mod/modules/src/ffmpegoutmodule/Makefile.am
@@ -35,3 +35,4 @@
DISTCLEANFILES = ffmpegoutmodule.h ffmpegoutmodule_auto.c
+EXTRA_DIST = ffmpegoutmodule.dsp #ffmpegoutmodule.mak ffmpegoutmodule.dep
\ No newline at end of file
--- orig/modules/src/ffmpegoutmodule/ffmpegoutmodule.cpp
+++ mod/modules/src/ffmpegoutmodule/ffmpegoutmodule.cpp
@@ -25,15 +25,12 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#if !defined(_MSC_VER) || (_MSC_VER == 1100)
-#include <stdint.h>
-#else
-typedef uint_32 uint32_t;
-#endif
#include <string>
#include <vector>
#include <sstream>
+
+#include "basic_types.h"
static logT s_log;
--- orig/modules/src/frboutmodule/gdioutput.c
+++ mod/modules/src/frboutmodule/gdioutput.c
@@ -174,10 +174,11 @@
//-----------------------------------------------------------------------
+
static struct DriverInstance*
GDI_new_instance(const char* server_name,
int xpos, int ypos,
- int width, int height,
+ int width, int height, int mmx_support,
char* error_text, int buflen)
{
struct DriverInstance* sh = (struct DriverInstance*) malloc(sizeof(*sh));
--- orig/modules/src/gradnormmodule/gradnormmodule.cpp
+++ mod/modules/src/gradnormmodule/gradnormmodule.cpp
@@ -27,7 +27,7 @@
#include <cmath>
#include <cassert>
-#if !defined(_MSC_VER) || (_MSC_VER == 1100)
+#if !defined(_MSC_VER) || (_MSC_VER > 1200)
using std::min;
#include <stdint.h>
#else
--- orig/modules/src/ifsmodule/ifsmodule.cpp
+++ mod/modules/src/ifsmodule/ifsmodule.cpp
@@ -31,7 +31,7 @@
#endif
// for the min and max templates
-#if _MSC_VER == 1100
+#if _MSC_VER == 1200
#include "minmax.h"
#else
#include <algorithm>
--- orig/modules/src/joystickmodule/Makefile.am
+++ mod/modules/src/joystickmodule/Makefile.am
@@ -27,6 +27,7 @@
-I @srcdir@/../../../util/include \
-I @srcdir@/../../../types/src/miditype \
-I @srcdir@/../../../types/src/numbertype \
+ -I @srcdir@/../../../types/src/stringtype \
$(SDL_CFLAGS) \
-I @srcdir@/../libmidi \
-I @srcdir@/../../../util/src/libjoystick
--- orig/modules/src/joystickmodule/joystickmodule.cpp
+++ mod/modules/src/joystickmodule/joystickmodule.cpp
@@ -56,6 +56,8 @@
JoystickDriver* jst_drv;
Joystick* jst;
+
+ StringType driver_name;
} MyInstance, *MyInstancePtr;
@@ -87,24 +89,15 @@
{
MyInstance* my = (MyInstancePtr) malloc(sizeof(MyInstance));
- my->old_id = -1;
- my->jst = 0;
+ my->old_id = -1;
+ my->jst_drv = 0;
+ my->jst = 0;
+
+ string_initInstance(&my->driver_name);
reset_axbu(my);
- try
- {
- my->jst_drv = new JoystickDriver("default");
- return my;
- }
- catch(std::exception& e)
- {
- char buffer[256];
- snprintf(buffer, sizeof(buffer),
- "Could not create joystick driver: '%s'", e.what());
- s_log(0, buffer);
- free(my);
- }
- return 0;
+
+ return my;
}
void destruct(MyInstance* my)
@@ -112,18 +105,61 @@
if (my->jst != 0)
delete my->jst;
- delete my->jst_drv;
+ if (my->jst_drv != 0)
+ delete my->jst_drv;
+
+ string_destroyInstance(&my->driver_name);
free(my);
}
void update(void* instance)
{
InstancePtr inst = (InstancePtr) instance;
- MyInstancePtr my = inst->my;
+ MyInstancePtr my = inst->my;
int joy_id = trim_int(inst->in_joy_id->number, 0, 31);
+ const char* new_driver_name = inst->in_driver->text;
int i, num_axes, num_buttons;
+ const char* driver_name = my->driver_name.text;
+
+ if (my->jst_drv == 0 ||
+ strcmp(new_driver_name, driver_name) != 0)
+ {
+ if (my->jst_drv)
+ delete my->jst_drv;
+
+ if (my->jst)
+ {
+ delete my->jst;
+ my->jst = 0;
+ my->old_id = -1;
+ }
+
+ try
+ {
+ string_assign(&my->driver_name, inst->in_driver);
+ my->jst_drv = new JoystickDriver(new_driver_name);
+
+ char buffer[64];
+ snprintf(buffer, sizeof(buffer), "Using driver '%s'", new_driver_name);
+ s_log(2, buffer);
+ }
+ catch(std::exception& e)
+ {
+ char buffer[256];
+ snprintf(buffer, sizeof(buffer),
+ "Could not create joystick driver: '%s'", e.what());
+ s_log(0, buffer);
+ }
+ }
+
+ if (my->jst_drv == 0)
+ {
+ s_log(1, "HEEEE");
+ return;
+ }
+
if (joy_id != my->old_id)
{
char buffer[64];
@@ -141,12 +177,22 @@
try
{
my->jst = my->jst_drv->open(joy_id);
+
+ char buffer[64];
+
+ snprintf(buffer, sizeof(buffer), "Opened joystick %i
", joy_id);
+ s_log(2, buffer);
+ snprintf(buffer, sizeof(buffer), "Name: %s #Axes: %i #Buttons: %i",
+ my->jst_drv->name(joy_id).c_str(),
+ my->jst->num_axes(), my->jst->num_buttons());
+ s_log(2, buffer);
+
}
catch (std::exception& e)
{
s_log(0, e.what());
my->old_id = joy_id;
- return;
+ return;
}
my->old_id = joy_id;
@@ -163,7 +209,10 @@
}
if (my->jst == 0)
+ {
+ s_log(1, "HAAA");
return;
+ }
try
{
--- orig/modules/src/joystickmodule/joystickmodule.dep
+++ mod/modules/src/joystickmodule/joystickmodule.dep
@@ -6,6 +6,7 @@
"..\..\..\engine\src\engine\dllmodule.h"\
"..\..\.. ypes\src\miditype\miditype.h"\
"..\..\.. ypes\src
umbertype
umbertype.h"\
+ "..\..\.. ypes\src\stringtype\stringtype.h"\
"..\..\..\util\includeasic_types.h"\
"..\..\..\util\src\libjoystick\libjoystick.h"\
"..\libmidi\midiutil.h"\
@@ -17,6 +18,7 @@
"..\..\..\engine\src\engine\dllutils.h"\
"..\..\.. ypes\src\miditype\miditype.h"\
"..\..\.. ypes\src
umbertype
umbertype.h"\
+ "..\..\.. ypes\src\stringtype\stringtype.h"\
"..\..\..\util\includeasic_types.h"\
".\joystickmodule.h"\
".\joystickmodule.xpm"\
--- orig/modules/src/joystickmodule/joystickmodule.dsp
+++ mod/modules/src/joystickmodule/joystickmodule.dsp
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../../types/src/numbertype" /I "../../../types/src/miditype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "NDEBUG" /D "VERBOSE_ENGINE" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /YX /FD /c
+# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../" /I "../../../types/src/stringtype" /I "../../../types/src/miditype" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "NDEBUG" /D "VERBOSE_ENGINE" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /YX /FD /c
# SUBTRACT CPP /X
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /machine:I386
+# ADD LINK32 sdl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /machine:I386 /libpath:"$(SDL_DIR)/lib"
# Begin Special Build Tool
TargetPath=.\Release\joystickmodule.dll
SOURCE="$(InputPath)"
@@ -76,7 +76,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../types/src/miditype" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "_DEBUG" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../types/src/stringtype" /I "../../../types/src/miditype" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "_DEBUG" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"
@@ -86,7 +86,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"winspool" /nodefaultlib:"comdlg32" /nodefaultlib:"uuid" /nodefaultlib:"odbc32" /nodefaultlib:"odbccp32" /nodefaultlib:"oleaut32" /pdbtype:sept
+# ADD LINK32 sdl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"winspool" /nodefaultlib:"comdlg32" /nodefaultlib:"uuid" /nodefaultlib:"odbc32" /nodefaultlib:"odbccp32" /nodefaultlib:"oleaut32" /pdbtype:sept /libpath:"$(SDL_DIR)/lib"
# SUBTRACT LINK32 /incremental:no
# Begin Special Build Tool
TargetPath=.\Debug\joystickmodule.dll
--- orig/modules/src/joystickmodule/joystickmodule.mak
+++ mod/modules/src/joystickmodule/joystickmodule.mak
@@ -25,6 +25,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "joystickmodule - Win32 Release"
OUTDIR=.\Release
@@ -58,48 +62,14 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../../types/src/numbertype" /I "../../../types/src/miditype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "NDEBUG" /D "VERBOSE_ENGINE" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /Fp"$(INTDIR)\joystickmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../" /I "../../../types/src/stringtype" /I "../../../types/src/miditype" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "NDEBUG" /D "VERBOSE_ENGINE" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /Fp"$(INTDIR)\joystickmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\joystickmodule.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\joystickmodule.pdb" /machine:I386 /def:".\joystickmodule.def" /out:"$(OUTDIR)\joystickmodule.dll" /implib:"$(OUTDIR)\joystickmodule.lib"
+LINK32_FLAGS=sdl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\joystickmodule.pdb" /machine:I386 /def:".\joystickmodule.def" /out:"$(OUTDIR)\joystickmodule.dll" /implib:"$(OUTDIR)\joystickmodule.lib" /libpath:"$(SDL_DIR)/lib"
DEF_FILE= \
".\joystickmodule.def"
LINK32_OBJS= \
@@ -137,11 +107,11 @@
!IF "$(RECURSE)" == "0"
-ALL : ".\joystickmodule_auto.c" ".\joystickmodule.h" ".\joystickmodule.def" "..\..\..onfig.h" "$(OUTDIR)\joystickmodule.dll"
+ALL : "$(OUTDIR)\joystickmodule.dll"
!ELSE
-ALL : "libjoystick - Win32 Debug" ".\joystickmodule_auto.c" ".\joystickmodule.h" ".\joystickmodule.def" "..\..\..onfig.h" "$(OUTDIR)\joystickmodule.dll"
+ALL : "libjoystick - Win32 Debug" "$(OUTDIR)\joystickmodule.dll"
!ENDIF
@@ -159,56 +129,18 @@
-@erase "$(OUTDIR)\joystickmodule.ilk"
-@erase "$(OUTDIR)\joystickmodule.lib"
-@erase "$(OUTDIR)\joystickmodule.pdb"
- -@erase "..\..\..onfig.h"
- -@erase "joystickmodule.def"
- -@erase "joystickmodule.h"
- -@erase "joystickmodule_auto.c"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../types/src/miditype" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "_DEBUG" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /Fp"$(INTDIR)\joystickmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
+CPP_PROJ=/nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../types/src/stringtype" /I "../../../types/src/miditype" /I "../libmidi" /I "../../../util/src/libjoystick" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../" /D "_WINDOWS" /D "_USRDLL" /D "joystickmodule_EXPORTS" /D "_DEBUG" /D "HAVE_CONFIG_H" /D "_MBCS" /D "WIN32" /Fp"$(INTDIR)\joystickmodule.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\joystickmodule.bsc"
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\joystickmodule.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"winspool" /nodefaultlib:"comdlg32" /nodefaultlib:"uuid" /nodefaultlib:"odbc32" /nodefaultlib:"odbccp32" /nodefaultlib:"oleaut32" /def:".\joystickmodule.def" /out:"$(OUTDIR)\joystickmodule.dll" /implib:"$(OUTDIR)\joystickmodule.lib" /pdbtype:sept
+LINK32_FLAGS=sdl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\joystickmodule.pdb" /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"winspool" /nodefaultlib:"comdlg32" /nodefaultlib:"uuid" /nodefaultlib:"odbc32" /nodefaultlib:"odbccp32" /nodefaultlib:"oleaut32" /def:".\joystickmodule.def" /out:"$(OUTDIR)\joystickmodule.dll" /implib:"$(OUTDIR)\joystickmodule.lib" /pdbtype:sept /libpath:"$(SDL_DIR)/lib"
DEF_FILE= \
".\joystickmodule.def"
LINK32_OBJS= \
@@ -232,12 +164,42 @@
OutDir=.\Debug
# End Custom Macros
-$(DS_POSTBUILD_DEP) : "libjoystick - Win32 Debug" ".\joystickmodule_auto.c" ".\joystickmodule.h" ".\joystickmodule.def" "..\..\..onfig.h" "$(OUTDIR)\joystickmodule.dll"
+$(DS_POSTBUILD_DEP) : "libjoystick - Win32 Debug" "$(OUTDIR)\joystickmodule.dll"
copy .\Debug\joystickmodule.dll ..\..\..\dlls\modules
echo Helper for Post-build step > "$(DS_POSTBUILD_DEP)"
!ENDIF
+.c{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(INTDIR)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("joystickmodule.dep")
--- orig/modules/src/joystickmodule/joystickmodule.spec
+++ mod/modules/src/joystickmodule/joystickmodule.spec
@@ -28,6 +28,18 @@
precision = 0
default = 0
}
+
+ driver
+ {
+ name = Driver
+ type = typ_StringType
+ const = true
+ strong_dependency = true
+ hidden = true
+ default = default
+ widget_type = combo_box
+ values = default,sdl
+ }
}
--- orig/modules/src/libcolorconv/Makefile.am
+++ mod/modules/src/libcolorconv/Makefile.am
@@ -15,4 +15,4 @@
INCLUDES = -I @srcdir@/../../../engine/src/engine \
-I @srcdir@/../../../util/include
-EXTRA_DIST = libcolorconv_x86.asm
+EXTRA_DIST = libcolorconv_x86.asm libcolorconv.dsp libcolorconv.mak libcolorconv.mak
--- orig/modules/src/libcolorconv/libcolorconv.h
+++ mod/modules/src/libcolorconv/libcolorconv.h
@@ -27,9 +27,10 @@
#include "config.h"
#endif
-#include <stdint.h>
#include <stdlib.h>
+#include "basic_types.h"
+
#ifdef __cplusplus
extern "C" {
#endif
--- orig/modules/src/noisemodule/Makefile.am
+++ mod/modules/src/noisemodule/Makefile.am
@@ -27,3 +27,5 @@
DISTCLEANFILES = noisemodule.h noisemodule_auto.c
+
+EXTRA_DIST = noisemodule.dsp noisemodule.mak noisemodule.dep
\ No newline at end of file
--- orig/modules/src/noisemodule/noisemodule.cpp
+++ mod/modules/src/noisemodule/noisemodule.cpp
@@ -1,7 +1,6 @@
#include "noisemodule.h"
#include "crandgen.h"
-#include "stdint.h"
#include<algorithm>
--- orig/modules/src/overlaymodule/overlaymodule.cpp
+++ mod/modules/src/overlaymodule/overlaymodule.cpp
@@ -22,14 +22,6 @@
#include "overlaymodule.h"
-//TODO: some better test for visual 6
-#ifndef _WIN32
-#include <inttypes.h>
-#else
-typedef uint_8 uint8_t;
-typedef uint_32 uint32_t;
-#endif
-
#include <cassert>
static logT s_log;
@@ -134,7 +126,7 @@
while(in_1_ptr!=((in_1->data)+size))
{
- uint8_t* color=reinterpret_cast<uint_8*>(in_control_ptr);
+ uint8_t* color=reinterpret_cast<uint8_t*>(in_control_ptr);
if(color[1]<tolerance)
{
--- orig/modules/src/yuv4mpeg2module/Makefile.am
+++ mod/modules/src/yuv4mpeg2module/Makefile.am
@@ -32,3 +32,5 @@
-I@srcdir@/../../../modules/src/libscale
DISTCLEANFILES = y4moutputmodule.h y4moutputmodule_auto.c
+
+EXTRA_DIST = y4moutputmodule.dsp y4moutputmodule.mak y4moutputmodule.dep
--- orig/modules/src/yuv4mpeg2module/y4moutputmodule.cpp
+++ mod/modules/src/yuv4mpeg2module/y4moutputmodule.cpp
@@ -23,7 +23,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <stdint.h>
#include <string>
#include <vector>
@@ -35,6 +34,13 @@
static logT s_log;
+#if defined(_MSC_VER)
+#include <io.h>
+
+//#define close _close
+//#define open _open
+//#define write _write
+#endif
struct stream_dsc
{
@@ -234,7 +240,7 @@
// TODO partial writes
}
}
- catch (std::runtime_error& e)
+ catch (std::runtime_error&)
{
if (stream.fd != 0)
{
--- orig/types/src/framebuffertype/framebuffertype.h
+++ mod/types/src/framebuffertype/framebuffertype.h
@@ -79,16 +79,22 @@
}
static __inline
-void framebuffer_deleteInstance(FrameBufferType* fbuffer)
+void framebuffer_destroyInstance(FrameBufferType* fbuffer)
{
- if (fbuffer == 0)
- return;
-
if (fbuffer->data)
free(fbuffer->data);
- fbuffer->data =fbuffer->framebuffer = 0;
+ fbuffer->data = fbuffer->framebuffer = 0;
fbuffer->xsize = fbuffer->ysize = fbuffer->size = 0;
+}
+
+static __inline
+void framebuffer_deleteInstance(FrameBufferType* fbuffer)
+{
+ if (fbuffer == 0)
+ return;
+
+ framebuffer_destroyInstance(fbuffer);
free(fbuffer);
}
--- orig/util/include/basic_types.h
+++ mod/util/include/basic_types.h
@@ -29,7 +29,7 @@
//typedef unsigned long long uint_64;
typedef unsigned int uint_32;
-typedef signed int int_32;
+typedef signed int int_32;
typedef unsigned short uint_16;
typedef signed short int_16;
@@ -39,6 +39,17 @@
#define UINT32_MAX UINT_MAX
#define INT32_MAX INT_MAX
+
+#if _MSC_VER == 1200
+typedef unsigned int uint32_t;
+typedef signed int int32_t;
+typedef unsigned short uint16_t;
+typedef signed short int16_t;
+typedef unsigned char uint8_t;
+typedef signed char int8_t;
+#else
+#include <stdint.h>
+#endif
#endif
--- orig/util/src/libjoystick/libjoystick.cpp
+++ mod/util/src/libjoystick/libjoystick.cpp
@@ -36,6 +36,7 @@
#include "joystickdriver.h"
#if defined(OS_WIN32)
+//#include "directinjoystickdriver.h"
#include "win32joystickdriver.h"
#endif
@@ -52,10 +53,14 @@
JoystickDriver::JoystickDriver(const std::string& driver_name)
{
#if defined(OS_WIN32)
- if (driver_name == "default")
+ if (driver_name == "default" || driver_name == "win32")
{
- m_impl = new Win32JoystickDriverImpl();
+ m_impl = new Win32JoystickDriverImpl();
}
+ /*else if (driver_name == "directin")
+ {
+ m_impl = new DirectInJoystickDriverImpl();
+ }*/
else
#endif
#if defined(WITH_LINUX_JOYSTICK)
--- orig/util/src/libjoystick/libjoystick.dep
+++ mod/util/src/libjoystick/libjoystick.dep
@@ -4,6 +4,7 @@
"..\..\..onfig.h"\
".\joystickdriver.h"\
".\libjoystick.h"\
+ ".\sdljoystickdriver.h"\
".\win32joystickdriver.h"\
--- orig/util/src/libjoystick/libjoystick.mak
+++ mod/util/src/libjoystick/libjoystick.mak
@@ -25,6 +25,9 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "libjoystick - Win32 Release"
OUTDIR=.\Release
@@ -46,40 +49,7 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /G6 /MD /W3 /GX /O2 /I "../../../" /I "$(SDL_DIR)/include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\libjoystick.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /c
-
-.c{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(INTDIR)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\libjoystick.bsc"
BSC32_SBRS= \
@@ -104,7 +74,7 @@
OutDir=.\Debug
# End Custom Macros
-ALL : "..\..\..onfig.h" "$(OUTDIR)\libjoystick.lib"
+ALL : "$(OUTDIR)\libjoystick.lib"
CLEAN :
@@ -114,13 +84,28 @@
-@erase "$(INTDIR) c60.pdb"
-@erase "$(INTDIR)\win32joystickdriver.obj"
-@erase "$(OUTDIR)\libjoystick.lib"
- -@erase "..\..\..onfig.h"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /G6 /MDd /W3 /Gm /GX /ZI /Od /I "../../../" /I "$(SDL_DIR)/include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\libjoystick.pch" /YX /Fo"$(INTDIR)\" /Fd"$(INTDIR)\" /FD /GZ /c
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\libjoystick.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libjoystick.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\libjoystick.obj" \
+ "$(INTDIR)\sdljoystickdriver.obj" \
+ "$(INTDIR)\win32joystickdriver.obj"
+
+"$(OUTDIR)\libjoystick.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
.c{$(INTDIR)}.obj::
$(CPP) @<<
@@ -152,25 +137,6 @@
$(CPP_PROJ) $<
<<
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libjoystick.bsc"
-BSC32_SBRS= \
-
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\libjoystick.lib"
-LIB32_OBJS= \
- "$(INTDIR)\libjoystick.obj" \
- "$(INTDIR)\sdljoystickdriver.obj" \
- "$(INTDIR)\win32joystickdriver.obj"
-
-"$(OUTDIR)\libjoystick.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
- $(LIB32) @<<
- $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF
-
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("libjoystick.dep")
--- orig/util/src/libjoystick/win32joystickdriver.cpp
+++ mod/util/src/libjoystick/win32joystickdriver.cpp
@@ -94,15 +94,68 @@
if (m_num_buttons > 0)
m_state.buttons[0] = (ji.dwButtons & JOY_BUTTON1) ? 1 : 0;
-
if (m_num_buttons > 1)
m_state.buttons[1] = (ji.dwButtons & JOY_BUTTON2) ? 1 : 0;
-
if (m_num_buttons > 2)
m_state.buttons[2] = (ji.dwButtons & JOY_BUTTON3) ? 1 : 0;
-
if (m_num_buttons > 3)
- m_state.buttons[3] = (ji.dwButtons & JOY_BUTTON4) ? 1 : 0;
+ m_state.buttons[3] = (ji.dwButtons & JOY_BUTTON4) ? 1 : 0;
+ if (m_num_buttons > 4)
+ m_state.buttons[4] = (ji.dwButtons & JOY_BUTTON5) ? 1 : 0;
+ if (m_num_buttons > 5)
+ m_state.buttons[5] = (ji.dwButtons & JOY_BUTTON6) ? 1 : 0;
+ if (m_num_buttons > 6)
+ m_state.buttons[6] = (ji.dwButtons & JOY_BUTTON7) ? 1 : 0;
+ if (m_num_buttons > 7)
+ m_state.buttons[7] = (ji.dwButtons & JOY_BUTTON8) ? 1 : 0;
+ if (m_num_buttons > 8)
+ m_state.buttons[8] = (ji.dwButtons & JOY_BUTTON9) ? 1 : 0;
+ if (m_num_buttons > 9)
+ m_state.buttons[9] = (ji.dwButtons & JOY_BUTTON10) ? 1 : 0;
+ if (m_num_buttons > 10)
+ m_state.buttons[10] = (ji.dwButtons & JOY_BUTTON11) ? 1 : 0;
+ if (m_num_buttons > 11)
+ m_state.buttons[11] = (ji.dwButtons & JOY_BUTTON12) ? 1 : 0;
+ if (m_num_buttons > 12)
+ m_state.buttons[12] = (ji.dwButtons & JOY_BUTTON13) ? 1 : 0;
+ if (m_num_buttons > 13)
+ m_state.buttons[13] = (ji.dwButtons & JOY_BUTTON14) ? 1 : 0;
+ if (m_num_buttons > 14)
+ m_state.buttons[14] = (ji.dwButtons & JOY_BUTTON15) ? 1 : 0;
+ if (m_num_buttons > 15)
+ m_state.buttons[15] = (ji.dwButtons & JOY_BUTTON16) ? 1 : 0;
+ if (m_num_buttons > 16)
+ m_state.buttons[16] = (ji.dwButtons & JOY_BUTTON17) ? 1 : 0;
+ if (m_num_buttons > 17)
+ m_state.buttons[17] = (ji.dwButtons & JOY_BUTTON18) ? 1 : 0;
+ if (m_num_buttons > 18)
+ m_state.buttons[18] = (ji.dwButtons & JOY_BUTTON19) ? 1 : 0;
+ if (m_num_buttons > 19)
+ m_state.buttons[19] = (ji.dwButtons & JOY_BUTTON20) ? 1 : 0;
+ if (m_num_buttons > 20)
+ m_state.buttons[20] = (ji.dwButtons & JOY_BUTTON21) ? 1 : 0;
+ if (m_num_buttons > 21)
+ m_state.buttons[21] = (ji.dwButtons & JOY_BUTTON22) ? 1 : 0;
+ if (m_num_buttons > 22)
+ m_state.buttons[22] = (ji.dwButtons & JOY_BUTTON23) ? 1 : 0;
+ if (m_num_buttons > 23)
+ m_state.buttons[23] = (ji.dwButtons & JOY_BUTTON24) ? 1 : 0;
+ if (m_num_buttons > 24)
+ m_state.buttons[24] = (ji.dwButtons & JOY_BUTTON25) ? 1 : 0;
+ if (m_num_buttons > 25)
+ m_state.buttons[25] = (ji.dwButtons & JOY_BUTTON26) ? 1 : 0;
+ if (m_num_buttons > 26)
+ m_state.buttons[26] = (ji.dwButtons & JOY_BUTTON27) ? 1 : 0;
+ if (m_num_buttons > 27)
+ m_state.buttons[27] = (ji.dwButtons & JOY_BUTTON28) ? 1 : 0;
+ if (m_num_buttons > 28)
+ m_state.buttons[28] = (ji.dwButtons & JOY_BUTTON29) ? 1 : 0;
+ if (m_num_buttons > 29)
+ m_state.buttons[29] = (ji.dwButtons & JOY_BUTTON30) ? 1 : 0;
+ if (m_num_buttons > 30)
+ m_state.buttons[30] = (ji.dwButtons & JOY_BUTTON31) ? 1 : 0;
+ if (m_num_buttons > 31)
+ m_state.buttons[31] = (ji.dwButtons & JOY_BUTTON32) ? 1 : 0;
return m_state;
}