From 13da1ba785b1f06bacae06da422ac2cf2ea5eb76 Mon Sep 17 00:00:00 2001
From: Aidan MacDonald <amachronic@protonmail.com>
Date: Sun, 2 Oct 2022 20:44:27 +0100
Subject: Remove is_fading from the global WPS state

Turns out it was never assigned and always false.

Change-Id: I8cd9118682e7a0785c262d4c0594f8f51412c18b
---
 apps/gui/skin_engine/skin_tokens.c   | 3 +--
 apps/gui/skin_engine/wps_internals.h | 1 -
 apps/gui/wps.c                       | 8 --------
 apps/gui/wps.h                       | 5 -----
 apps/iap/iap-lingo4.c                | 8 ++++----
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 27022b87d1..0101a5e01e 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -1044,8 +1044,7 @@ const char *get_token_value(struct gui_wps *gwps,
             int mode = 1; /* stop */
             if (status == STATUS_PLAY)
                 mode = 2; /* play */
-            if (state->is_fading ||
-               (status == STATUS_PAUSE  && !status_get_ffmode()))
+            if (status == STATUS_PAUSE && !status_get_ffmode())
                 mode = 3; /* pause */
             else
             {   /* ff / rwd */
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 4db304297b..2aedff752b 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -403,7 +403,6 @@ struct wps_state
     struct mp3entry* nid3;
     int  ff_rewind_count;
     bool paused;
-    bool is_fading;
 };
 
 /* change the ff/rew-status
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index b1700459cc..53ece62e9c 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -1070,11 +1070,3 @@ static void wps_state_init(void)
     add_event(PLAYBACK_EVENT_TRACK_SKIP, track_info_callback);
 #endif
 }
-
-
-#ifdef IPOD_ACCESSORY_PROTOCOL
-bool is_wps_fading(void)
-{
-    return skin_get_global_state()->is_fading;
-}
-#endif
diff --git a/apps/gui/wps.h b/apps/gui/wps.h
index 4abd0c4fe4..75c8138d35 100644
--- a/apps/gui/wps.h
+++ b/apps/gui/wps.h
@@ -30,11 +30,6 @@ void pause_action(bool updatewps);
 void unpause_action(bool updatewps);
 void wps_do_playpause(bool updatewps);
 
-#ifdef IPOD_ACCESSORY_PROTOCOL
-/* whether the wps is fading the volume due to pausing/stopping */
-bool is_wps_fading(void);
-#endif /* IPOD_ACCESSORY_PROTOCOL */
-
 /* in milliseconds */
 #define DEFAULT_SKIP_THRESH          3000l
 
diff --git a/apps/iap/iap-lingo4.c b/apps/iap/iap-lingo4.c
index 4ec5c462a1..abb13eac02 100644
--- a/apps/iap/iap-lingo4.c
+++ b/apps/iap/iap-lingo4.c
@@ -1218,7 +1218,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
         {
             memcpy(cur_dbrecord, buf + 3, 5);
 
-            int paused = (is_wps_fading() || (audio_status() & AUDIO_STATUS_PAUSE));
+            int paused = !!(audio_status() & AUDIO_STATUS_PAUSE);
             uint32_t index;
             uint32_t trackcount;
             index = get_u32(&cur_dbrecord[1]);
@@ -2003,7 +2003,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
              *
              */
         {
-            int paused = (is_wps_fading() || (audio_status() & AUDIO_STATUS_PAUSE));
+            int paused = !!(audio_status() & AUDIO_STATUS_PAUSE);
             uint32_t index;
             uint32_t trackcount;
             index = get_u32(&buf[3]);
@@ -2821,7 +2821,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
              *
              */
         {
-            int paused = (is_wps_fading() || (audio_status() & AUDIO_STATUS_PAUSE));
+            int paused = !!(audio_status() & AUDIO_STATUS_PAUSE);
             long tracknum = get_u32(&buf[3]);
 
             audio_pause();
@@ -2977,7 +2977,7 @@ void iap_handlepkt_mode4(const unsigned int len, const unsigned char *buf)
         {
             memcpy(cur_dbrecord, buf + 3, 5);
 
-            int paused = (is_wps_fading() || (audio_status() & AUDIO_STATUS_PAUSE));
+            int paused = !!(audio_status() & AUDIO_STATUS_PAUSE);
             unsigned int number_of_playlists = nbr_total_playlists();
             uint32_t index;
             uint32_t trackcount;
-- 
cgit v1.2.3