Mercurial > mplayer.hg

comparison gui/ui/main.c @ 34387:0ba85cad4c7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add audio CD playback support to the X11/GTK GUI. (The Win32 GUI already had this support. Add missing - although already used - user event evPlayCD here as well as internal event ivSetCDTrack - although it's unused - for consistency.)
author ib
date Sat, 31 Dec 2011 12:38:52 +0000
parents e8e4e6f9b7ac
children f2c03009068d
comparison
equal deleted inserted replaced
34386:206264c532f5 34387:0ba85cad4c7e
160 160
161 case ivSetSubtitle: 161 case ivSetSubtitle:
162 mp_property_do("sub",M_PROPERTY_SET,&iparam,guiInfo.mpcontext); 162 mp_property_do("sub",M_PROPERTY_SET,&iparam,guiInfo.mpcontext);
163 break; 163 break;
164 164
165 #ifdef CONFIG_CDDA
166 case ivSetCDTrack:
167 guiInfo.Track=iparam;
168 case evPlayCD:
169 guiInfoMediumClear ( CLEAR_ALL );
170 guiInfo.StreamType=STREAMTYPE_CDDA;
171 goto play;
172 #endif
165 #ifdef CONFIG_VCD 173 #ifdef CONFIG_VCD
166 case ivSetVCDTrack: 174 case ivSetVCDTrack:
167 guiInfo.Track=iparam; 175 guiInfo.Track=iparam;
168 case evPlayVCD: 176 case evPlayVCD:
169 guiInfoMediumClear ( CLEAR_ALL ); 177 guiInfoMediumClear ( CLEAR_ALL );
200 guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE ); 208 guiInfoMediumClear( CLEAR_ALL - CLEAR_FILE );
201 if ( !guiInfo.Track ) 209 if ( !guiInfo.Track )
202 guiInfo.Track=1; 210 guiInfo.Track=1;
203 guiInfo.NewPlay=GUI_FILE_NEW; 211 guiInfo.NewPlay=GUI_FILE_NEW;
204 break; 212 break;
213 #ifdef CONFIG_CDDA
214 case STREAMTYPE_CDDA:
215 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE );
216 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
217 uiSetFileName( NULL,cdrom_device,STREAMTYPE_CDDA );
218 if ( guiInfo.Playing != GUI_PAUSE )
219 {
220 if ( !guiInfo.Track )
221 guiInfo.Track=1;
222 guiInfo.NewPlay=GUI_FILE_SAME;
223 }
224 break;
225 #endif
205 #ifdef CONFIG_VCD 226 #ifdef CONFIG_VCD
206 case STREAMTYPE_VCD: 227 case STREAMTYPE_VCD:
207 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); 228 guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE );
208 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE ); 229 if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE );
209 uiSetFileName( NULL,cdrom_device,STREAMTYPE_VCD ); 230 uiSetFileName( NULL,cdrom_device,STREAMTYPE_VCD );