[MPlayer-cvslog] r37071 - in trunk/gui: interface.c skin/skin.c ui/actions.c wm/ws.c

[ib]

Author: ib
Date: Wed Mar 26 17:18:51 2014
New Revision: 37071

Log:
Remove unnecessary, bothering parentheses.

Modified:
   trunk/gui/interface.c
   trunk/gui/skin/skin.c
   trunk/gui/ui/actions.c
   trunk/gui/wm/ws.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Wed Mar 26 16:09:54 2014	(r37070)
+++ trunk/gui/interface.c	Wed Mar 26 17:18:51 2014	(r37071)
@@ -749,7 +749,7 @@ int gui(int what, void *data)
         // ...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 @@ int gui(int what, void *data)
             } 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 @@ void mplayerLoadSubtitle(const char *nam
     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);

Modified: trunk/gui/skin/skin.c
==============================================================================
--- trunk/gui/skin/skin.c	Wed Mar 26 16:09:54 2014	(r37070)
+++ trunk/gui/skin/skin.c	Wed Mar 26 17:18:51 2014	(r37071)
@@ -359,7 +359,7 @@ static int item_base(char *in)
     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)) {

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Wed Mar 26 16:09:54 2014	(r37070)
+++ trunk/gui/ui/actions.c	Wed Mar 26 17:18:51 2014	(r37071)
@@ -663,7 +663,7 @@ void uiChangeSkin(char *name)
     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);

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Wed Mar 26 16:09:54 2014	(r37070)
+++ trunk/gui/wm/ws.c	Wed Mar 26 17:18:51 2014	(r37071)
@@ -1328,7 +1328,7 @@ void wsImageCreate(wsWindow *win, int w,
     {
         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) {