Mercurial > mplayer.hg
changeset 33655:cbb7cfeb8c71
Rename guiInterface_t member NoWindow MovieWindow.
This variable holds the current state of visibility of the movie window
and is easier to understand if it is phrased in the positive.
| author | ib |
|---|---|
| date | Mon, 27 Jun 2011 14:27:33 +0000 |
| parents | 90f7a7266410 |
| children | 3c300c37766f |
| files | gui/interface.c gui/interface.h gui/ui/actions.c gui/ui/gtk/menu.c gui/ui/main.c |
| diffstat | 5 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Mon Jun 27 14:08:30 2011 +0000 +++ b/gui/interface.c Mon Jun 27 14:27:33 2011 +0000 @@ -596,7 +596,7 @@ guiInfo.AudioOnly = (int)arg; if (guiInfo.AudioOnly) { - guiInfo.NoWindow = True; + guiInfo.MovieWindow = False; wsVisibleWindow(&guiApp.subWindow, wsHideWindow); } else wsVisibleWindow(&guiApp.subWindow, wsShowWindow); @@ -723,7 +723,7 @@ guiInfo.FPS = sh->fps; } - if (guiInfo.NoWindow) + if (!guiInfo.MovieWindow) wsVisibleWindow(&guiApp.subWindow, wsHideWindow); if (guiInfo.StreamType == STREAMTYPE_STREAM) @@ -858,12 +858,12 @@ { int i = 0; - guiInfo.NoWindow = False; + guiInfo.MovieWindow = True; while (video_out_drivers[i++]) { if (video_out_drivers[i - 1]->control(VOCTRL_GUISUPPORT, NULL) == VO_TRUE) { if ((video_driver_list && !gstrcmp(video_driver_list[0], (char *)video_out_drivers[i - 1]->info->short_name)) && (video_out_drivers[i - 1]->control(VOCTRL_GUI_NOWINDOW, NULL) == VO_TRUE)) { - guiInfo.NoWindow = True; + guiInfo.MovieWindow = False; break; } } @@ -1013,7 +1013,7 @@ void guiEventHandling(void) { - if (!guiInfo.Playing || guiInfo.NoWindow) + if (!guiInfo.Playing || !guiInfo.MovieWindow) wsHandleEvents(); gtkEventHandling();
--- a/gui/interface.h Mon Jun 27 14:08:30 2011 +0000 +++ b/gui/interface.h Mon Jun 27 14:27:33 2011 +0000 @@ -172,7 +172,7 @@ int MovieWidth; int MovieHeight; - int NoWindow; + int MovieWindow; float Volume; float Balance;
--- a/gui/ui/actions.c Mon Jun 27 14:08:30 2011 +0000 +++ b/gui/ui/actions.c Mon Jun 27 14:27:33 2011 +0000 @@ -40,7 +40,7 @@ void uiFullScreen(void) { - if (guiInfo.NoWindow && guiInfo.Playing) + if (!guiInfo.MovieWindow && guiInfo.Playing) return; if (guiInfo.Playing && guiApp.subWindow.isFullScreen) { @@ -114,7 +114,7 @@ guiInfo.TimeSec = 0; guiInfo.Position = 0; guiInfo.AudioChannels = 0; - guiInfo.NoWindow = False; + guiInfo.MovieWindow = True; #ifdef CONFIG_DVDREAD guiInfo.DVD.current_title = 1;
--- a/gui/ui/gtk/menu.c Mon Jun 27 14:08:30 2011 +0000 +++ b/gui/ui/gtk/menu.c Mon Jun 27 14:27:33 2011 +0000 @@ -615,7 +615,7 @@ AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_MENU_Preferences, evPreferences ); AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_Equalizer, evEqualizer ); - if ( guiInfo.NoWindow == False ) + if ( guiInfo.MovieWindow ) { int b1 = 0, b2 = 0, b_half = 0; AddSeparator( Menu );