summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-10-02 19:47:51 +0100
committerAidan MacDonald <amachronic@protonmail.com>2022-10-18 12:56:28 +0100
commit6e4c866756d7c443c9f8cae0a794daf528706078 (patch)
tree8ead31ab9dac1fcc2322cddda6aedb8c7c4c65bd
parente03bc66594af9b412a6b0eb6e792518759133181 (diff)
downloadrockbox-6e4c866756.tar.gz
rockbox-6e4c866756.zip
Remove unused 'may_fade' argument of pause/unpause_action
Change-Id: I4eedcf30fa704521e751732a56775c43e9a8bd99
-rw-r--r--apps/gui/wps.c12
-rw-r--r--apps/gui/wps.h4
-rw-r--r--apps/misc.c16
3 files changed, 14 insertions, 18 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 837621fb44..4d22a83fd6 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -115,7 +115,7 @@ static void update_non_static(void)
skin_update(WPS, i, SKIN_REFRESH_NON_STATIC);
}
-void pause_action(bool may_fade, bool updatewps)
+void pause_action(bool updatewps)
{
/* Do audio first, then update, unless skin were to use its local
status in which case, reverse it */
@@ -132,11 +132,9 @@ void pause_action(bool may_fade, bool updatewps)
- global_settings.pause_rewind * 1000;
audio_ff_rewind(newpos > 0 ? newpos : 0);
}
-
- (void)may_fade;
}
-void unpause_action(bool may_fade, bool updatewps)
+void unpause_action(bool updatewps)
{
/* Do audio first, then update, unless skin were to use its local
status in which case, reverse it */
@@ -144,8 +142,6 @@ void unpause_action(bool may_fade, bool updatewps)
if (updatewps)
update_non_static();
-
- (void)may_fade;
}
static bool update_onvol_change(enum screen_type screen)
@@ -578,12 +574,12 @@ void wps_do_playpause(bool updatewps)
if ( state->paused )
{
state->paused = false;
- unpause_action(true, updatewps);
+ unpause_action(updatewps);
}
else
{
state->paused = true;
- pause_action(true, updatewps);
+ pause_action(updatewps);
settings_save();
#if !defined(HAVE_SW_POWEROFF)
call_storage_idle_notifys(true); /* make sure resume info is saved */
diff --git a/apps/gui/wps.h b/apps/gui/wps.h
index 88f0ef7c34..4abd0c4fe4 100644
--- a/apps/gui/wps.h
+++ b/apps/gui/wps.h
@@ -26,8 +26,8 @@
long gui_wps_show(void);
/* fade (if enabled) and pause the audio, optionally rewind a little */
-void pause_action(bool may_fade, bool updatewps);
-void unpause_action(bool may_fade, bool updatewps);
+void pause_action(bool updatewps);
+void unpause_action(bool updatewps);
void wps_do_playpause(bool updatewps);
#ifdef IPOD_ACCESSORY_PROTOCOL
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)
if ((audio_status() & AUDIO_STATUS_PLAY) &&
!(audio_status() & AUDIO_STATUS_PAUSE))
{
- pause_action(true, true);
+ pause_action(true);
paused_on_unplugged = true;
}
else if (!waiting_to_resume_play)
@@ -513,14 +513,14 @@ static void hp_unplug_change(bool inserted)
if ((audio_stat & AUDIO_STATUS_PLAY) &&
headphone_caused_pause &&
global_settings.unplug_mode > 1 )
- unpause_action(true, true);
+ unpause_action(true);
headphone_caused_pause = false;
} else {
if ((audio_stat & AUDIO_STATUS_PLAY) &&
!(audio_stat & AUDIO_STATUS_PAUSE))
{
headphone_caused_pause = true;
- pause_action(false, false);
+ pause_action(false);
}
}
}
@@ -552,14 +552,14 @@ static void lo_unplug_change(bool inserted)
if ((audio_stat & AUDIO_STATUS_PLAY) &&
lineout_caused_pause &&
global_settings.unplug_mode > 1 )
- unpause_action(true, true);
+ unpause_action(true);
lineout_caused_pause = false;
} else {
if ((audio_stat & AUDIO_STATUS_PLAY) &&
!(audio_stat & AUDIO_STATUS_PAUSE))
{
lineout_caused_pause = true;
- pause_action(false, false);
+ pause_action(false);
}
}
}
@@ -629,7 +629,7 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
return SYS_CHARGER_DISCONNECTED;
case SYS_CAR_ADAPTER_RESUME:
- unpause_action(true, true);
+ unpause_action(true);
return SYS_CAR_ADAPTER_RESUME;
#endif
#ifdef HAVE_HOTSWAP_STORAGE_AS_MAIN
@@ -710,9 +710,9 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
if (status & AUDIO_STATUS_PLAY)
{
if (status & AUDIO_STATUS_PAUSE)
- unpause_action(true, true);
+ unpause_action(true);
else
- pause_action(true, true);
+ pause_action(true);
}
else
if (playlist_resume() != -1)