diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /gui/win32 | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'gui/win32')
| -rw-r--r-- | gui/win32/gui.c | 8 | ||||
| -rw-r--r-- | gui/win32/interface.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gui/win32/gui.c b/gui/win32/gui.c index a56a4c77a7..35268938a6 100644 --- a/gui/win32/gui.c +++ b/gui/win32/gui.c @@ -804,7 +804,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM char device[MAX_PATH]; char searchpath[MAX_PATH]; char searchpath2[MAX_PATH]; -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO char searchpath3[MAX_PATH]; #endif int len, pos = 0, cdromdrive = 0; @@ -826,14 +826,14 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] checking %s for CD/VCD/SVCD/DVDs\n", device + pos); sprintf(searchpath, "%sVIDEO_TS", device + pos); sprintf(searchpath2, "%sMpegav", device + pos); -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO sprintf(searchpath3, "%sTrack01.cda", device + pos); #endif if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; else if(GetFileAttributes(searchpath2) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO else if(GetFileAttributes(searchpath3) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; #endif @@ -1015,7 +1015,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM sprintf(searchpath, "%sTrack01.cda", device + pos); if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES) { -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO if (cdrom_device) free(cdrom_device); cdrom_device = strdup(device + pos); /* mplayer doesn't seem to like the trailing \ after the device name */ diff --git a/gui/win32/interface.c b/gui/win32/interface.c index 6b3eaafc54..209a1889d4 100644 --- a/gui/win32/interface.c +++ b/gui/win32/interface.c @@ -41,7 +41,7 @@ #include "access_mpcontext.h" #include "gui.h" #include "dialogs.h" -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO #include <cdio/cdio.h> #endif @@ -173,7 +173,7 @@ static void guiSetEvent(int event) break; } #endif -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO case evPlayCD: { int i; |