Mercurial > mplayer.hg
comparison gui/ui/actions.c @ 34387:0ba85cad4c7e
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 | deff81b57903 |
| children | f2c03009068d |
comparison
equal
deleted
inserted
replaced
| 34386:206264c532f5 | 34387:0ba85cad4c7e |
|---|---|
| 240 | 240 |
| 241 if (guiInfo.Playing == GUI_PAUSE) | 241 if (guiInfo.Playing == GUI_PAUSE) |
| 242 return; | 242 return; |
| 243 | 243 |
| 244 switch (guiInfo.StreamType) { | 244 switch (guiInfo.StreamType) { |
| 245 #ifdef CONFIG_CDDA | |
| 246 case STREAMTYPE_CDDA: | |
| 247 break; | |
| 248 #endif | |
| 249 | |
| 245 #ifdef CONFIG_VCD | 250 #ifdef CONFIG_VCD |
| 246 case STREAMTYPE_VCD: | 251 case STREAMTYPE_VCD: |
| 247 break; | 252 break; |
| 248 #endif | 253 #endif |
| 249 | 254 |
| 279 | 284 |
| 280 if (guiInfo.Playing == GUI_PAUSE) | 285 if (guiInfo.Playing == GUI_PAUSE) |
| 281 return; | 286 return; |
| 282 | 287 |
| 283 switch (guiInfo.StreamType) { | 288 switch (guiInfo.StreamType) { |
| 289 #ifdef CONFIG_CDDA | |
| 290 case STREAMTYPE_CDDA: | |
| 291 if (--guiInfo.Track == 0) { | |
| 292 guiInfo.Track = 1; | |
| 293 stop = 1; | |
| 294 } | |
| 295 break; | |
| 296 #endif | |
| 297 | |
| 284 #ifdef CONFIG_VCD | 298 #ifdef CONFIG_VCD |
| 285 case STREAMTYPE_VCD: | 299 case STREAMTYPE_VCD: |
| 286 if (--guiInfo.Track == 1) { | 300 if (--guiInfo.Track == 1) { |
| 287 guiInfo.Track = 2; | 301 guiInfo.Track = 2; |
| 288 stop = 1; | 302 stop = 1; |
| 333 | 347 |
| 334 if (guiInfo.Playing == GUI_PAUSE) | 348 if (guiInfo.Playing == GUI_PAUSE) |
| 335 return; | 349 return; |
| 336 | 350 |
| 337 switch (guiInfo.StreamType) { | 351 switch (guiInfo.StreamType) { |
| 352 #ifdef CONFIG_CDDA | |
| 353 case STREAMTYPE_CDDA: | |
| 354 | |
| 355 if (++guiInfo.Track > guiInfo.Tracks) { | |
| 356 guiInfo.Track = guiInfo.Tracks; | |
| 357 stop = 1; | |
| 358 } | |
| 359 | |
| 360 break; | |
| 361 #endif | |
| 362 | |
| 338 #ifdef CONFIG_VCD | 363 #ifdef CONFIG_VCD |
| 339 case STREAMTYPE_VCD: | 364 case STREAMTYPE_VCD: |
| 340 | 365 |
| 341 if (++guiInfo.Track >= guiInfo.Tracks) { | 366 if (++guiInfo.Track >= guiInfo.Tracks) { |
| 342 stop = (guiInfo.Track > guiInfo.Tracks); | 367 stop = (guiInfo.Track > guiInfo.Tracks); |