Mercurial > mplayer.hg
comparison gui/ui/main.c @ 34454:5a45efc630b8
Remove all unnecessary #ifdefs from GUI code.
Move or add necessary ones.
| author | ib |
|---|---|
| date | Thu, 12 Jan 2012 10:08:25 +0000 |
| parents | 1745c2a7a628 |
| children | 00cf27b14c15 |
comparison
equal
deleted
inserted
replaced
| 34453:ad3519665533 | 34454:5a45efc630b8 |
|---|---|
| 112 nfree(guiInfo.SubtitleFilename); | 112 nfree(guiInfo.SubtitleFilename); |
| 113 nfree(guiInfo.AudioFilename); | 113 nfree(guiInfo.AudioFilename); |
| 114 listSet(gtkDelPl, NULL); | 114 listSet(gtkDelPl, NULL); |
| 115 } | 115 } |
| 116 | 116 |
| 117 #ifdef CONFIG_VCD | |
| 118 if (what & CLEAR_VCD) guiInfo.Tracks = 0; | 117 if (what & CLEAR_VCD) guiInfo.Tracks = 0; |
| 119 #endif | 118 |
| 120 | |
| 121 #ifdef CONFIG_DVDREAD | |
| 122 if (what & CLEAR_DVD) | 119 if (what & CLEAR_DVD) |
| 123 { | 120 { |
| 124 guiInfo.AudioStreams = 0; | 121 guiInfo.AudioStreams = 0; |
| 125 guiInfo.Subtitles = 0; | 122 guiInfo.Subtitles = 0; |
| 126 guiInfo.Tracks = 0; | 123 guiInfo.Tracks = 0; |
| 127 guiInfo.Chapters = 0; | 124 guiInfo.Chapters = 0; |
| 128 guiInfo.Angles = 0; | 125 guiInfo.Angles = 0; |
| 129 } | 126 } |
| 130 #endif | |
| 131 } | 127 } |
| 132 | 128 |
| 133 static unsigned last_redraw_time = 0; | 129 static unsigned last_redraw_time = 0; |
| 134 | 130 |
| 135 void uiEventHandling( int msg,float param ) | 131 void uiEventHandling( int msg,float param ) |
| 226 guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE ); | 222 guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE ); |
| 227 if ( !guiInfo.Track ) | 223 if ( !guiInfo.Track ) |
| 228 guiInfo.Track=1; | 224 guiInfo.Track=1; |
| 229 guiInfo.NewPlay=GUI_FILE_NEW; | 225 guiInfo.NewPlay=GUI_FILE_NEW; |
| 230 break; | 226 break; |
| 231 #ifdef CONFIG_CDDA | 227 |
| 232 case STREAMTYPE_CDDA: | 228 case STREAMTYPE_CDDA: |
| 233 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); | 229 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); |
| 234 if ( guiInfo.Playing != GUI_PAUSE ) | 230 if ( guiInfo.Playing != GUI_PAUSE ) |
| 235 { | 231 { |
| 236 if ( !guiInfo.Track ) | 232 if ( !guiInfo.Track ) |
| 237 guiInfo.Track=1; | 233 guiInfo.Track=1; |
| 238 guiInfo.NewPlay=GUI_FILE_SAME; | 234 guiInfo.NewPlay=GUI_FILE_SAME; |
| 239 } | 235 } |
| 240 break; | 236 break; |
| 241 #endif | 237 |
| 242 #ifdef CONFIG_VCD | |
| 243 case STREAMTYPE_VCD: | 238 case STREAMTYPE_VCD: |
| 244 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); | 239 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); |
| 245 if ( guiInfo.Playing != GUI_PAUSE ) | 240 if ( guiInfo.Playing != GUI_PAUSE ) |
| 246 { | 241 { |
| 247 if ( !guiInfo.Track ) | 242 if ( !guiInfo.Track ) |
| 248 guiInfo.Track=2; | 243 guiInfo.Track=2; |
| 249 guiInfo.NewPlay=GUI_FILE_SAME; | 244 guiInfo.NewPlay=GUI_FILE_SAME; |
| 250 } | 245 } |
| 251 break; | 246 break; |
| 252 #endif | 247 |
| 253 #ifdef CONFIG_DVDREAD | |
| 254 case STREAMTYPE_DVD: | 248 case STREAMTYPE_DVD: |
| 255 guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD - CLEAR_FILE ); | 249 guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD - CLEAR_FILE ); |
| 256 if ( guiInfo.Playing != GUI_PAUSE ) | 250 if ( guiInfo.Playing != GUI_PAUSE ) |
| 257 { | 251 { |
| 258 guiInfo.NewPlay=GUI_FILE_SAME; | 252 guiInfo.NewPlay=GUI_FILE_SAME; |
| 259 } | 253 } |
| 260 break; | 254 break; |
| 261 #endif | |
| 262 } | 255 } |
| 263 uiPlay(); | 256 uiPlay(); |
| 264 break; | 257 break; |
| 265 | 258 |
| 266 case evPause: | 259 case evPause: |