Moved the mpeg_sound_xxx() functions to sound.c and renamed them to sound_xxx()

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6240 a1c6a512-1295-4272-9138-f99709370657

6 files changed, 22 insertions, 22 deletions

diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index 742e0bc..d944810 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -1042,25 +1042,25 @@ void set_position(int seconds)
 /* set to everything flat and 0 dB volume */
 void sound_neutral(void)
 {    /* neutral sound settings */
-    rb->mpeg_sound_set(SOUND_BASS, 0);
-    rb->mpeg_sound_set(SOUND_TREBLE, 0);
-    rb->mpeg_sound_set(SOUND_BALANCE, 0);
-    rb->mpeg_sound_set(SOUND_VOLUME, 92); /* 0 dB */
-    rb->mpeg_sound_set(SOUND_LOUDNESS, 0);
-    rb->mpeg_sound_set(SOUND_SUPERBASS, 0);
-    rb->mpeg_sound_set(SOUND_AVC, 0);
+    rb->sound_set(SOUND_BASS, 0);
+    rb->sound_set(SOUND_TREBLE, 0);
+    rb->sound_set(SOUND_BALANCE, 0);
+    rb->sound_set(SOUND_VOLUME, 92); /* 0 dB */
+    rb->sound_set(SOUND_LOUDNESS, 0);
+    rb->sound_set(SOUND_SUPERBASS, 0);
+    rb->sound_set(SOUND_AVC, 0);
 }
 
 /* return to user settings */
 void sound_normal(void)
 {   /* restore sound settings */
-    rb->mpeg_sound_set(SOUND_BASS, rb->global_settings->bass);
-    rb->mpeg_sound_set(SOUND_TREBLE, rb->global_settings->treble);
-    rb->mpeg_sound_set(SOUND_BALANCE, rb->global_settings->balance);
-    rb->mpeg_sound_set(SOUND_VOLUME, rb->global_settings->volume);
-    rb->mpeg_sound_set(SOUND_LOUDNESS, rb->global_settings->loudness);
-    rb->mpeg_sound_set(SOUND_SUPERBASS, rb->global_settings->superbass);
-    rb->mpeg_sound_set(SOUND_AVC, rb->global_settings->avc);
+    rb->sound_set(SOUND_BASS, rb->global_settings->bass);
+    rb->sound_set(SOUND_TREBLE, rb->global_settings->treble);
+    rb->sound_set(SOUND_BALANCE, rb->global_settings->balance);
+    rb->sound_set(SOUND_VOLUME, rb->global_settings->volume);
+    rb->sound_set(SOUND_LOUDNESS, rb->global_settings->loudness);
+    rb->sound_set(SOUND_SUPERBASS, rb->global_settings->superbass);
+    rb->sound_set(SOUND_AVC, rb->global_settings->avc);
 }
 
 /* the thread running it all */
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index 98b516f..3793fd9 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -201,7 +201,7 @@ void change_volume(int delta){
     if (vol > 100) vol = 100;
     else if (vol < 0) vol = 0;
     if (vol != rb->global_settings->volume) {
-        rb->mpeg_sound_set(SOUND_VOLUME, vol);
+        rb->sound_set(SOUND_VOLUME, vol);
         rb->global_settings->volume = vol;
         rb->snprintf(buffer, sizeof(buffer), "Vol: %d ", vol);
 #ifdef HAVE_LCD_BITMAP
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index caa09a0..868a205 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -242,7 +242,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
                 if (vol < 100)
                 {
                     vol++;
-                    rb->mpeg_sound_set(SOUND_VOLUME, vol);
+                    rb->sound_set(SOUND_VOLUME, vol);
                     rb->global_settings->volume = vol;
                 }
                 break;
@@ -253,7 +253,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
                 if (vol > 0)
                 {
                     vol--;
-                    rb->mpeg_sound_set(SOUND_VOLUME, vol);
+                    rb->sound_set(SOUND_VOLUME, vol);
                     rb->global_settings->volume = vol;
                 }
                 break;
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index d3145b4..c2cdc8d 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -1055,17 +1055,17 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
 #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
 #if defined(SPLITEDIT_SPEED150) && defined(SPLITEDIT_SPEED100) && defined(SPLITEDIT_SPEED50)
             case SPLITEDIT_SPEED150:
-                rb->mpeg_set_pitch(1500);
+                rb->sound_set_pitch(1500);
                 splitedit_invalidate_osci();
                 break;
 
             case SPLITEDIT_SPEED100:
-                rb->mpeg_set_pitch(1000);
+                rb->sound_set_pitch(1000);
                 splitedit_invalidate_osci();
                 break;
 
             case SPLITEDIT_SPEED50:
-                rb->mpeg_set_pitch(500);
+                rb->sound_set_pitch(500);
                 splitedit_invalidate_osci();
                 break;
 #endif
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index 73968d3..0257ad2 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -278,7 +278,7 @@ void ChangeVolume(int delta)
     else if (vol < 0) vol = 0;
     if (vol != rb->global_settings->volume)
     {
-        rb->mpeg_sound_set(SOUND_VOLUME, vol);
+        rb->sound_set(SOUND_VOLUME, vol);
         rb->global_settings->volume = vol;
         rb->snprintf(gPrint, sizeof(gPrint), "Vol: %d", vol);
         rb->lcd_puts(0, 7, gPrint);
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 22fc521..afeaa83 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -139,7 +139,7 @@ void change_volume(int delta) {
     if (vol>100) vol = 100;
     else if (vol < 0) vol = 0;
     if (vol != rb->global_settings->volume) {
-        rb->mpeg_sound_set(SOUND_VOLUME, vol);
+        rb->sound_set(SOUND_VOLUME, vol);
         rb->global_settings->volume = vol;
         rb->snprintf(curr_vol, sizeof(curr_vol), "%d", vol);
         rb->lcd_putsxy(0,0, curr_vol);