From 883cc45e4791c8f796de86e31fe72e5a6deae709 Mon Sep 17 00:00:00 2001 From: Tim Champagne Date: Tue, 6 May 2003 14:02:24 +0000 Subject: This is some general Win32 cleanup and getting ready for DVD support. CVS patchset: 4779 CVS date: 2003/05/06 14:02:24 --- src/audio_out/audio_directx_out.c | 5 - src/demuxers/demux_cdda.c | 12 +- src/input/input_dvd.c | 32 +- src/input/media_helper.c | 19 +- src/libspucc/cc_decoder.c | 9 +- src/xine-engine/video_out.c | 6 +- win32/include/unistd.h | 129 ++-- win32/include/xinesuppt.h | 20 + win32/libdvdnav.dsp | 290 ++++----- win32/libxine.dsp | 4 +- win32/libxinesupport.def | 443 +++++++------- win32/libxinesuppt.dsp | 31 +- win32/libxineutils.dsp | 3 +- win32/source/xineui.cpp | 25 +- win32/xine.dsw | 1162 ++++++++++++++++++------------------- win32/xineplug_ao_out.def | 14 +- win32/xineplug_ao_out_directx.dsp | 2 +- win32/xineplug_decode_a52.dsp | 2 +- win32/xineplug_decode_dts.dsp | 2 +- win32/xineplug_decode_ff.dsp | 2 +- win32/xineplug_decode_lpcm.dsp | 2 +- win32/xineplug_decode_mad.dsp | 2 +- win32/xineplug_decode_mpeg2.dsp | 2 +- win32/xineplug_decode_real.dsp | 2 +- win32/xineplug_decode_spu.dsp | 2 +- win32/xineplug_decode_spucc.dsp | 2 +- win32/xineplug_decode_sputext.dsp | 2 +- win32/xineplug_dmx_asf.dsp | 2 +- win32/xineplug_dmx_avi.dsp | 2 +- win32/xineplug_dmx_cda.dsp | 2 +- win32/xineplug_dmx_mpeg.dsp | 2 +- win32/xineplug_dmx_mpeg_audio.dsp | 2 +- win32/xineplug_dmx_mpeg_block.dsp | 2 +- win32/xineplug_dmx_mpeg_pes.dsp | 2 +- win32/xineplug_dmx_mpeg_ts.dsp | 2 +- win32/xineplug_inp_dvd.dsp | 8 +- win32/xineplug_inp_file.dsp | 2 +- win32/xineplug_vo_out_directx.dsp | 2 +- win32/xineui.dsp | 4 +- 39 files changed, 1183 insertions(+), 1075 deletions(-) create mode 100755 win32/include/xinesuppt.h diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c index 12b66fb08..7f6550701 100755 --- a/src/audio_out/audio_directx_out.c +++ b/src/audio_out/audio_directx_out.c @@ -936,8 +936,3 @@ plugin_info_t xine_plugin_info[] = { { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; -ao_info_t *get_audio_out_plugin_info() -{ - return (ao_info_t *)&dec_info_audio; -} - diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index b8ed0bf5c..028443f35 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -22,7 +22,7 @@ * linear PCM "decoder" (which in turn sends them directly to the audio * output target; this is a really fancy CD-playing architecture). * - * $Id: demux_cdda.c,v 1.5 2003/03/07 12:51:47 guenter Exp $ + * $Id: demux_cdda.c,v 1.6 2003/05/06 14:02:25 tchamp Exp $ * */ @@ -282,3 +282,13 @@ void *demux_cdda_init_plugin (xine_t *xine, void *data) { return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 21, "cdda", XINE_VERSION_CODE, NULL, demux_cdda_init_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 8a207a644..492afcfaa 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,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: input_dvd.c,v 1.159 2003/05/03 14:24:08 mroi Exp $ + * $Id: input_dvd.c,v 1.160 2003/05/06 14:02:25 tchamp Exp $ * */ @@ -83,14 +83,9 @@ /* DVDNAV includes */ #ifdef HAVE_DVDNAV -#ifndef _MSC_VER # include # include #else -# include "dvdnav.h" -# include "nav_read.h" -#endif /* _MSC_VER */ -#else # define DVDNAV_COMPILE # include "dvdnav.h" #endif @@ -121,6 +116,10 @@ #if defined(__sun) #define DVD_PATH "/vol/dev/aliases/cdrom0" #define RDVD_PATH "" +#elif WIN32 +/* There really isn't a default on Windows! */ +#define DVD_PATH "d:\\" +#define RDVD_PATH "d:\\" #else #define DVD_PATH "/dev/dvd" #define RDVD_PATH "/dev/rdvd" @@ -1228,12 +1227,17 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { /* we already checked the "dvd:/" MRL above */ locator = &this->mrl[strlen(handled_mrl)]; while (*locator == '/') locator++; + +#ifndef _MSC_VER /* we skipped at least one slash, get it back */ locator--; +#endif /* Attempt to parse MRL */ last_slash = strlen(locator); - while(last_slash && locator[last_slash] != '/') last_slash--; + while(last_slash && + ((locator[last_slash] != '/') && (locator[last_slash] != '\\'))) + last_slash--; if(last_slash) { /* we have an alternative dvd_path */ @@ -1243,7 +1247,13 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { }else{ intended_dvd_device=class->dvd_device; } + +#ifdef _MSC_VER + if (*locator == '/') + locator++; +#else locator++; +#endif if(locator[0]) { this->mode = MODE_TITLE; @@ -1304,8 +1314,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { /* Set seek mode */ if (xine_config_lookup_entry(this->stream->xine, "input.dvd_seek_behaviour", &cache_entry)) - seek_mode_cb(class, &cache_entry); - + seek_mode_cb(class, &cache_entry); if(this->mode == MODE_TITLE) { int tt, i, pr, found; @@ -1321,8 +1330,8 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { locator[i] = '\0'; } } - tt = strtol(locator, NULL,10); + tt = strtol(locator, NULL,10); dvdnav_get_number_of_titles(this->dvdnav, &titles); if((tt <= 0) || (tt > titles)) { printf("input_dvd: Title %i is out of range (1 to %i).\n", tt, @@ -1612,6 +1621,9 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.160 2003/05/06 14:02:25 tchamp + * This is some general Win32 cleanup and getting ready for DVD support. + * * Revision 1.159 2003/05/03 14:24:08 mroi * as announced on xine-devel: * * I change the SPU decoder API to make it look less DVD specific diff --git a/src/input/media_helper.c b/src/input/media_helper.c index 8c71e09f7..5d387bb44 100644 --- a/src/input/media_helper.c +++ b/src/input/media_helper.c @@ -27,9 +27,13 @@ #include #include #include + +#ifndef WIN32 #include -#include #include +#endif + +#include #include #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) @@ -38,6 +42,7 @@ #include #elif defined(HAVE_SYS_CDIO_H) #include +#elif WIN32 #else #warning "This might not compile due to missing cdrom ioctls" #endif @@ -47,6 +52,7 @@ static int media_umount_media(char *device) { +#ifndef WIN32 char *argv[10]; int i; pid_t pid; @@ -71,11 +77,17 @@ static int media_umount_media(char *device) } while(1); return -1; +#else + return 0; +#endif /* WIN32 */ } int media_eject_media (char *device) { + +#ifndef WIN32 int ret, status; int fd; +#endif /* WIN32 */ /* printf("input_dvd: Eject Device %s current device %s opened=%d handle=%p trying...\n",device, this->current_dvd_device, this->opened, this->dvdnav); */ media_umount_media(device); @@ -83,6 +95,8 @@ int media_eject_media (char *device) { printf("ipnut_dvd: umount result: %s\n", strerror(errno)); ***********/ + +#ifndef WIN32 if ((fd = open (device, O_RDONLY|O_NONBLOCK)) > -1) { #if defined (__linux__) @@ -130,5 +144,8 @@ int media_eject_media (char *device) { printf("input_dvd: Device %s failed to open during eject calls\n",device); } return 1; +#else + return 0; +#endif /* WIN32 */ } diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c index ca52f869e..5c47b4a53 100644 --- a/src/libspucc/cc_decoder.c +++ b/src/libspucc/cc_decoder.c @@ -20,7 +20,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: cc_decoder.c,v 1.20 2003/03/26 11:06:55 miguelfreitas Exp $ + * $Id: cc_decoder.c,v 1.21 2003/05/06 14:02:26 tchamp Exp $ * * stuff needed to provide closed captioning decoding and display * @@ -62,8 +62,15 @@ /* number of text colors specified by EIA-608 standard */ #define NUM_FG_COL 7 +#ifndef _MSC_VER /* colors specified by the EIA 608 standard */ enum { WHITE, GREEN, BLUE, CYAN, RED, YELLOW, MAGENTA, BLACK, TRANSPARENT }; +#else +/* colors specified by the EIA 608 standard */ +enum { WHITE, GREEN, BLUE, CYAN, RED, YELLOW, MAGENTA, BLACK }; +#endif + + /* color mapping to OSD text color indices */ static int text_colormap[NUM_FG_COL] = { diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index 30c4d5197..7dea53123 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.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: video_out.c,v 1.156 2003/05/05 22:29:31 tmattern Exp $ + * $Id: video_out.c,v 1.157 2003/05/06 14:02:27 tchamp Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -837,13 +837,15 @@ static void *video_out_loop (void *this_gen) { int64_t frame_duration, next_frame_vpts; int64_t usec_to_sleep; +#ifndef WIN32 /* nice(-value) will fail silently for normal users. * however when running as root this may provide smoother * playback. follow the link for more information: * http://cambuca.ldhs.cetuc.puc-rio.br/~miguel/multimedia_sim/ */ nice(-2); - +#endif /* WIN32 */ + /* * here it is - the heart of xine (or rather: one of the hearts * of xine) : the video output loop diff --git a/win32/include/unistd.h b/win32/include/unistd.h index 22287d239..2f8bc5989 100644 --- a/win32/include/unistd.h +++ b/win32/include/unistd.h @@ -1,58 +1,71 @@ -/* - * Copyright (C) 2000-2001 the xine project - * - * This file is part of xine, a unix video player. - * - * xine is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * xine is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * WIN32 PORT, - * by Matthew Grooms - * - * unistd.h - This is mostly a catch all header that maps standard unix - * libc calls to the equivelent win32 functions. - * - */ - -#include -#include -#include -#include - -#include "timer.h" - -#ifndef _SYS_UNISTD_H_ -#define _SYS_UNISTD_H_ - -#define inline __inline - -#define mkdir( A, B ) _mkdir( A ) -#define lstat stat -#define S_ISDIR(A) ( S_IFDIR & A ) -#define S_IXUSR S_IEXEC -#define S_IXGRP S_IEXEC -#define S_IXOTH S_IEXEC - -#define M_PI 3.14159265358979323846 /* pi */ - -#define bzero( A, B ) memset( A, 0, B ) -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#define snprintf _snprintf -#define vsnprintf _vsnprintf - -// FIXME : I dont remember why this is here -#define readlink - -#endif +/* + * Copyright (C) 2000-2001 the xine project + * + * This file is part of xine, a unix video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * WIN32 PORT, + * by Matthew Grooms + * + * unistd.h - This is mostly a catch all header that maps standard unix + * libc calls to the equivelent win32 functions. + * + */ + +#include +#include +#include +#include + +#include + +#include + +#ifndef _SYS_UNISTD_H_ +#define _SYS_UNISTD_H_ + +#define inline __inline + +#define mkdir( A, B ) _mkdir( A ) +#define lstat stat + +#ifndef S_ISDIR +#define S_ISDIR(A) ( S_IFDIR & A ) +#endif + +#define S_IXUSR S_IEXEC +#define S_IXGRP S_IEXEC +#define S_IXOTH S_IEXEC + +#define M_PI 3.14159265358979323846 /* pi */ + +#define bzero( A, B ) memset( A, 0, B ) + +#ifndef strcasecmp +#define strcasecmp _stricmp +#endif + +#ifndef strncasecmp +#define strncasecmp _strnicmp +#endif + +#define snprintf _snprintf +#define vsnprintf _vsnprintf + +// FIXME : I dont remember why this is here +#define readlink + +#endif diff --git a/win32/include/xinesuppt.h b/win32/include/xinesuppt.h new file mode 100755 index 000000000..bb61cdddb --- /dev/null +++ b/win32/include/xinesuppt.h @@ -0,0 +1,20 @@ + +#ifndef XINESUPPT_H +#define XINESUPPT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + + +void setenv(const char *name, const char *val, int _xx); + +#ifdef __cplusplus +} +#endif + +#endif /* XINESUPPT_H */ diff --git a/win32/libdvdnav.dsp b/win32/libdvdnav.dsp index c0a8846c8..7d4556cb2 100644 --- a/win32/libdvdnav.dsp +++ b/win32/libdvdnav.dsp @@ -1,145 +1,145 @@ -# Microsoft Developer Studio Project File - Name="libdvdnav" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 - -CFG=libdvdnav - 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 "libdvdnav.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 "libdvdnav.mak" CFG="libdvdnav - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "libdvdnav - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "libdvdnav - 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)" == "libdvdnav - 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/libdvdnav" -# PROP Intermediate_Dir "Release/libdvdnav" -# 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 "LIBDVDNAV_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 "LIBDVDNAV_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /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/libdvdnav.dll" - -!ELSEIF "$(CFG)" == "libdvdnav - 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/libdvdnav" -# PROP Intermediate_Dir "Debug/libdvdnav" -# 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 "LIBDVDNAV_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "../include" /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdread" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDNAV_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /I /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libdvdnav.dll" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "libdvdnav - Win32 Release" -# Name "libdvdnav - 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\libdvdnav\decoder.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\dvdnav.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\highlight.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\navigation.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\read_cache.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\remap.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\searching.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\settings.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\vm.c -# End Source File -# Begin Source File - -SOURCE=..\src\input\libdvdnav\vmcmd.c -# End Source File -# End Group -# Begin Group "DLL Defs" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=.\libdvdnav.def -# End Source File -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="libdvdnav" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=libdvdnav - 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 "libdvdnav.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 "libdvdnav.mak" CFG="libdvdnav - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libdvdnav - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libdvdnav - 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)" == "libdvdnav - 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/libdvdnav" +# PROP Intermediate_Dir "Release/libdvdnav" +# 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 "LIBDVDNAV_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 "LIBDVDNAV_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /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/libdvdnav.dll" + +!ELSEIF "$(CFG)" == "libdvdnav - 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/libdvdnav" +# PROP Intermediate_Dir "Debug/libdvdnav" +# 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 "LIBDVDNAV_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "../include" /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdread" /I "../src/input/libdvdnav" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBDVDNAV_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /I /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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libdvdnav.dll" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "libdvdnav - Win32 Release" +# Name "libdvdnav - 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\libdvdnav\decoder.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\dvdnav.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\highlight.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\navigation.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\read_cache.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\remap.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\searching.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\settings.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\vm.c +# End Source File +# Begin Source File + +SOURCE=..\src\input\libdvdnav\vmcmd.c +# End Source File +# End Group +# Begin Group "DLL Defs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\libdvdnav.def +# End Source File +# End Group +# End Target +# End Project diff --git a/win32/libxine.dsp b/win32/libxine.dsp index adf41b803..944ba17cd 100644 --- a/win32/libxine.dsp +++ b/win32/libxine.dsp @@ -76,7 +76,7 @@ PostBuild_Cmds=scripts\move_xine_fonts.bat Release # 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 "LIBXINE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I ".." /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/pthreads" /I "contrib/zlib" /I "contrib/dirent" /I "contrib/timer" /I "../include" /I ".." /I "../intl" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINE_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "__WINE_WINDEF_H" /D "__WINE_WINGDI_H" /D "__WINE_VFW_H" /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" @@ -86,7 +86,7 @@ BSC32=bscmake.exe # 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 uuid.lib wsock32.lib comctl32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxine.dll" /pdbtype:sept +# ADD LINK32 libdvdnav.lib wsock32.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxine.dll" /pdbtype:sept /libpath:"lib" # SUBTRACT LINK32 /pdb:none # Begin Special Build Tool SOURCE="$(InputPath)" diff --git a/win32/libxinesupport.def b/win32/libxinesupport.def index 3af14cc34..12e50ab43 100644 --- a/win32/libxinesupport.def +++ b/win32/libxinesupport.def @@ -1,219 +1,224 @@ -;------------------------------------------------------------ -; LIBXINESUPPORT DLL DEFINITIONS FILE - -EXPORTS - -;------------------------------------------------------------ -; dirent exports - -opendir -closedir -readdir -rewinddir - -;------------------------------------------------------------ -; pthread exports - -;pthread_atfork -pthread_attr_destroy -pthread_attr_getdetachstate -pthread_attr_getinheritsched -pthread_attr_getschedparam -pthread_attr_getschedpolicy -pthread_attr_getscope -pthread_attr_getstackaddr -pthread_attr_getstacksize -pthread_attr_init -pthread_attr_setdetachstate -pthread_attr_setinheritsched -pthread_attr_setschedparam -pthread_attr_setschedpolicy -pthread_attr_setscope -pthread_attr_setstackaddr -pthread_attr_setstacksize -pthread_cancel -; -; These two are implemented as macros in pthread.h -; -;pthread_cleanup_pop -;pthread_cleanup_push -; -pthread_condattr_destroy -pthread_condattr_getpshared -pthread_condattr_init -pthread_condattr_setpshared -pthread_cond_broadcast -pthread_cond_destroy -pthread_cond_init -pthread_cond_signal -pthread_cond_timedwait -pthread_cond_wait -pthread_create -pthread_detach -pthread_equal -pthread_exit -pthread_getconcurrency -pthread_getschedparam -pthread_getspecific -pthread_join -pthread_key_create -pthread_key_delete -;pthread_kill -pthread_mutexattr_destroy -;pthread_mutexattr_getprioceiling -;pthread_mutexattr_getprotocol -pthread_mutexattr_getpshared -pthread_mutexattr_gettype -pthread_mutexattr_init -;pthread_mutexattr_setprioceiling -;pthread_mutexattr_setprotocol -pthread_mutexattr_setpshared -pthread_mutexattr_settype -pthread_mutexattr_destroy -pthread_mutex_init -pthread_mutex_destroy -pthread_mutex_lock -pthread_mutex_trylock -pthread_mutex_unlock -pthread_once -pthread_self -pthread_setcancelstate -pthread_setcanceltype -pthread_setconcurrency -pthread_setschedparam -pthread_setspecific -;pthread_sigmask -pthread_testcancel -; -; POSIX 1.b -; -sched_get_priority_min -sched_get_priority_max -sched_getscheduler -sched_setscheduler -sched_yield -sem_init -sem_destroy -sem_trywait -sem_wait -sem_post -sem_open -sem_close -sem_unlink -sem_getvalue -; -; This next one is a macro -;sched_rr_get_interval -; -; -; Read/Write Locks -; -pthread_rwlock_init -pthread_rwlock_destroy -pthread_rwlock_tryrdlock -pthread_rwlock_trywrlock -pthread_rwlock_rdlock -pthread_rwlock_wrlock -pthread_rwlock_unlock -; -; Spin locks -; -pthread_spin_init -pthread_spin_destroy -pthread_spin_lock -pthread_spin_unlock -pthread_spin_trylock -; -; Barriers -; -pthread_barrier_init -pthread_barrier_destroy -pthread_barrier_wait -pthread_barrierattr_init -pthread_barrierattr_destroy -pthread_barrierattr_getpshared -pthread_barrierattr_setpshared -; -; Non-portable/compatibility with other implementations -; -pthread_delay_np -pthread_mutexattr_getkind_np -pthread_mutexattr_setkind_np -; -; Non-portable local implementation only -; -pthread_getw32threadhandle_np -pthread_getprocessors_np -pthreadCancelableWait -pthreadCancelableTimedWait -; -; For use when linking statically -; -pthread_win32_process_attach_np -pthread_win32_process_detach_np -pthread_win32_thread_attach_np -pthread_win32_thread_detach_np -; -; Needed if !defined(_MSC_VER) && !defined(__cplusplus) -; -ptw32_push_cleanup -ptw32_pop_cleanup -; -; Not for use directly. Needed by macros in pthread.h -; to return internal SEH code. -; -ptw32_get_exception_services_code - -;------------------------------------------------------------ -; timer exports - -adler32 -compress -crc32 -deflate -deflateCopy -deflateEnd -deflateInit2_ -deflateInit_ -deflateParams -deflateReset -deflateSetDictionary -gzclose -gzdopen -gzerror -gzflush -gzopen -gzread -gzwrite -inflate -inflateEnd -inflateInit2_ -inflateInit_ -inflateReset -inflateSetDictionary -inflateSync -uncompress -zlibVersion -gzprintf -gzputc -gzgetc -gzseek -gzrewind -gztell -gzeof -gzsetparams -zError -inflateSyncPoint -get_crc_table -compress2 -gzputs -gzgets - -;------------------------------------------------------------ -; timer exports - -gettimeofday -setitimer -pause -sleep -nanosleep +;------------------------------------------------------------ +; LIBXINESUPPORT DLL DEFINITIONS FILE + +EXPORTS + +;------------------------------------------------------------ +; dirent exports + +opendir +closedir +readdir +rewinddir + +;------------------------------------------------------------ +; pthread exports + +;pthread_atfork +pthread_attr_destroy +pthread_attr_getdetachstate +pthread_attr_getinheritsched +pthread_attr_getschedparam +pthread_attr_getschedpolicy +pthread_attr_getscope +pthread_attr_getstackaddr +pthread_attr_getstacksize +pthread_attr_init +pthread_attr_setdetachstate +pthread_attr_setinheritsched +pthread_attr_setschedparam +pthread_attr_setschedpolicy +pthread_attr_setscope +pthread_attr_setstackaddr +pthread_attr_setstacksize +pthread_cancel +; +; These two are implemented as macros in pthread.h +; +;pthread_cleanup_pop +;pthread_cleanup_push +; +pthread_condattr_destroy +pthread_condattr_getpshared +pthread_condattr_init +pthread_condattr_setpshared +pthread_cond_broadcast +pthread_cond_destroy +pthread_cond_init +pthread_cond_signal +pthread_cond_timedwait +pthread_cond_wait +pthread_create +pthread_detach +pthread_equal +pthread_exit +pthread_getconcurrency +pthread_getschedparam +pthread_getspecific +pthread_join +pthread_key_create +pthread_key_delete +;pthread_kill +pthread_mutexattr_destroy +;pthread_mutexattr_getprioceiling +;pthread_mutexattr_getprotocol +pthread_mutexattr_getpshared +pthread_mutexattr_gettype +pthread_mutexattr_init +;pthread_mutexattr_setprioceiling +;pthread_mutexattr_setprotocol +pthread_mutexattr_setpshared +pthread_mutexattr_settype +pthread_mutexattr_destroy +pthread_mutex_init +pthread_mutex_destroy +pthread_mutex_lock +pthread_mutex_trylock +pthread_mutex_unlock +pthread_once +pthread_self +pthread_setcancelstate +pthread_setcanceltype +pthread_setconcurrency +pthread_setschedparam +pthread_setspecific +;pthread_sigmask +pthread_testcancel +; +; POSIX 1.b +; +sched_get_priority_min +sched_get_priority_max +sched_getscheduler +sched_setscheduler +sched_yield +sem_init +sem_destroy +sem_trywait +sem_wait +sem_post +sem_open +sem_close +sem_unlink +sem_getvalue +; +; This next one is a macro +;sched_rr_get_interval +; +; +; Read/Write Locks +; +pthread_rwlock_init +pthread_rwlock_destroy +pthread_rwlock_tryrdlock +pthread_rwlock_trywrlock +pthread_rwlock_rdlock +pthread_rwlock_wrlock +pthread_rwlock_unlock +; +; Spin locks +; +pthread_spin_init +pthread_spin_destroy +pthread_spin_lock +pthread_spin_unlock +pthread_spin_trylock +; +; Barriers +; +pthread_barrier_init +pthread_barrier_destroy +pthread_barrier_wait +pthread_barrierattr_init +pthread_barrierattr_destroy +pthread_barrierattr_getpshared +pthread_barrierattr_setpshared +; +; Non-portable/compatibility with other implementations +; +pthread_delay_np +pthread_mutexattr_getkind_np +pthread_mutexattr_setkind_np +; +; Non-portable local implementation only +; +pthread_getw32threadhandle_np +pthread_getprocessors_np +pthreadCancelableWait +pthreadCancelableTimedWait +; +; For use when linking statically +; +pthread_win32_process_attach_np +pthread_win32_process_detach_np +pthread_win32_thread_attach_np +pthread_win32_thread_detach_np +; +; Needed if !defined(_MSC_VER) && !defined(__cplusplus) +; +ptw32_push_cleanup +ptw32_pop_cleanup +; +; Not for use directly. Needed by macros in pthread.h +; to return internal SEH code. +; +ptw32_get_exception_services_code + +;------------------------------------------------------------ +; zlib exports + +adler32 +compress +crc32 +deflate +deflateCopy +deflateEnd +deflateInit2_ +deflateInit_ +deflateParams +deflateReset +deflateSetDictionary +gzclose +gzdopen +gzerror +gzflush +gzopen +gzread +gzwrite +inflate +inflateEnd +inflateInit2_ +inflateInit_ +inflateReset +inflateSetDictionary +inflateSync +uncompress +zlibVersion +gzprintf +gzputc +gzgetc +gzseek +gzrewind +gztell +gzeof +gzsetparams +zError +inflateSyncPoint +get_crc_table +compress2 +gzputs +gzgets + +;------------------------------------------------------------ +; timer exports + +gettimeofday +setitimer +pause +sleep +nanosleep + +;------------------------------------------------------------ +; other exports +setenv + diff --git a/win32/libxinesuppt.dsp b/win32/libxinesuppt.dsp index 7e74c52b5..eda47dcbe 100644 --- a/win32/libxinesuppt.dsp +++ b/win32/libxinesuppt.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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 "LIBXINESUPPT_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/dirent" /I "contrib/pthreads" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINESUPPT_EXPORTS" /D "__CLEANUP_C" /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" @@ -82,6 +82,7 @@ BSC32=bscmake.exe 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 winmm.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxinesuppt.dll" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -89,14 +90,6 @@ LINK32=link.exe # Name "libxinesuppt - Win32 Release" # Name "libxinesuppt - Win32 Debug" -# Begin Group "Source Files ( dirent )" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\contrib\dirent\dirent.c -# End Source File -# End Group # Begin Group "Source Files ( pthreads )" # PROP Default_Filter "" @@ -193,6 +186,14 @@ SOURCE=.\contrib\pthreads\sync.c SOURCE=.\contrib\pthreads\tsd.c # End Source File # End Group +# Begin Group "DLL Defs" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\libxinesupport.def +# End Source File +# End Group # Begin Group "Source Files ( zlib )" # PROP Default_Filter "" @@ -253,6 +254,14 @@ SOURCE=.\contrib\zlib\uncompr.c SOURCE=.\contrib\zlib\zutil.c # End Source File # End Group +# Begin Group "Source Files ( other )" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\contrib\setenv.c +# End Source File +# End Group # Begin Group "Source Files ( timer )" # PROP Default_Filter "" @@ -261,12 +270,12 @@ SOURCE=.\contrib\zlib\zutil.c SOURCE=.\contrib\timer\timer.c # End Source File # End Group -# Begin Group "DLL Defs" +# Begin Group "Source Files ( dirent )" # PROP Default_Filter "" # Begin Source File -SOURCE=.\libxinesupport.def +SOURCE=.\contrib\dirent\dirent.c # End Source File # End Group # End Target diff --git a/win32/libxineutils.dsp b/win32/libxineutils.dsp index 94cf59bbe..609ee7759 100644 --- a/win32/libxineutils.dsp +++ b/win32/libxineutils.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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 "LIBXINEUTILS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I ".." /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINEUTILS_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "HAVE_NANOSLEEP" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I ".." /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBXINEUTILS_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /D "HAVE_NANOSLEEP" /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" @@ -82,6 +82,7 @@ BSC32=bscmake.exe 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 /nologo /dll /debug /machine:I386 /out:"Debug/bin/libxineutils.dll" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none !ENDIF diff --git a/win32/source/xineui.cpp b/win32/source/xineui.cpp index 62a82f26f..ae557ef40 100644 --- a/win32/source/xineui.cpp +++ b/win32/source/xineui.cpp @@ -21,8 +21,10 @@ * by Matthew Grooms */ +#include #include "xineui.h" -#include "common.h" + +#include /* pthread_mutex_init() */ /* #define LOG 1 @@ -32,7 +34,6 @@ static char **video_driver_ids; static char **audio_driver_ids; - static void config_update(xine_cfg_entry_t *entry, int type, int min, int max, int value, char *string) { @@ -468,6 +469,9 @@ bool _XINE_UI::InitXine() /*config = config_file_init( configfile );*/ #else + + setenv("HOME", xine_get_homedir(), 0); + /* * Initialize config */ @@ -759,8 +763,23 @@ bool _XINE_UI::Play( int newindex ) // store our new mrl info - mrl_short_name = playlist[ playindex ]->mrl_short_name; +#if (1) + mrl_long_name = strdup("file:"); + strcat(mrl_long_name, playlist[ playindex ]->mrl_long_name); + + /* This will be used for DVD playing! */ + /*mrl_long_name = strdup("dvd:/");*/ + + /* DVD Drive */ + /*strcat(mrl_long_name, "d:\\\\1.1");*/ + + /* \\Title.Part */ + /*strcat(mrl_long_name, "1.1");*/ +#else mrl_long_name = playlist[ playindex ]->mrl_long_name; +#endif + + mrl_short_name = playlist[ playindex ]->mrl_short_name; mrl_type = playlist[ playindex ]->mrl_type; // play our mrl diff --git a/win32/xine.dsw b/win32/xine.dsw index 937aef24e..1aa1b572e 100644 --- a/win32/xine.dsw +++ b/win32/xine.dsw @@ -1,584 +1,578 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "libdvdcss"=".\libdvdcss.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libdvdnav"=".\libdvdnav.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdvdread - End Project Dependency -}}} - -############################################################################### - -Project: "libdvdread"=".\libdvdread.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdvdcss - End Project Dependency -}}} - -############################################################################### - -Project: "libxine"=".\libxine.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "libxinesuppt"=".\libxinesuppt.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "libxineutils"=".\libxineutils.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_ao_out_directx"=".\xineplug_ao_out_directx.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Project: "xineplug_decode_a52"=".\xineplug_decode_a52.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_dts"=".\xineplug_decode_dts.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_ff"=".\xineplug_decode_ff.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_lpcm"=".\xineplug_decode_lpcm.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_mad"=".\xineplug_decode_mad.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_mpeg2"=".\xineplug_decode_mpeg2.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_real"=".\xineplug_decode_real.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_spu"=".\xineplug_decode_spu.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_spucc"=".\xineplug_decode_spucc.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_decode_sputext"=".\xineplug_decode_sputext.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_asf"=".\xineplug_dmx_asf.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_avi"=".\xineplug_dmx_avi.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_cda"=".\xineplug_dmx_cda.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_mpeg"=".\xineplug_dmx_mpeg.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_mpeg_audio"=".\xineplug_dmx_mpeg_audio.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_mpeg_block"=".\xineplug_dmx_mpeg_block.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_mpeg_pes"=".\xineplug_dmx_mpeg_pes.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_dmx_mpeg_ts"=".\xineplug_dmx_mpeg_ts.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_inp_dvd"=".\xineplug_inp_dvd.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libdvdcss - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdvdread - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency - Begin Project Dependency - Project_Dep_Name libdvdnav - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_inp_file"=".\xineplug_inp_file.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineplug_vo_out_directx"=".\xineplug_vo_out_directx.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Project: "xineui"=".\xineui.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name libxine - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxinesuppt - End Project Dependency - Begin Project Dependency - Project_Dep_Name libxineutils - End Project Dependency -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libdvdcss"=".\contrib\dirent\contrib\dirent\libdvdcss.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libdvdnav"=".\libdvdnav.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency + Begin Project Dependency + Project_Dep_Name libdvdread + End Project Dependency +}}} + +############################################################################### + +Project: "libdvdread"=".\libdvdread.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency + Begin Project Dependency + Project_Dep_Name libdvdcss + End Project Dependency +}}} + +############################################################################### + +Project: "libxine"=".\libxine.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency +}}} + +############################################################################### + +Project: "libxinesuppt"=".\libxinesuppt.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "libxineutils"=".\libxineutils.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_ao_out_directx"=".\xineplug_ao_out_directx.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "xineplug_decode_a52"=".\xineplug_decode_a52.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_dts"=".\xineplug_decode_dts.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_ff"=".\xineplug_decode_ff.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_lpcm"=".\xineplug_decode_lpcm.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_mad"=".\xineplug_decode_mad.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_mpeg2"=".\xineplug_decode_mpeg2.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_real"=".\xineplug_decode_real.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_spu"=".\xineplug_decode_spu.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_spucc"=".\xineplug_decode_spucc.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_decode_sputext"=".\xineplug_decode_sputext.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_asf"=".\xineplug_dmx_asf.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_avi"=".\xineplug_dmx_avi.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_cda"=".\xineplug_dmx_cda.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_mpeg"=".\xineplug_dmx_mpeg.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_mpeg_audio"=".\xineplug_dmx_mpeg_audio.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_mpeg_block"=".\xineplug_dmx_mpeg_block.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_mpeg_pes"=".\xineplug_dmx_mpeg_pes.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_dmx_mpeg_ts"=".\xineplug_dmx_mpeg_ts.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_inp_dvd"=".\xineplug_inp_dvd.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libdvdcss + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_inp_file"=".\xineplug_inp_file.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineplug_vo_out_directx"=".\xineplug_vo_out_directx.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Project: "xineui"=".\xineui.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libxine + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxinesuppt + End Project Dependency + Begin Project Dependency + Project_Dep_Name libxineutils + End Project Dependency +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/win32/xineplug_ao_out.def b/win32/xineplug_ao_out.def index 13e57653f..b902b4f16 100644 --- a/win32/xineplug_ao_out.def +++ b/win32/xineplug_ao_out.def @@ -1,7 +1,7 @@ -;------------------------------------------------------------ -; XINEPLUG_AO_OUT DLL DEFINITIONS FILE - -EXPORTS - -xine_plugin_info -get_audio_out_plugin_info \ No newline at end of file +;------------------------------------------------------------ +; XINEPLUG_AO_OUT DLL DEFINITIONS FILE + +EXPORTS + +xine_plugin_info +;get_audio_out_plugin_info \ No newline at end of file diff --git a/win32/xineplug_ao_out_directx.dsp b/win32/xineplug_ao_out_directx.dsp index 5fc1a4879..6f18a30c4 100644 --- a/win32/xineplug_ao_out_directx.dsp +++ b/win32/xineplug_ao_out_directx.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_AO_OUT_DIRECTX_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_AO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /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_AO_OUT_DIRECTX_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" diff --git a/win32/xineplug_decode_a52.dsp b/win32/xineplug_decode_a52.dsp index a4216238d..655a0728f 100644 --- a/win32/xineplug_decode_a52.dsp +++ b/win32/xineplug_decode_a52.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_A52_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /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_DECODE_A52_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_dts.dsp b/win32/xineplug_decode_dts.dsp index 5b69fa775..6ec38501a 100644 --- a/win32/xineplug_decode_dts.dsp +++ b/win32/xineplug_decode_dts.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_DTS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /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_DECODE_DTS_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_ff.dsp b/win32/xineplug_decode_ff.dsp index 388e5d5e9..e81ef3bb8 100644 --- a/win32/xineplug_decode_ff.dsp +++ b/win32/xineplug_decode_ff.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_FF_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_FF_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_lpcm.dsp b/win32/xineplug_decode_lpcm.dsp index e9b3efb8c..ae4ef6a5d 100644 --- a/win32/xineplug_decode_lpcm.dsp +++ b/win32/xineplug_decode_lpcm.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_LPCM_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /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_DECODE_LPCM_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_mad.dsp b/win32/xineplug_decode_mad.dsp index 497956612..626de6003 100644 --- a/win32/xineplug_decode_mad.dsp +++ b/win32/xineplug_decode_mad.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_MAD_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "FPM_DEFAULT" /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_DECODE_MAD_EXPORTS" /D "XINE_COMPILE" /D "FPM_DEFAULT" /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" diff --git a/win32/xineplug_decode_mpeg2.dsp b/win32/xineplug_decode_mpeg2.dsp index a8f079fbf..7de26d734 100644 --- a/win32/xineplug_decode_mpeg2.dsp +++ b/win32/xineplug_decode_mpeg2.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_MPEG2_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /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_DECODE_MPEG2_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_real.dsp b/win32/xineplug_decode_real.dsp index 7afff4663..b52ed868e 100644 --- a/win32/xineplug_decode_real.dsp +++ b/win32/xineplug_decode_real.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_REAL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /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_DECODE_REAL_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_spu.dsp b/win32/xineplug_decode_spu.dsp index 3c8f1d066..6b4ddbd78 100644 --- a/win32/xineplug_decode_spu.dsp +++ b/win32/xineplug_decode_spu.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_SPU_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdread" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /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" /I "../src/input/libdvdread" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_DECODE_SPU_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_spucc.dsp b/win32/xineplug_decode_spucc.dsp index 7f67963ad..7eb942b16 100644 --- a/win32/xineplug_decode_spucc.dsp +++ b/win32/xineplug_decode_spucc.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_SPUCC_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /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_DECODE_SPUCC_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_decode_sputext.dsp b/win32/xineplug_decode_sputext.dsp index 84e332f56..5d8244b5a 100644 --- a/win32/xineplug_decode_sputext.dsp +++ b/win32/xineplug_decode_sputext.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_DECODE_SPUTEXT_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /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_DECODE_SPUTEXT_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_dmx_asf.dsp b/win32/xineplug_dmx_asf.dsp index 20d2be775..9535026a6 100644 --- a/win32/xineplug_dmx_asf.dsp +++ b/win32/xineplug_dmx_asf.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_ASF_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_ASF_EXPORTS" /D "XINE_COMPILE" /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_ASF_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_dmx_avi.dsp b/win32/xineplug_dmx_avi.dsp index b9c8410a7..b94a4207e 100644 --- a/win32/xineplug_dmx_avi.dsp +++ b/win32/xineplug_dmx_avi.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_AVI_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_AVI_EXPORTS" /D "XINE_COMPILE" /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_AVI_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_dmx_cda.dsp b/win32/xineplug_dmx_cda.dsp index 534a56f08..9a8ea1fee 100644 --- a/win32/xineplug_dmx_cda.dsp +++ b/win32/xineplug_dmx_cda.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_CDA_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_CDA_EXPORTS" /D "XINE_COMPILE" /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_CDA_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_dmx_mpeg.dsp b/win32/xineplug_dmx_mpeg.dsp index 51f6a36e8..bdfd207a0 100644 --- a/win32/xineplug_dmx_mpeg.dsp +++ b/win32/xineplug_dmx_mpeg.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_MPEG_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_MPEG_EXPORTS" /D "XINE_COMPILE" /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_MPEG_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_dmx_mpeg_audio.dsp b/win32/xineplug_dmx_mpeg_audio.dsp index ad1ac4c97..15e6a73db 100644 --- a/win32/xineplug_dmx_mpeg_audio.dsp +++ b/win32/xineplug_dmx_mpeg_audio.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_MPEG_AUDIO_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_MPEG_AUDIO_EXPORTS" /D "XINE_COMPILE" /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_MPEG_AUDIO_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_dmx_mpeg_block.dsp b/win32/xineplug_dmx_mpeg_block.dsp index 827f5ccd6..9fc694eb3 100644 --- a/win32/xineplug_dmx_mpeg_block.dsp +++ b/win32/xineplug_dmx_mpeg_block.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_MPEG_BLOCK_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /D "USE_ILL_ADVISED_ESTIMATE_RATE_INITIALLY" /D "ESTIMATE_RATE_FIXED" /FR /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_MPEG_BLOCK_EXPORTS" /D "XINE_COMPILE" /D "USE_ILL_ADVISED_ESTIMATE_RATE_INITIALLY" /D "ESTIMATE_RATE_FIXED" /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" diff --git a/win32/xineplug_dmx_mpeg_pes.dsp b/win32/xineplug_dmx_mpeg_pes.dsp index fd4a9a961..fcbab84e2 100644 --- a/win32/xineplug_dmx_mpeg_pes.dsp +++ b/win32/xineplug_dmx_mpeg_pes.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_MPEG_PES_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /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_MPEG_PES_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_dmx_mpeg_ts.dsp b/win32/xineplug_dmx_mpeg_ts.dsp index 4dbeaa8af..ad1e505be 100644 --- a/win32/xineplug_dmx_mpeg_ts.dsp +++ b/win32/xineplug_dmx_mpeg_ts.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_MPEG_TS_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /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_MPEG_TS_EXPORTS" /D "XINE_COMPILE" /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" diff --git a/win32/xineplug_inp_dvd.dsp b/win32/xineplug_inp_dvd.dsp index 490e66bb8..8fc681bd4 100644 --- a/win32/xineplug_inp_dvd.dsp +++ b/win32/xineplug_inp_dvd.dsp @@ -70,7 +70,7 @@ LINK32=link.exe # 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_DVD_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I ".." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /I "../src/input/libdvdnav" /I "../src/input/libdvdread" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /D "XINE_COMPILE" /D "HAVE_CONFIG_H" /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" /I "../src/input/libdvdread" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_INP_DVD_EXPORTS" /D "XINE_COMPILE" /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 0x409 /d "_DEBUG" @@ -80,7 +80,7 @@ BSC32=bscmake.exe # 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 /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_dvd.so" /pdbtype:sept +# ADD LINK32 libdvdnav.lib /nologo /dll /debug /machine:I386 /out:"Debug/bin/plugins/xineplug_inp_dvd.so" /pdbtype:sept /libpath:"lib" !ENDIF @@ -95,6 +95,10 @@ LINK32=link.exe SOURCE=..\src\input\input_dvd.c # End Source File +# Begin Source File + +SOURCE=..\src\input\media_helper.c +# End Source File # End Group # Begin Group "Header Files" diff --git a/win32/xineplug_inp_file.dsp b/win32/xineplug_inp_file.dsp index 1c8a98b5f..44d5a370d 100644 --- a/win32/xineplug_inp_file.dsp +++ b/win32/xineplug_inp_file.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_FILE_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /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_FILE_EXPORTS" /D "XINE_COMPILE" /FR /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_FILE_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" diff --git a/win32/xineplug_vo_out_directx.dsp b/win32/xineplug_vo_out_directx.dsp index 7da557ec9..08b81436d 100644 --- a/win32/xineplug_vo_out_directx.dsp +++ b/win32/xineplug_vo_out_directx.dsp @@ -71,7 +71,7 @@ LINK32=link.exe # 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_VO_OUT_DIRECTX_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 "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_EXPORTS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I ".." /I "../.." /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I "../../include" /I "../src" /I "../src/xine-engine" /I "../src/xine-utils" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XINEPLUG_VO_OUT_DIRECTX_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" diff --git a/win32/xineui.dsp b/win32/xineui.dsp index 59314da42..91dd4bd15 100644 --- a/win32/xineui.dsp +++ b/win32/xineui.dsp @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "source" /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I ".." /I "../src/video_out" /I "../src/xine-utils" /I "../src/xine-engine" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "XINE_COMPILE" /FR /YX /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "." /I "source" /I "include" /I "contrib/pthreads" /I "contrib/timer" /I "../include" /I ".." /I "../src/video_out" /I "../src/xine-utils" /I "../src/xine-engine" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /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" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # 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 /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/bin/xineui.exe" /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Debug/bin/xineui.exe" /pdbtype:sept /libpath:"lib" !ENDIF -- cgit v1.2.3