summaryrefslogtreecommitdiff
path: root/apps/misc.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/misc.c')
-rw-r--r--apps/misc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/misc.c b/apps/misc.c
index 63aa3589b2..91f87ad06b 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -465,7 +465,7 @@ static void car_adapter_mode_processing(bool inserted)
465 if ((audio_status() & AUDIO_STATUS_PLAY) && 465 if ((audio_status() & AUDIO_STATUS_PLAY) &&
466 !(audio_status() & AUDIO_STATUS_PAUSE)) 466 !(audio_status() & AUDIO_STATUS_PAUSE))
467 { 467 {
468 pause_action(true, true); 468 pause_action(true);
469 paused_on_unplugged = true; 469 paused_on_unplugged = true;
470 } 470 }
471 else if (!waiting_to_resume_play) 471 else if (!waiting_to_resume_play)
@@ -513,14 +513,14 @@ static void hp_unplug_change(bool inserted)
513 if ((audio_stat & AUDIO_STATUS_PLAY) && 513 if ((audio_stat & AUDIO_STATUS_PLAY) &&
514 headphone_caused_pause && 514 headphone_caused_pause &&
515 global_settings.unplug_mode > 1 ) 515 global_settings.unplug_mode > 1 )
516 unpause_action(true, true); 516 unpause_action(true);
517 headphone_caused_pause = false; 517 headphone_caused_pause = false;
518 } else { 518 } else {
519 if ((audio_stat & AUDIO_STATUS_PLAY) && 519 if ((audio_stat & AUDIO_STATUS_PLAY) &&
520 !(audio_stat & AUDIO_STATUS_PAUSE)) 520 !(audio_stat & AUDIO_STATUS_PAUSE))
521 { 521 {
522 headphone_caused_pause = true; 522 headphone_caused_pause = true;
523 pause_action(false, false); 523 pause_action(false);
524 } 524 }
525 } 525 }
526 } 526 }
@@ -552,14 +552,14 @@ static void lo_unplug_change(bool inserted)
552 if ((audio_stat & AUDIO_STATUS_PLAY) && 552 if ((audio_stat & AUDIO_STATUS_PLAY) &&
553 lineout_caused_pause && 553 lineout_caused_pause &&
554 global_settings.unplug_mode > 1 ) 554 global_settings.unplug_mode > 1 )
555 unpause_action(true, true); 555 unpause_action(true);
556 lineout_caused_pause = false; 556 lineout_caused_pause = false;
557 } else { 557 } else {
558 if ((audio_stat & AUDIO_STATUS_PLAY) && 558 if ((audio_stat & AUDIO_STATUS_PLAY) &&
559 !(audio_stat & AUDIO_STATUS_PAUSE)) 559 !(audio_stat & AUDIO_STATUS_PAUSE))
560 { 560 {
561 lineout_caused_pause = true; 561 lineout_caused_pause = true;
562 pause_action(false, false); 562 pause_action(false);
563 } 563 }
564 } 564 }
565 } 565 }
@@ -629,7 +629,7 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
629 return SYS_CHARGER_DISCONNECTED; 629 return SYS_CHARGER_DISCONNECTED;
630 630
631 case SYS_CAR_ADAPTER_RESUME: 631 case SYS_CAR_ADAPTER_RESUME:
632 unpause_action(true, true); 632 unpause_action(true);
633 return SYS_CAR_ADAPTER_RESUME; 633 return SYS_CAR_ADAPTER_RESUME;
634#endif 634#endif
635#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN 635#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
@@ -710,9 +710,9 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
710 if (status & AUDIO_STATUS_PLAY) 710 if (status & AUDIO_STATUS_PLAY)
711 { 711 {
712 if (status & AUDIO_STATUS_PAUSE) 712 if (status & AUDIO_STATUS_PAUSE)
713 unpause_action(true, true); 713 unpause_action(true);
714 else 714 else
715 pause_action(true, true); 715 pause_action(true);
716 } 716 }
717 else 717 else
718 if (playlist_resume() != -1) 718 if (playlist_resume() != -1)