comparison gui/interface.c @ 36975:91f11a849d4d

Remove unnecessary, bothering parentheses.
author ib
date Wed, 26 Mar 2014 16:18:51 +0000
parents a56291ee9bf9
children cb1abce33f20
comparison
equal deleted inserted replaced
36974:6c3562d643a8 36975:91f11a849d4d
747 // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because... 747 // playback starts) and not in GUI_SETUP_VIDEO_WINDOW, because...
748 748
749 // ...without video there will be no call to GUI_SETUP_VIDEO_WINDOW 749 // ...without video there will be no call to GUI_SETUP_VIDEO_WINDOW
750 if (!guiInfo.VideoWindow) { 750 if (!guiInfo.VideoWindow) {
751 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow); 751 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
752 btnSet(evFullScreen, (gtkLoadFullscreen ? btnPressed : btnReleased)); 752 btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
753 } 753 }
754 754
755 // ...option variable fullscreen determines whether MPlayer will handle 755 // ...option variable fullscreen determines whether MPlayer will handle
756 // the window given by WinID as fullscreen window (and will do aspect 756 // the window given by WinID as fullscreen window (and will do aspect
757 // scaling then) or not - quite rubbish 757 // scaling then) or not - quite rubbish
875 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen) 875 if (gtkLoadFullscreen ^ guiApp.videoWindow.isFullScreen)
876 uiEvent(evFullScreen, False); 876 uiEvent(evFullScreen, False);
877 } else { 877 } else {
878 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow); 878 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
879 guiInfo.VideoWindow = False; 879 guiInfo.VideoWindow = False;
880 btnSet(evFullScreen, (gtkLoadFullscreen ? btnPressed : btnReleased)); 880 btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
881 } 881 }
882 882
883 gui(GUI_SET_STATE, (void *)GUI_STOP); 883 gui(GUI_SET_STATE, (void *)GUI_STOP);
884 884
885 wsWindowRedraw(&guiApp.videoWindow); 885 wsWindowRedraw(&guiApp.videoWindow);
1159 } 1159 }
1160 1160
1161 if (name) { 1161 if (name) {
1162 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name); 1162 mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name);
1163 1163
1164 subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 0)); 1164 subdata = sub_read_file(name, guiInfo.sh_video ? guiInfo.sh_video->fps : 0);
1165 1165
1166 if (!subdata) 1166 if (!subdata)
1167 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name); 1167 gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);
1168 1168
1169 sub_name = (malloc(2 * sizeof(char *))); // when mplayer will be restarted 1169 sub_name = (malloc(2 * sizeof(char *))); // when mplayer will be restarted