[MPlayer-cvslog] r38172 - in trunk: Changelog DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/es/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/zh_CN/mplayer.1 gui/app/cfg.c gui/app/cfg.h gui/dialog/preferences.c gu...
ib
subversion at mplayerhq.hu
Tue Feb 4 15:58:42 EET 2020
Author: ib
Date: Tue Feb 4 15:58:41 2020
New Revision: 38172
Log:
Replace variable gtkLoadFullscreen by MPlayer's fullscreen.
This allows using command line option -fs in addition to
GUI option load_fullscreen.
Modified:
trunk/Changelog
trunk/gui/app/cfg.c
trunk/gui/app/cfg.h
trunk/gui/dialog/preferences.c
trunk/gui/interface.c
Changes in other areas also in this revision:
Modified:
trunk/DOCS/man/de/mplayer.1
trunk/DOCS/man/en/mplayer.1
trunk/DOCS/man/es/mplayer.1
trunk/DOCS/man/it/mplayer.1
trunk/DOCS/man/zh_CN/mplayer.1
Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog Tue Feb 4 15:54:39 2020 (r38171)
+++ trunk/Changelog Tue Feb 4 15:58:41 2020 (r38172)
@@ -9,6 +9,8 @@ MPlayer
* Clear screen when switching to fullscreen mode using the x11
video output driver
* Enable video output drivers which write to files
+ * Command line option -fs is now recognized in addition to the
+ GUI option load_fullscreen
1.4: "SubCounter" April 18, 2019
Modified: trunk/gui/app/cfg.c
==============================================================================
--- trunk/gui/app/cfg.c Tue Feb 4 15:54:39 2020 (r38171)
+++ trunk/gui/app/cfg.c Tue Feb 4 15:58:41 2020 (r38172)
@@ -93,8 +93,7 @@ gtkASS_t gtkASS;
int gtkReplayGainOn;
int gtkReplayGainAdjustment;
-int gtkEnablePlayBar = True;
-int gtkLoadFullscreen;
+int gtkEnablePlayBar = True;
int gtkShowVideoWindow = True;
int gui_save_pos = True;
@@ -179,7 +178,7 @@ static const m_option_t gui_opts[] = {
{ "replay_gain_adjustment", >kReplayGainAdjustment, CONF_TYPE_INT, CONF_RANGE, -30, 10, NULL },
{ "playbar", >kEnablePlayBar, CONF_TYPE_FLAG, 0, 0, 1, NULL },
- { "load_fullscreen", >kLoadFullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL },
+ { "load_fullscreen", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1, NULL },
{ "show_videowin", >kShowVideoWindow, CONF_TYPE_FLAG, 0, 0, 1, NULL },
{ "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG, 0, 0, 1, NULL },
Modified: trunk/gui/app/cfg.h
==============================================================================
--- trunk/gui/app/cfg.h Tue Feb 4 15:54:39 2020 (r38171)
+++ trunk/gui/app/cfg.h Tue Feb 4 15:58:41 2020 (r38172)
@@ -84,7 +84,6 @@ extern int gtkReplayGainOn;
extern int gtkReplayGainAdjustment;
extern int gtkEnablePlayBar;
-extern int gtkLoadFullscreen;
extern int gtkShowVideoWindow;
extern int gui_save_pos;
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Tue Feb 4 15:54:39 2020 (r38171)
+++ trunk/gui/dialog/preferences.c Tue Feb 4 15:58:41 2020 (r38172)
@@ -376,7 +376,7 @@ static void prButton( GtkButton * button
/* 6th page */
gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) );
- gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
+ fullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) );
gui_save_pos=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ) );
gtkShowVideoWindow=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) );
stop_xscreensaver=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ) );
@@ -1398,7 +1398,7 @@ void ShowPreferences( void )
/* 6th page */
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBPostprocess ),gtkVfPP );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),gtkLoadFullscreen );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ),fullscreen );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSaveWinPos ),gui_save_pos );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ),!gtkShowVideoWindow );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBStopXScreenSaver ),stop_xscreensaver );
Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c Tue Feb 4 15:54:39 2020 (r38171)
+++ trunk/gui/interface.c Tue Feb 4 15:58:41 2020 (r38172)
@@ -339,12 +339,12 @@ void guiInit(void)
guiInfo.VideoWindow = True;
- if (gtkLoadFullscreen)
+ if (fullscreen)
uiFullScreen();
} else
wsWindowBackground(&guiApp.videoWindow, 0, 0, 0);
- if (gtkLoadFullscreen) {
+ if (fullscreen) {
guiApp.videoWindow.isFullScreen = True;
btnSet(evFullScreen, btnPressed);
}
@@ -979,20 +979,14 @@ int gui(int what, void *data)
if (guiInfo.Start)
uiAbsSeek(guiInfo.Start);
- // These must be done here (in the last call from MPlayer before
- // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because...
-
- // ...without video there will be no call to GUI_SETUP_VIDEO_WINDOW
+ // This must be done here (in the last call from MPlayer before
+ // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because
+ // without video there will be no call to GUI_SETUP_VIDEO_WINDOW
if (!guiInfo.VideoWindow) {
wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
- btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
+ btnSet(evFullScreen, fullscreen ? btnPressed : btnReleased);
}
- // ...option variable fullscreen determines whether MPlayer will handle
- // the window given by WinID as fullscreen window (and will do aspect
- // scaling then) or not - quite rubbish
- fullscreen = gtkLoadFullscreen;
-
break;
case GUI_SET_VOLUME_BALANCE:
@@ -1027,7 +1021,7 @@ int gui(int what, void *data)
wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
}
- if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
+ if (fullscreen ^ guiApp.videoWindow.isFullScreen)
uiEvent(evFullScreen, True);
if (guiWinID >= 0)
@@ -1141,12 +1135,12 @@ int gui(int what, void *data)
if (!guiApp.videoWindow.Mapped)
wsWindowVisibility(&guiApp.videoWindow, wsShowWindow);
- if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
+ if (fullscreen ^ guiApp.videoWindow.isFullScreen)
uiEvent(evFullScreen, -1);
} else {
wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
guiInfo.VideoWindow = False;
- btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
+ btnSet(evFullScreen, fullscreen ? btnPressed : btnReleased);
}
gui(GUI_SET_STATE, (void *)GUI_STOP);
More information about the MPlayer-cvslog
mailing list