Mercurial > mplayer.hg

changeset 36975:91f11a849d4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary, bothering parentheses.
author ib
date Wed, 26 Mar 2014 16:18:51 +0000
parents 6c3562d643a8
children cb1abce33f20
files gui/interface.c gui/skin/skin.c gui/ui/actions.c gui/wm/ws.c
diffstat 4 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gui/interface.c	Wed Mar 26 15:09:54 2014 +0000
+++ b/gui/interface.c	Wed Mar 26 16:18:51 2014 +0000
@@ -749,7 +749,7 @@
         // ...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, gtkLoadFullscreen ? btnPressed : btnReleased);
         }
 
         // ...option variable fullscreen determines whether MPlayer will handle
@@ -877,7 +877,7 @@
             } else {
                 wsWindowVisibility(&guiApp.videoWindow, wsHideWindow);
                 guiInfo.VideoWindow = False;
-                btnSet(evFullScreen, (gtkLoadFullscreen ? btnPressed : btnReleased));
+                btnSet(evFullScreen, gtkLoadFullscreen ? btnPressed : btnReleased);
             }
 
             gui(GUI_SET_STATE, (void *)GUI_STOP);
@@ -1161,7 +1161,7 @@
     if (name) {
         mp_msg(MSGT_GPLAYER, MSGL_INFO, MSGTR_GUI_MSG_LoadingSubtitle, name);
 
-        subdata = sub_read_file(name, (guiInfo.sh_video ? guiInfo.sh_video->fps : 0));
+        subdata = sub_read_file(name, guiInfo.sh_video ? guiInfo.sh_video->fps : 0);
 
         if (!subdata)
             gmp_msg(MSGT_GPLAYER, MSGL_ERR, MSGTR_CantLoadSub, name);
--- a/gui/skin/skin.c	Wed Mar 26 15:09:54 2014 +0000
+++ b/gui/skin/skin.c	Wed Mar 26 16:18:51 2014 +0000
@@ -359,7 +359,7 @@
     if (currWin->width == 0 || currWin->height == 0)
         return 1;
 
-    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s: %dx%d\n", (is_video && w && h ? "size" : " bitmap"), currWin->width, currWin->height);
+    mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[skin]    %s: %dx%d\n", is_video && w && h ? "size" : " bitmap", currWin->width, currWin->height);
 
     if (!is_video) {
         if (!bpRenderMask(&currWin->Bitmap, &currWin->Mask)) {
--- a/gui/ui/actions.c	Wed Mar 26 15:09:54 2014 +0000
+++ b/gui/ui/actions.c	Wed Mar 26 16:18:51 2014 +0000
@@ -663,7 +663,7 @@
     if (guiInfo.AudioChannels < 2 || guiInfo.AudioPassthrough)
         btnSet(evSetBalance, btnDisabled);
 
-    btnSet(evFullScreen, (guiApp.videoWindow.isFullScreen ? btnPressed : btnReleased));
+    btnSet(evFullScreen, guiApp.videoWindow.isFullScreen ? btnPressed : btnReleased);
 
     wsWindowLayer(wsDisplay, guiApp.mainWindow.WindowID, guiApp.videoWindow.isFullScreen);
     wsWindowLayer(wsDisplay, guiApp.menuWindow.WindowID, guiApp.videoWindow.isFullScreen);
--- a/gui/wm/ws.c	Wed Mar 26 15:09:54 2014 +0000
+++ b/gui/wm/ws.c	Wed Mar 26 16:18:51 2014 +0000
@@ -1328,7 +1328,7 @@
     {
         win->xImage = XCreateImage(wsDisplay, win->VisualInfo.visual, win->VisualInfo.depth,
                                    ZPixmap, 0, 0, w, h,
-                                   (wsScreenDepth == 3) ? 32 : wsScreenDepth,
+                                   wsScreenDepth == 3 ? 32 : wsScreenDepth,
                                    0);
 
         if ((win->xImage->data = malloc(win->xImage->bytes_per_line * win->xImage->height)) == NULL) {