Mercurial > mplayer.hg

comparison gui/ui/main.c @ 33890:c51e44dd38e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove needless guiInfo member DiskChanged. Use existing member NewPlay for this, because DiskChanged means NewPlay but with the same file. The #ifdef CONFIG_DVDREAD has been removed, because this affects CONFIG_VCD as well and NewPlay is always available.
author ib
date Fri, 12 Aug 2011 13:14:13 +0000
parents 4789b8eed97e
children e0d211c62cf7
comparison
equal deleted inserted replaced
33889:ab5aca1a07ce 33890:c51e44dd38e2
199 switch ( guiInfo.StreamType ) 199 switch ( guiInfo.StreamType )
200 { 200 {
201 case STREAMTYPE_STREAM: 201 case STREAMTYPE_STREAM:
202 case STREAMTYPE_FILE: 202 case STREAMTYPE_FILE:
203 guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE ); 203 guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE );
204 guiInfo.NewPlay=GUI_FILE_NEW;
204 break; 205 break;
205 #ifdef CONFIG_VCD 206 #ifdef CONFIG_VCD
206 case STREAMTYPE_VCD: 207 case STREAMTYPE_VCD:
207 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); 208 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE );
208 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE ); 209 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
209 uiSetFileName( NULL,cdrom_device,STREAMTYPE_VCD ); 210 uiSetFileName( NULL,cdrom_device,STREAMTYPE_VCD );
210 if ( guiInfo.Playing != GUI_PAUSE ) 211 if ( guiInfo.Playing != GUI_PAUSE )
211 { 212 {
212 if ( !guiInfo.Track ) 213 if ( !guiInfo.Track )
213 guiInfo.Track=2; 214 guiInfo.Track=2;
214 guiInfo.DiskChanged=1; 215 guiInfo.NewPlay=GUI_FILE_SAME;
215 } 216 }
216 break; 217 break;
217 #endif 218 #endif
218 #ifdef CONFIG_DVDREAD 219 #ifdef CONFIG_DVDREAD
219 case STREAMTYPE_DVD: 220 case STREAMTYPE_DVD:
220 guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD - CLEAR_FILE ); 221 guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD - CLEAR_FILE );
221 if ( !dvd_device ) dvd_device=gstrdup( DEFAULT_DVD_DEVICE ); 222 if ( !dvd_device ) dvd_device=gstrdup( DEFAULT_DVD_DEVICE );
222 uiSetFileName( NULL,dvd_device,STREAMTYPE_DVD ); 223 uiSetFileName( NULL,dvd_device,STREAMTYPE_DVD );
223 if ( guiInfo.Playing != GUI_PAUSE ) 224 if ( guiInfo.Playing != GUI_PAUSE )
224 { 225 {
225 guiInfo.DiskChanged=1; 226 guiInfo.NewPlay=GUI_FILE_SAME;
226 } 227 }
227 break; 228 break;
228 #endif 229 #endif
229 } 230 }
230 guiInfo.NewPlay=1;
231 uiPlay(); 231 uiPlay();
232 break; 232 break;
233 #ifdef CONFIG_DVDREAD 233 #ifdef CONFIG_DVDREAD
234 case evSetDVDSubtitle: 234 case evSetDVDSubtitle:
235 dvdsub_id=iparam; 235 dvdsub_id=iparam;
389 wsClearWindow( guiApp.subWindow ); 389 wsClearWindow( guiApp.subWindow );
390 #ifdef CONFIG_DVDREAD 390 #ifdef CONFIG_DVDREAD
391 if ( guiInfo.StreamType == STREAMTYPE_DVD || guiInfo.StreamType == STREAMTYPE_VCD ) goto play_dvd_2; 391 if ( guiInfo.StreamType == STREAMTYPE_DVD || guiInfo.StreamType == STREAMTYPE_VCD ) goto play_dvd_2;
392 else 392 else
393 #endif 393 #endif
394 guiInfo.NewPlay=1; 394 guiInfo.NewPlay=GUI_FILE_NEW;
395 break; 395 break;
396 396
397 // --- timer events 397 // --- timer events
398 case evRedraw: 398 case evRedraw:
399 { 399 {