Mercurial > mplayer.hg

comparison gui/ui/main.c @ 34402:ec0ebcb1bd30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless filename setting from device name. The filename will be set later during GUI_PREPARE.
author ib
date Mon, 02 Jan 2012 16:25:00 +0000
parents f2c03009068d
children bca629bb50cf
comparison
equal deleted inserted replaced
34401:af8838c2b60b 34402:ec0ebcb1bd30
212 break; 212 break;
213 #ifdef CONFIG_CDDA 213 #ifdef CONFIG_CDDA
214 case STREAMTYPE_CDDA: 214 case STREAMTYPE_CDDA:
215 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); 215 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE );
216 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE ); 216 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
217 uiSetFileName( NULL,cdrom_device,SAME_STREAMTYPE );
218 if ( guiInfo.Playing != GUI_PAUSE ) 217 if ( guiInfo.Playing != GUI_PAUSE )
219 { 218 {
220 if ( !guiInfo.Track ) 219 if ( !guiInfo.Track )
221 guiInfo.Track=1; 220 guiInfo.Track=1;
222 guiInfo.NewPlay=GUI_FILE_SAME; 221 guiInfo.NewPlay=GUI_FILE_SAME;
225 #endif 224 #endif
226 #ifdef CONFIG_VCD 225 #ifdef CONFIG_VCD
227 case STREAMTYPE_VCD: 226 case STREAMTYPE_VCD:
228 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); 227 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE );
229 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE ); 228 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
230 uiSetFileName( NULL,cdrom_device,SAME_STREAMTYPE );
231 if ( guiInfo.Playing != GUI_PAUSE ) 229 if ( guiInfo.Playing != GUI_PAUSE )
232 { 230 {
233 if ( !guiInfo.Track ) 231 if ( !guiInfo.Track )
234 guiInfo.Track=2; 232 guiInfo.Track=2;
235 guiInfo.NewPlay=GUI_FILE_SAME; 233 guiInfo.NewPlay=GUI_FILE_SAME;
238 #endif 236 #endif
239 #ifdef CONFIG_DVDREAD 237 #ifdef CONFIG_DVDREAD
240 case STREAMTYPE_DVD: 238 case STREAMTYPE_DVD:
241 guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD - CLEAR_FILE ); 239 guiInfoMediumClear( CLEAR_ALL - CLEAR_DVD - CLEAR_FILE );
242 if ( !dvd_device ) dvd_device=gstrdup( DEFAULT_DVD_DEVICE ); 240 if ( !dvd_device ) dvd_device=gstrdup( DEFAULT_DVD_DEVICE );
243 uiSetFileName( NULL,dvd_device,SAME_STREAMTYPE );
244 if ( guiInfo.Playing != GUI_PAUSE ) 241 if ( guiInfo.Playing != GUI_PAUSE )
245 { 242 {
246 guiInfo.NewPlay=GUI_FILE_SAME; 243 guiInfo.NewPlay=GUI_FILE_SAME;
247 } 244 }
248 break; 245 break;