gephex--main--0.4--patch-1806
[email protected] Sun, 17 Oct 2004 16:17:03 +0200 (CEST)
Newsgroups
gmane.comp.video.gephex.devel
Message-ID
<[email protected] >
Archive: [email protected]
New revision: gephex--main--0.4--patch-1806
--
Revision: gephex--main--0.4--patch-1806
Archive: [email protected]
Creator: GePhex <[email protected] >
Date: Sun Oct 17 16:16:26 CEST 2004
Standard-date: 2004-10-17 14:16:26 GMT
New-files: modules/src/ffmpegoutmodule/.arch-ids/ffmpegoutmodule.dep.id
modules/src/ffmpegoutmodule/.arch-ids/ffmpegoutmodule.mak.id
modules/src/ffmpegoutmodule/ffmpegoutmodule.dep
modules/src/ffmpegoutmodule/ffmpegoutmodule.mak
Modified-files: build/dummy/dummy.mak build/gephex.dsw
modules/pluc.py modules/src/ffmpegoutmodule/Makefile.am
modules/src/ffmpegoutmodule/ffmpegoutmodule.cpp
modules/src/ffmpegoutmodule/ffmpegoutmodule.dsp
modules/src/ffmpegoutmodule/ffmpegwriter.cpp
modules/src/ffmpegoutmodule/ffmpegwriter.h
modules/src/frboutmodule/frboutmodule.c
util/src/libjoystick/win32joystickdriver.cpp
New-patches: [email protected] /gephex--georg--0.4--patch-307
[email protected] /gephex--georg--0.4--patch-308
[email protected] /gephex--georg--0.4--patch-309
[email protected] /gephex--georg--0.4--patch-310
[email protected] /gephex--main--0.4--patch-1806
Summary: fixed jostick bug #66, add ffmpegoutputmodule to vs6 build, fix missing WITH_SDL makro test in frboutmodule
Keywords:
Patches applied:
* [email protected] /gephex--georg--0.4--patch-307
vs6 build files for ffmpegoutput module
* [email protected] /gephex--georg--0.4--patch-308
Include vs6 build files of ffmpegoutputmodule in dist, add newline at the end of generated Makefile.am in pluc.py
* [email protected] /gephex--georg--0.4--patch-309
vs6 compilation fixes in ffmpegoutmodule, bugfix in win32joystickdriver (bug #66 )
* [email protected] /gephex--georg--0.4--patch-310
Fixes bug in frboutmodule: missing test if SDL is present
* added files
modules/src/ffmpegoutmodule/.arch-ids/ffmpegoutmodule.dep.id
modules/src/ffmpegoutmodule/.arch-ids/ffmpegoutmodule.mak.id
modules/src/ffmpegoutmodule/ffmpegoutmodule.dep
modules/src/ffmpegoutmodule/ffmpegoutmodule.mak
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-307
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-308
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-309
{arch}/gephex/gephex--georg/gephex--georg--0.4/[email protected] /patch-log/patch-310
{arch}/gephex/gephex--main/gephex--main--0.4/[email protected] /patch-log/patch-1806
* modified files
--- orig/build/dummy/dummy.mak
+++ mod/build/dummy/dummy.mak
@@ -39,16 +39,16 @@
!ELSE
-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"
+ALL : "ffmpegoutmodule - Win32 Release" "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 Relea
se" "numbertype - Win32 Release" "numbermodule - Win32 Release" "number2colormodule - Win3
2 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" "effectvcyclemo
dule - Win32 Release" "effectvburnmodule - Win32 Release" "effectvagingmodule - Win32 Rele
ase" "doepfermodule - Win32 Release" "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" "noisemodule - Win32 ReleaseCLEAN" "y4minmodule - Win32 ReleaseCLEAN" "y4moutputmodule - 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" "ffmpegoutmodule - Win32 ReleaseCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -170,7 +170,8 @@
"..\..\modules\srchromakeymodule\Releasehromakeymodule.lib" \
"..\..\modules\src
oisemodule\Release
oisemodule.lib" \
"..\..\modules\src\y4minmodule\Release\y4minmodule.lib" \
- "..\..\modules\src\yuv4mpeg2module\Release\y4moutputmodule.lib"
+ "..\..\modules\src\yuv4mpeg2module\Release\y4moutputmodule.lib" \
+ "..\..\modules\src fmpegoutmodule\Release fmpegoutmodule.lib"
"$(OUTDIR)\dummy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -191,16 +192,16 @@
!ELSE
-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"
+ALL : "ffmpegoutmodule - Win32 Debug" "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 Deb
ug" "number2colormodule - Win32 Debug" "numarithmodule - Win32 Debug" "netcontrolmodule -
Win32 Debug" "miditype - Win32 Debug" "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" "color2numbermodule - Win32 Debug" "capturemodule - Win32 Debu
g" "bwmodule - Win32 Debug" "blurmodule - 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" "noisemodule - Win32 DebugCLEAN" "y4minmodule - Win32 DebugCLEAN" "y4moutputmodule - 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" "ffmpegoutmodule - Win32 DebugCLEAN"
!ELSE
CLEAN :
!ENDIF
@@ -337,7 +338,8 @@
"..\..\modules\srchromakeymodule\Debughromakeymodule.lib" \
"..\..\modules\src
oisemodule\Debug
oisemodule.lib" \
"..\..\modules\src\y4minmodule\Debug\y4minmodule.lib" \
- "..\..\modules\src\yuv4mpeg2module\Debug\y4moutputmodule.lib"
+ "..\..\modules\src\yuv4mpeg2module\Debug\y4moutputmodule.lib" \
+ "..\..\modules\src fmpegoutmodule\Debug fmpegoutmodule.lib"
"$(OUTDIR)\dummy.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
@@ -2500,6 +2502,32 @@
!ENDIF
+!IF "$(CFG)" == "dummy - Win32 Release"
+
+"ffmpegoutmodule - Win32 Release" :
+ cd "ode\gephex-0.4\modules\src fmpegoutmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ". fmpegoutmodule.mak" CFG="ffmpegoutmodule - Win32 Release"
+ cd "..\..\..uild\dummy"
+
+"ffmpegoutmodule - Win32 ReleaseCLEAN" :
+ cd "ode\gephex-0.4\modules\src fmpegoutmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ". fmpegoutmodule.mak" CFG="ffmpegoutmodule - Win32 Release" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ELSEIF "$(CFG)" == "dummy - Win32 Debug"
+
+"ffmpegoutmodule - Win32 Debug" :
+ cd "ode\gephex-0.4\modules\src fmpegoutmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ". fmpegoutmodule.mak" CFG="ffmpegoutmodule - Win32 Debug"
+ cd "..\..\..uild\dummy"
+
+"ffmpegoutmodule - Win32 DebugCLEAN" :
+ cd "ode\gephex-0.4\modules\src fmpegoutmodule"
+ $(MAKE) /$(MAKEFLAGS) /F ". fmpegoutmodule.mak" CFG="ffmpegoutmodule - Win32 Debug" RECURSE=1 CLEAN
+ cd "..\..\..uild\dummy"
+
+!ENDIF
+
!ENDIF
--- orig/build/gephex.dsw
+++ mod/build/gephex.dsw
@@ -551,6 +551,9 @@
Begin Project Dependency
Project_Dep_Name y4moutputmodule
End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name ffmpegoutmodule
+ End Project Dependency
}}}
###############################################################################
@@ -777,6 +780,18 @@
###############################################################################
+Project: "ffmpegoutmodule"="..\modules\src fmpegoutmodule fmpegoutmodule.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "flashmodule"="..\modules\src lashmodule lashmodule.dsp" - Package Owner=<4>
Package=<5>
--- orig/modules/pluc.py
+++ mod/modules/pluc.py
@@ -938,6 +938,7 @@
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_',''),
--- orig/modules/src/ffmpegoutmodule/Makefile.am
+++ mod/modules/src/ffmpegoutmodule/Makefile.am
@@ -35,4 +35,4 @@
DISTCLEANFILES = ffmpegoutmodule.h ffmpegoutmodule_auto.c
-EXTRA_DIST = ffmpegoutmodule.dsp #ffmpegoutmodule.mak ffmpegoutmodule.dep
\ No newline at end of file
+EXTRA_DIST = ffmpegoutmodule.dsp ffmpegoutmodule.mak ffmpegoutmodule.dep
--- orig/modules/src/ffmpegoutmodule/ffmpegoutmodule.cpp
+++ mod/modules/src/ffmpegoutmodule/ffmpegoutmodule.cpp
@@ -40,8 +40,6 @@
{
scaledFb=framebuffer_newInstance();
ffmpegWriter = 0;
- x_res=0;
- y_res=0;
}
~_MyInstance()
@@ -51,8 +49,6 @@
}
std::string filename;
- size_t x_res;
- size_t y_res;
std::string encoding;
FrameBufferType* scaledFb;
@@ -128,7 +124,8 @@
// the framebuffer
uint32_t* fb;
- if (inst->in_in->xsize != my.x_res || inst->in_in->ysize != my.y_res)
+ if (inst->in_in->xsize != my.ffmpegWriter->getXres() ||
+ inst->in_in->ysize != my.ffmpegWriter->getYres())
{
FrameBufferAttributes in_attr;
framebuffer_getAttributes(inst->in_in, &in_attr);
--- orig/modules/src/ffmpegoutmodule/ffmpegoutmodule.dsp
+++ mod/modules/src/ffmpegoutmodule/ffmpegoutmodule.dsp
@@ -5,17 +5,17 @@
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=ffmpegoutmodule - Win32 Debug
-!MESSAGE Dies ist kein gueltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und fuehren Sie den Befehl
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "ffmpegoutmodule.mak".
!MESSAGE
-!MESSAGE Sie koennen beim Ausfuehren von NMAKE eine Konfiguration angeben
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "ffmpegoutmodule.mak" CFG="ffmpegoutmodule - Win32 Debug"
!MESSAGE
-!MESSAGE Fuer die Konfiguration stehen zur Auswahl:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
!MESSAGE "ffmpegoutmodule - Win32 Release" (basierend auf "Win32 (x86) Dynamic-Link Library")
!MESSAGE "ffmpegoutmodule - Win32 Debug" (basierend auf "Win32 (x86) Dynamic-Link Library")
@@ -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 "ffmpegoutmodule_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /G6 /MD /W3 /GX /O2 /Ob2 /I "../../../types/src/stringtype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../engine/src/engine" /I "../../../" /I "../../../util/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ffmpegoutmodule_EXPORTS" /D "WIN32" /D "NDEBUG" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /G6 /MD /w /W0 /GX /O2 /Ob2 /I "../../../types/src/stringtype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../contrib/ffmpeg/libavformat" /I "../../../contrib/ffmpeg/libavcodec" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ffmpegoutmodule_EXPORTS" /D "WIN32" /D "NDEBUG" /D "HAVE_CONFIG_H" /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 /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 avcodec.lib avformat.lib /nologo /dll /machine:I386 /libpath:"../../../contrib/ffmpeg/libavformat" /libpath:"../../../contrib/ffmpeg/libavcodec"
# Begin Special Build Tool
TargetPath=.\Release fmpegoutmodule.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 "ffmpegoutmodule_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /G6 /MDd /W2 /Gm /GX /ZI /Od /I "../../../types/src/stringtype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../" /I "../../../engine/src/engine" /I "../../../util/include" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ffmpegoutmodule_EXPORTS" /D "WIN32" /D "_DEBUG" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
+# ADD CPP /nologo /G6 /MDd /w /W0 /Gm /GX /ZI /Od /I "../../../types/src/stringtype" /I "../../../types/src/framebuffertype" /I "../../../types/src/numbertype" /I "../../../" /I "../../../engine/src/engine" /I "../../../util/include" /I "../../../contrib/ffmpeg/libavformat" /I "../../../contrib/ffmpeg/libavcodec" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ffmpegoutmodule_EXPORTS" /D "WIN32" /D "_DEBUG" /D "HAVE_CONFIG_H" /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 /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"winspool" /nodefaultlib:"comdlg32" /nodefaultlib:"uuid" /nodefaultlib:"odbc32" /nodefaultlib:"odbccp32" /nodefaultlib:"oleaut32" /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 avcodec.lib avformat.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"winspool" /nodefaultlib:"comdlg32" /nodefaultlib:"uuid" /nodefaultlib:"odbc32" /nodefaultlib:"odbccp32" /nodefaultlib:"oleaut32" /pdbtype:sept /libpath:"../../../contrib/ffmpeg/libavformat" /libpath:"../../../contrib/ffmpeg/libavcodec"
# SUBTRACT LINK32 /incremental:no
# Begin Special Build Tool
TargetPath=.\Debug fmpegoutmodule.dll
@@ -94,6 +94,7 @@
PostBuild_Desc=Kopiere Dll...
PostBuild_Cmds=copy $(TargetPath) ..\..\..\dlls\modules
# End Special Build Tool
+
!ENDIF
# Begin Target
@@ -105,21 +106,16 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=. fmpegoutmodule.c
-
-!IF "$(CFG)" == "ffmpegoutmodule - Win32 Release"
-
-!ELSEIF "$(CFG)" == "ffmpegoutmodule - Win32 Debug"
-
-# ADD CPP /MDd
-
-!ENDIF
-
+SOURCE=. fmpegoutmodule.cpp
# End Source File
# Begin Source File
SOURCE=. fmpegoutmodule_auto.c
# End Source File
+# Begin Source File
+
+SOURCE=. fmpegwriter.cpp
+# End Source File
# End Group
# Begin Group "Header-Dateien"
@@ -128,6 +124,10 @@
SOURCE=. fmpegoutmodule.h
# End Source File
+# Begin Source File
+
+SOURCE=. fmpegwriter.h
+# End Source File
# End Group
# Begin Group "Ressourcendateien"
@@ -151,7 +151,7 @@
python ..\..\pluc.py c $(InputName).spec \
python ..\..\pluc.py h $(InputName).spec \
python ..\..\pluc.py def $(InputName).spec \
-
+
"$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -173,7 +173,7 @@
python ..\..\pluc.py c $(InputName).spec \
python ..\..\pluc.py h $(InputName).spec \
python ..\..\pluc.py def $(InputName).spec \
-
+
"$(InputName).h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
@@ -194,4 +194,3 @@
# End Source File
# End Target
# End Project
-
--- orig/modules/src/ffmpegoutmodule/ffmpegwriter.cpp
+++ mod/modules/src/ffmpegoutmodule/ffmpegwriter.cpp
@@ -82,15 +82,20 @@
}
int FFMpegWriter::initEncoderMap()
-{
- encmap["DIVX High"] = std::make_pair(800000, "avi" );
- encmap["DIVX Low"] = std::make_pair(200000, "avi" );
- encmap["MPEG2 High"] = std::make_pair(800000, "mpeg");
- encmap["MPEG2 Low"] = std::make_pair(200000, "mpeg");
- encmap["RM High"] = std::make_pair(800000, "rm" );
- encmap["RM Low"] = std::make_pair(200000, "rm" );
- encmap["MOV High"] = std::make_pair(800000, "mov" );
- encmap["MOV Low"] = std::make_pair(200000, "mov" );
+{
+ /*
+ * Had to add the template qualifiers <int, const char*>, because
+ * otherwise vs6 does not compile...
+ * georg
+ */
+ encmap["DIVX High"] = std::make_pair<int, const char*>(800000, "avi" );
+ encmap["DIVX Low"] = std::make_pair<int, const char*>(200000, "avi" );
+ encmap["MPEG2 High"] = std::make_pair<int, const char*>(800000, "mpeg");
+ encmap["MPEG2 Low"] = std::make_pair<int, const char*>(200000, "mpeg");
+ encmap["RM High"] = std::make_pair<int, const char*>(800000, "rm" );
+ encmap["RM Low"] = std::make_pair<int, const char*>(200000, "rm" );
+ encmap["MOV High"] = std::make_pair<int, const char*>(800000, "mov" );
+ encmap["MOV Low"] = std::make_pair<int, const char*>(200000, "mov" );
return 0;
}
--- orig/modules/src/ffmpegoutmodule/ffmpegwriter.h
+++ mod/modules/src/ffmpegoutmodule/ffmpegwriter.h
@@ -23,7 +23,8 @@
#include <iostream>
#include <map>
-
+
+#define EMULATE_INTTYPES
#include "avformat.h"
#include "avcodec.h"
--- orig/modules/src/frboutmodule/frboutmodule.c
+++ mod/modules/src/frboutmodule/frboutmodule.c
@@ -362,7 +362,9 @@
insert_driver("X11", X11_get_driver);
#endif
+#if defined(WITH_SDL)
insert_driver("SDL", SDL_get_driver);
+#endif
#if defined(WITH_GL)
insert_driver("GL", GL_get_driver);
--- orig/util/src/libjoystick/win32joystickdriver.cpp
+++ mod/util/src/libjoystick/win32joystickdriver.cpp
@@ -75,7 +75,7 @@
ji.dwSize = sizeof(ji);
ji.dwFlags = JOY_RETURNALL | JOY_RETURNCENTERED |JOY_USEDEADZONE;
- hr = joyGetPosEx( 0, &ji );
+ hr = joyGetPosEx( m_handle, &ji );
if (hr != JOYERR_NOERROR)
{
throw std::runtime_error("Could not get Joystick Pos!");