diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
tree | b09b4c45898be2754f156ebba16fa1054f42788d /gui/mplayer/gtk/menu.c | |
parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'gui/mplayer/gtk/menu.c')
-rw-r--r-- | gui/mplayer/gtk/menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c index eefae6b31e..d54d4fe1e3 100644 --- a/gui/mplayer/gtk/menu.c +++ b/gui/mplayer/gtk/menu.c @@ -63,7 +63,7 @@ #include "../pixmaps/empty.xpm" #include "../pixmaps/loadeaf.xpm" #include "../pixmaps/title.xpm" -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD #include "../pixmaps/dvd.xpm" #include "../pixmaps/playdvd.xpm" #include "../pixmaps/chapter.xpm" @@ -377,7 +377,7 @@ static Languages_t Languages[] = }; #undef lng -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD static char * ChannelTypes[] = { "Dolby Digital","","Mpeg1","Mpeg2","PCM","","Digital Theatre System" }; static char * ChannelNumbers[] = @@ -424,7 +424,7 @@ GtkWidget * create_PopUpMenu( void ) #ifdef HAVE_VCD AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD ); #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD AddMenuItem( window1, (const char*)playdvd_xpm, SubMenu,MSGTR_MENU_PlayDVD, evPlayDVD ); #endif AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evSetURL ); @@ -467,7 +467,7 @@ GtkWidget * create_PopUpMenu( void ) gtk_widget_set_sensitive( MenuItem,FALSE ); } #endif -#ifdef USE_DVDREAD +#ifdef CONFIG_DVDREAD DVDSubMenu=AddSubMenu( window1, (const char*)dvd_xpm, Menu,MSGTR_MENU_DVD ); AddMenuItem( window1, (const char*)playdvd_xpm, DVDSubMenu,MSGTR_MENU_PlayDisc" ", evPlayDVD ); // AddMenuItem( DVDSubMenu,MSGTR_MENU_ShowDVDMenu, evNone ); |