From 74aba34b5805b345a8f5f89657da4aeaaffcdb0c Mon Sep 17 00:00:00 2001
From: Thomas Martitz <kugel@rockbox.org>
Date: Thu, 12 Mar 2009 18:50:24 +0000
Subject: Move play_hop() to gwps.c and make it static. It's the only file that
 calls it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20306 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/gwps-common.c | 31 -------------------------------
 apps/gui/gwps-common.h |  1 -
 apps/gui/gwps.c        | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index b43c357408..b60377de78 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -62,7 +62,6 @@
 #endif
 #include "backdrop.h"
 #include "viewport.h"
-#include "pcmbuf.h"
 
 #define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */ 
                                 /* 3% of 30min file == 54s step size */
@@ -151,36 +150,6 @@ bool update_onvol_change(struct gui_wps * gwps)
     return false;
 }
 
-void play_hop(int direction)
-{
-    unsigned step = ((unsigned)global_settings.skip_length*1000);
-    unsigned long *elapsed = &(wps_state.id3->elapsed);
-
-    if (direction == 1 && wps_state.id3->length - *elapsed < step+1000) {
-#if CONFIG_CODEC == SWCODEC
-        if(global_settings.beep)
-            pcmbuf_beep(1000, 150, 1500*global_settings.beep);
-#endif
-        return;
-    } else if ((direction == -1 && *elapsed < step)) {
-        *elapsed = 0;
-    } else {
-        *elapsed += step * direction;
-    }
-    if((audio_status() & AUDIO_STATUS_PLAY) && !wps_state.paused) {
-#if (CONFIG_CODEC == SWCODEC)
-        audio_pre_ff_rewind();
-#else
-        audio_pause();
-#endif
-    }
-    audio_ff_rewind(*elapsed);
-#if (CONFIG_CODEC != SWCODEC)
-    if (!wps_state.paused)
-        audio_resume();
-#endif
-}
-
 bool ffwd_rew(int button)
 {
     unsigned int step = 0;     /* current ff/rewind step */ 
diff --git a/apps/gui/gwps-common.h b/apps/gui/gwps-common.h
index 3102d72c80..25ce435592 100644
--- a/apps/gui/gwps-common.h
+++ b/apps/gui/gwps-common.h
@@ -29,7 +29,6 @@ void fade(bool fade_in, bool updatewps);
 bool gui_wps_display(void);
 bool update_onvol_change(struct gui_wps * gwps);
 bool update(struct gui_wps *gwps);
-void play_hop(int direction);
 bool ffwd_rew(int button);
 void display_keylock_text(bool locked);
 
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 7ba9862895..d928bc3e64 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -63,6 +63,7 @@
 #include "pitchscreen.h"
 #include "appevents.h"
 #include "viewport.h"
+#include "pcmbuf.h"
 
 /* currently only one wps_state is needed */
 struct wps_state wps_state;
@@ -115,6 +116,37 @@ static void next_track(void)
 
     audio_next();
 }
+
+static void play_hop(int direction)
+{
+    unsigned step = ((unsigned)global_settings.skip_length*1000);
+    unsigned long *elapsed = &(wps_state.id3->elapsed);
+
+    if (direction == 1 && wps_state.id3->length - *elapsed < step+1000) {
+#if CONFIG_CODEC == SWCODEC
+        if(global_settings.beep)
+            pcmbuf_beep(1000, 150, 1500*global_settings.beep);
+#endif
+        return;
+    } else if ((direction == -1 && *elapsed < step)) {
+        *elapsed = 0;
+    } else {
+        *elapsed += step * direction;
+    }
+    if((audio_status() & AUDIO_STATUS_PLAY) && !wps_state.paused) {
+#if (CONFIG_CODEC == SWCODEC)
+        audio_pre_ff_rewind();
+#else
+        audio_pause();
+#endif
+    }
+    audio_ff_rewind(*elapsed);
+#if (CONFIG_CODEC != SWCODEC)
+    if (!wps_state.paused)
+        audio_resume();
+#endif
+}
+
 static int fix_wps_bars(void)
 {
 #ifdef HAVE_LCD_BITMAP
-- 
cgit v1.2.3