changeset 23147:21c35763b178

compilation fix for disabling dvd functionality, patch by <bangbangbear at gmail dot com>, slightly modified by me.
author vayne
date Sat, 28 Apr 2007 22:09:01 +0000
parents d977f871451c
children 71efd1fc20c8
files gui/win32/gui.c gui/win32/interface.c
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gui/win32/gui.c	Sat Apr 28 19:01:00 2007 +0000
+++ b/gui/win32/gui.c	Sat Apr 28 22:09:01 2007 +0000
@@ -1005,29 +1005,27 @@
                     {
                         if(LOWORD(wParam) - IDPLAYDISK == cdromdrive)
                         {
-#ifdef USE_DVDREAD
                             sprintf(searchpath, "%sVIDEO_TS", device + pos);
                             if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
                             {
+#ifdef USE_DVDREAD
                                 if (dvd_device) free(dvd_device);
                                 dvd_device = strdup(device + pos);
                                 dvd_title = dvd_chapter = dvd_angle = 1;
                                 handlemsg(hWnd, evPlayDVD);
+#endif
                             }
-#endif
-#ifdef HAVE_LIBCDIO
                             sprintf(searchpath, "%sTrack01.cda", device + pos);
                             if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
                             {
+#ifdef HAVE_LIBCDIO
                                 if (cdrom_device) free(cdrom_device);
                                 cdrom_device = strdup(device + pos);
                                 /* mplayer doesn't seem to like the trailing \ after the device name */
                                 cdrom_device[2]=0;
                                 handlemsg(hWnd, evPlayCD);
-                            }
 #endif
-                            else
-                            {
+                            } else {
                                 HANDLE searchhndl;
                                 WIN32_FIND_DATA finddata;
                                 sprintf(searchpath, "%smpegav\\*.dat", device + pos);
--- a/gui/win32/interface.c	Sat Apr 28 19:01:00 2007 +0000
+++ b/gui/win32/interface.c	Sat Apr 28 22:09:01 2007 +0000
@@ -271,6 +271,7 @@
         {
             switch(guiIntfStruct.StreamType)
             {
+#ifdef USE_DVDREAD
                 case STREAMTYPE_DVD:
                 {
                     guiIntfStruct.Title = guiIntfStruct.DVD.current_title;
@@ -280,6 +281,7 @@
                     guiGetEvent(guiCEvent, (void *) guiSetPlay);
                     break;
                 }
+#endif
                 default:
                 {
                     guiIntfStruct.FilenameChanged = guiIntfStruct.NewPlay = 1;