comparison gui/ui/gtk/menu.c @ 35493:411875efca3f

Introduce boolean symbolic constants. Use them wherever suitable and useful to make code easier to read.
author ib
date Tue, 04 Dec 2012 18:36:14 +0000
parents a78e2453e188
children e27855a45128
comparison
equal deleted inserted replaced
35492:5cbbd9ca4010 35493:411875efca3f
28 28
29 #include "menu.h" 29 #include "menu.h"
30 #include "gui/ui/widgets.h" 30 #include "gui/ui/widgets.h"
31 #include "gui/ui/gmplayer.h" 31 #include "gui/ui/gmplayer.h"
32 #include "gui/app.h" 32 #include "gui/app.h"
33 #include "gui/gui.h"
33 #include "gui/interface.h" 34 #include "gui/interface.h"
34 35
35 #include "stream/stream.h" 36 #include "stream/stream.h"
36 #include "libmpdemux/demuxer.h" 37 #include "libmpdemux/demuxer.h"
37 #include "libmpdemux/stheader.h" 38 #include "libmpdemux/stheader.h"
643 AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_MENU_Preferences, evPreferences ); 644 AddMenuItem( window1, (const char*)prefs_xpm, Menu,MSGTR_MENU_Preferences, evPreferences );
644 AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_Equalizer, evEqualizer ); 645 AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_Equalizer, evEqualizer );
645 646
646 if ( guiInfo.VideoWindow ) 647 if ( guiInfo.VideoWindow )
647 { 648 {
648 int b1 = 0, b2 = 0, b_half = 0; 649 int b1 = False, b2 = False, b_half = False;
649 AddSeparator( Menu ); 650 AddSeparator( Menu );
650 if ( !guiApp.videoWindow.isFullScreen && guiInfo.Playing ) 651 if ( !guiApp.videoWindow.isFullScreen && guiInfo.Playing )
651 { 652 {
652 if ( ( guiApp.videoWindow.Width == guiInfo.VideoWidth * 2 )&& 653 if ( ( guiApp.videoWindow.Width == guiInfo.VideoWidth * 2 )&&
653 ( guiApp.videoWindow.Height == guiInfo.VideoHeight * 2 ) ) b2=1; 654 ( guiApp.videoWindow.Height == guiInfo.VideoHeight * 2 ) ) b2=True;
654 else if ( ( guiApp.videoWindow.Width == guiInfo.VideoWidth / 2 ) && 655 else if ( ( guiApp.videoWindow.Width == guiInfo.VideoWidth / 2 ) &&
655 ( guiApp.videoWindow.Height == guiInfo.VideoHeight / 2 ) ) b_half=1; 656 ( guiApp.videoWindow.Height == guiInfo.VideoHeight / 2 ) ) b_half=True;
656 else b1=1; 657 else b1=True;
657 } else b1=!guiApp.videoWindow.isFullScreen; 658 } else b1=!guiApp.videoWindow.isFullScreen;
658 H=AddMenuCheckItem( window1, (const char*)half_xpm, Menu,MSGTR_MENU_HalfSize,b_half,evHalfSize ); 659 H=AddMenuCheckItem( window1, (const char*)half_xpm, Menu,MSGTR_MENU_HalfSize,b_half,evHalfSize );
659 N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_MENU_NormalSize" ",b1,evNormalSize ); 660 N=AddMenuCheckItem( window1, (const char*)normal_xpm, Menu,MSGTR_MENU_NormalSize" ",b1,evNormalSize );
660 D=AddMenuCheckItem( window1, (const char*)double_xpm, Menu,MSGTR_MENU_DoubleSize,b2,evDoubleSize ); 661 D=AddMenuCheckItem( window1, (const char*)double_xpm, Menu,MSGTR_MENU_DoubleSize,b2,evDoubleSize );
661 F=AddMenuCheckItem( window1, (const char*)full_xpm, Menu,MSGTR_MENU_FullScreen,guiApp.videoWindow.isFullScreen,evFullScreen ); 662 F=AddMenuCheckItem( window1, (const char*)full_xpm, Menu,MSGTR_MENU_FullScreen,guiApp.videoWindow.isFullScreen,evFullScreen );