Mercurial > mplayer.hg
comparison gui/ui/actions.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 | af8838c2b60b |
children | 4ff933a89818 |
comparison
equal
deleted
inserted
replaced
34453:ad3519665533 | 34454:5a45efc630b8 |
---|---|
245 | 245 |
246 if (guiInfo.Playing == GUI_PAUSE) | 246 if (guiInfo.Playing == GUI_PAUSE) |
247 return; | 247 return; |
248 | 248 |
249 switch (guiInfo.StreamType) { | 249 switch (guiInfo.StreamType) { |
250 #ifdef CONFIG_CDDA | |
251 case STREAMTYPE_CDDA: | 250 case STREAMTYPE_CDDA: |
252 break; | |
253 #endif | |
254 | |
255 #ifdef CONFIG_VCD | |
256 case STREAMTYPE_VCD: | 251 case STREAMTYPE_VCD: |
257 break; | |
258 #endif | |
259 | |
260 #ifdef CONFIG_DVDREAD | |
261 case STREAMTYPE_DVD: | 252 case STREAMTYPE_DVD: |
262 break; | 253 break; |
263 #endif | |
264 | 254 |
265 default: | 255 default: |
266 | 256 |
267 curr = listSet(gtkGetCurrPlItem, NULL); | 257 curr = listSet(gtkGetCurrPlItem, NULL); |
268 | 258 |
289 | 279 |
290 if (guiInfo.Playing == GUI_PAUSE) | 280 if (guiInfo.Playing == GUI_PAUSE) |
291 return; | 281 return; |
292 | 282 |
293 switch (guiInfo.StreamType) { | 283 switch (guiInfo.StreamType) { |
294 #ifdef CONFIG_CDDA | |
295 case STREAMTYPE_CDDA: | 284 case STREAMTYPE_CDDA: |
296 if (--guiInfo.Track == 0) { | 285 if (--guiInfo.Track == 0) { |
297 guiInfo.Track = 1; | 286 guiInfo.Track = 1; |
298 stop = 1; | 287 stop = 1; |
299 } | 288 } |
300 break; | 289 break; |
301 #endif | 290 |
302 | |
303 #ifdef CONFIG_VCD | |
304 case STREAMTYPE_VCD: | 291 case STREAMTYPE_VCD: |
305 if (--guiInfo.Track == 1) { | 292 if (--guiInfo.Track == 1) { |
306 guiInfo.Track = 2; | 293 guiInfo.Track = 2; |
307 stop = 1; | 294 stop = 1; |
308 } | 295 } |
309 break; | 296 break; |
310 #endif | 297 |
311 | |
312 #ifdef CONFIG_DVDREAD | |
313 case STREAMTYPE_DVD: | 298 case STREAMTYPE_DVD: |
314 | 299 |
315 if (--guiInfo.Chapter == 0) { | 300 if (--guiInfo.Chapter == 0) { |
316 guiInfo.Chapter = 1; | 301 guiInfo.Chapter = 1; |
317 | 302 |
320 stop = 1; | 305 stop = 1; |
321 } | 306 } |
322 } | 307 } |
323 | 308 |
324 break; | 309 break; |
325 #endif | |
326 | 310 |
327 default: | 311 default: |
328 | 312 |
329 prev = listSet(gtkGetPrevPlItem, NULL); | 313 prev = listSet(gtkGetPrevPlItem, NULL); |
330 | 314 |
352 | 336 |
353 if (guiInfo.Playing == GUI_PAUSE) | 337 if (guiInfo.Playing == GUI_PAUSE) |
354 return; | 338 return; |
355 | 339 |
356 switch (guiInfo.StreamType) { | 340 switch (guiInfo.StreamType) { |
357 #ifdef CONFIG_CDDA | |
358 case STREAMTYPE_CDDA: | 341 case STREAMTYPE_CDDA: |
359 | 342 |
360 if (++guiInfo.Track > guiInfo.Tracks) { | 343 if (++guiInfo.Track > guiInfo.Tracks) { |
361 guiInfo.Track = guiInfo.Tracks; | 344 guiInfo.Track = guiInfo.Tracks; |
362 stop = 1; | 345 stop = 1; |
363 } | 346 } |
364 | 347 |
365 break; | 348 break; |
366 #endif | 349 |
367 | |
368 #ifdef CONFIG_VCD | |
369 case STREAMTYPE_VCD: | 350 case STREAMTYPE_VCD: |
370 | 351 |
371 if (++guiInfo.Track >= guiInfo.Tracks) { | 352 if (++guiInfo.Track >= guiInfo.Tracks) { |
372 stop = (guiInfo.Track > guiInfo.Tracks); | 353 stop = (guiInfo.Track > guiInfo.Tracks); |
373 guiInfo.Track = FFMAX(2, guiInfo.Tracks); | 354 guiInfo.Track = FFMAX(2, guiInfo.Tracks); |
374 } | 355 } |
375 | 356 |
376 break; | 357 break; |
377 #endif | 358 |
378 | |
379 #ifdef CONFIG_DVDREAD | |
380 case STREAMTYPE_DVD: | 359 case STREAMTYPE_DVD: |
381 | 360 |
382 if (guiInfo.Chapter++ == guiInfo.Chapters) { | 361 if (guiInfo.Chapter++ == guiInfo.Chapters) { |
383 guiInfo.Chapter = 1; | 362 guiInfo.Chapter = 1; |
384 | 363 |
387 stop = 1; | 366 stop = 1; |
388 } | 367 } |
389 } | 368 } |
390 | 369 |
391 break; | 370 break; |
392 #endif | |
393 | 371 |
394 default: | 372 default: |
395 | 373 |
396 next = listSet(gtkGetNextPlItem, NULL); | 374 next = listSet(gtkGetNextPlItem, NULL); |
397 | 375 |