diff options
| -rw-r--r-- | src/liblpcm/xine_decoder.c | 7 | ||||
| -rw-r--r-- | win32/source/resource.aps | bin | 246259 -> 246259 bytes | |||
| -rw-r--r-- | win32/xine.dsw | 12 | ||||
| -rwxr-xr-x | win32/xineplug_dmx_lpcm.dsp | 110 | ||||
| -rwxr-xr-x | win32/xineplug_inp_cdda.dsp | 114 |
5 files changed, 242 insertions, 1 deletions
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c index 12546e70c..c71d40ab4 100644 --- a/src/liblpcm/xine_decoder.c +++ b/src/liblpcm/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.41 2003/05/17 18:18:52 jstembridge Exp $ + * $Id: xine_decoder.c,v 1.42 2003/05/19 10:06:36 tchamp Exp $ * * 31-8-2001 Added LPCM rate sensing. * (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk @@ -39,6 +39,11 @@ #include "audio_out.h" #include "buffer.h" +#ifdef WIN32 +#include <winsock.h> +/*#include <Winsock2.h>*/ /* htons */ +#endif + typedef struct { audio_decoder_class_t decoder_class; } lpcm_class_t; diff --git a/win32/source/resource.aps b/win32/source/resource.aps Binary files differindex 6bf3de73a..7663c0e79 100644 --- a/win32/source/resource.aps +++ b/win32/source/resource.aps diff --git a/win32/xine.dsw b/win32/xine.dsw index 41c5c334c..42b0e6831 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -360,6 +360,18 @@ Package=<4> ############################################################################### +Project: "xineplug_dmx_lpcm"=".\xineplug_dmx_lpcm.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "xineplug_dmx_mpeg"=".\xineplug_dmx_mpeg.dsp" - Package Owner=<4> Package=<5> diff --git a/win32/xineplug_dmx_lpcm.dsp b/win32/xineplug_dmx_lpcm.dsp new file mode 100755 index 000000000..9f86dd8ac --- /dev/null +++ b/win32/xineplug_dmx_lpcm.dsp @@ -0,0 +1,110 @@ +# Microsoft Developer Studio Project File - Name="xineplug_dmx_lpcm" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=xineplug_dmx_lpcm - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "xineplug_dmx_lpcm.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "xineplug_dmx_lpcm.mak" CFG="xineplug_dmx_lpcm - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xineplug_dmx_lpcm - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xineplug_dmx_lpcm - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "xineplug_dmx_lpcm - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release/xineplug_dmx_lpcm" +# PROP Intermediate_Dir "Release/xineplug_dmx_lpcm" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_dmx_lpcm.so" + +!ELSEIF "$(CFG)" == "xineplug_dmx_lpcm - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug/xineplug_dmx_lpcm" +# PROP Intermediate_Dir "Debug/xineplug_dmx_lpcm" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DMX_LPCM_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_dmx_lpcm.so" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "xineplug_dmx_lpcm - Win32 Release" +# Name "xineplug_dmx_lpcm - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\liblpcm\xine_decoder.c +# End Source File +# End Group +# Begin Group "Dll Defs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\xineplug_dmx.def +# End Source File +# End Group +# End Target +# End Project diff --git a/win32/xineplug_inp_cdda.dsp b/win32/xineplug_inp_cdda.dsp new file mode 100755 index 000000000..425350d0f --- /dev/null +++ b/win32/xineplug_inp_cdda.dsp @@ -0,0 +1,114 @@ +# Microsoft Developer Studio Project File - Name="xineplug_inp_cdda" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=xineplug_inp_cdda - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "xineplug_inp_cdda.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "xineplug_inp_cdda.mak" CFG="xineplug_inp_cdda - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xineplug_inp_cdda - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "xineplug_inp_cdda - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "xineplug_inp_cdda - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release/xineplug_inp_cdda" +# PROP Intermediate_Dir "Release/xineplug_inp_cdda" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 /nologo /dll /machine:I386 /out:"Release/bin/plugins/xineplug_inp_cdda.so" + +!ELSEIF "$(CFG)" == "xineplug_inp_cdda - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug/xineplug_inp_cdda" +# PROP Intermediate_Dir "Debug/xineplug_inp_cdda" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +LIB32=link.exe +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "contrib/dirent" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_CDDA_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_cdda.so" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none + +!ENDIF + +# Begin Target + +# Name "xineplug_inp_cdda - Win32 Release" +# Name "xineplug_inp_cdda - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\input\input_cdda.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\media_helper.c +# End Source File +# End Group +# Begin Group "DLL Defs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\xineplug_inp.def +# End Source File +# End Group +# End Target +# End Project |