More audio code restructuring, mostly renaming functions so far

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

3 files changed, 52 insertions, 52 deletions

diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index d944810b31..d0b3b1d8d1 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -817,7 +817,7 @@ void emu_process_packet(unsigned char* mbus_msg, int msg_size)
 
     if (playmsg_dirty)
     {
-        rb->yield(); /* give the mpeg thread a chance to process */
+        rb->yield(); /* give the audio thread a chance to process */
         get_playmsg(); /* force update */
         mbus_send(gEmu.playmsg, sizeof(gEmu.playmsg));
     }
@@ -876,10 +876,10 @@ void get_playmsg(void)
 
     if (gEmu.set_state != EMU_FF && gEmu.set_state != EMU_FR)
     {
-        switch(rb->mpeg_status())
+        switch(rb->audio_status())
         {
-        case MPEG_STATUS_PLAY:
-            print_scroll("MpegStat Play");
+        case AUDIO_STATUS_PLAY:
+            print_scroll("AudioStat Play");
             if (gEmu.set_state == EMU_FF || gEmu.set_state == EMU_FR)
                 gEmu.playmsg[2] = gEmu.set_state; /* set FF/FR */
             else
@@ -890,8 +890,8 @@ void get_playmsg(void)
             bit_set(gEmu.playmsg, 59, false); /* clear stop */
             break;
 
-        case MPEG_STATUS_PLAY | MPEG_STATUS_PAUSE:
-            print_scroll("MpegStat Pause");
+        case AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE:
+            print_scroll("AudioStat Pause");
             gEmu.playmsg[2] = EMU_PAUSED;
             bit_set(gEmu.playmsg, 56, false); /* clear play */
             bit_set(gEmu.playmsg, 57, true); /* set pause */
@@ -899,7 +899,7 @@ void get_playmsg(void)
             break;
 
         default:
-            print_scroll("MpegStat 0");
+            print_scroll("AudioStat 0");
             gEmu.playmsg[2] = EMU_STOPPED;
             bit_set(gEmu.playmsg, 56, false); /* clear play */
             bit_set(gEmu.playmsg, 57, false); /* clear pause */
@@ -943,7 +943,7 @@ int get_playtime(void)
 {
     struct mp3entry* p_mp3entry;
 
-    p_mp3entry = rb->mpeg_current_track();
+    p_mp3entry = rb->audio_current_track();
     if (p_mp3entry == NULL)
         return 0;
 
@@ -955,7 +955,7 @@ int get_tracklength(void)
 {
     struct mp3entry* p_mp3entry;
 
-    p_mp3entry = rb->mpeg_current_track();
+    p_mp3entry = rb->audio_current_track();
     if (p_mp3entry == NULL)
         return 0;
 
@@ -967,13 +967,13 @@ void set_track(int selected)
 {
     if (selected > get_track())
     {
-        print_scroll("mpeg_next");
-        rb->mpeg_next();
+        print_scroll("audio_next");
+        rb->audio_next();
     }
     else if (selected < get_track())
     {
-        print_scroll("mpeg_prev");
-        rb->mpeg_prev();
+        print_scroll("audio_prev");
+        rb->audio_prev();
     }
 }
 
@@ -982,7 +982,7 @@ int get_track(void)
 {
     struct mp3entry* p_mp3entry;
 
-    p_mp3entry = rb->mpeg_current_track();
+    p_mp3entry = rb->audio_current_track();
     if (p_mp3entry == NULL)
         return 0;
 
@@ -992,48 +992,48 @@ int get_track(void)
 /* start or resume playback */
 void set_play(void)
 {
-    if (rb->mpeg_status() == MPEG_STATUS_PLAY)
+    if (rb->audio_status() == AUDIO_STATUS_PLAY)
         return;
 
-    if (rb->mpeg_status() == (MPEG_STATUS_PLAY | MPEG_STATUS_PAUSE))
+    if (rb->audio_status() == (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE))
     {
-        print_scroll("mpeg_resume");
-        rb->mpeg_resume();
+        print_scroll("audio_resume");
+        rb->audio_resume();
     }
     else
     {
-        print_scroll("mpeg_play(0)");
-        rb->mpeg_play(0);
+        print_scroll("audio_play(0)");
+        rb->audio_play(0);
     }
 }
 
 /* pause playback */
 void set_pause(void)
 {
-    if (rb->mpeg_status() == MPEG_STATUS_PLAY)
+    if (rb->audio_status() == AUDIO_STATUS_PLAY)
     {
-        print_scroll("mpeg_pause");
-        rb->mpeg_pause();
+        print_scroll("audio_pause");
+        rb->audio_pause();
     }
 }
 
 /* stop playback */
 void set_stop(void)
 {
-    if (rb->mpeg_status() & MPEG_STATUS_PLAY)
+    if (rb->audio_status() & AUDIO_STATUS_PLAY)
     {
-        print_scroll("mpeg_stop");
-        rb->mpeg_stop();
+        print_scroll("audio_stop");
+        rb->audio_stop();
     }
 }
 
 /* seek */
 void set_position(int seconds)
 {
-    if (rb->mpeg_status() & MPEG_STATUS_PLAY)
+    if (rb->audio_status() & AUDIO_STATUS_PLAY)
     {
-        print_scroll("mpeg_ff_rewind");
-        rb->mpeg_ff_rewind(seconds * 1000);
+        print_scroll("audio_ff_rewind");
+        rb->audio_ff_rewind(seconds * 1000);
     }
 }
 
diff --git a/apps/plugins/favorites.c b/apps/plugins/favorites.c
index c4b969f920..68eab43298 100644
--- a/apps/plugins/favorites.c
+++ b/apps/plugins/favorites.c
@@ -21,7 +21,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     if(parameter) {
         rb->strncpy(track_path, parameter, MAX_PATH);
     } else {
-        id3 = rb->mpeg_current_track();
+        id3 = rb->audio_current_track();
         if (!id3) {
             rb->splash(HZ*2, true, "Nothing To Save");
             return PLUGIN_OK;
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index c2cdc8de6e..d38223827b 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -614,11 +614,11 @@ static int save(
     }
 
     /* find the file position of the split point */
-    rb->mpeg_pause();
-    rb->mpeg_ff_rewind(splittime);
+    rb->audio_pause();
+    rb->audio_ff_rewind(splittime);
     rb->yield();
     rb->yield();
-    end = rb->mpeg_get_file_pos();
+    end = rb->audio_get_file_pos();
 
     /* open the source file */
     src_file = rb->open(mp3->path, O_RDONLY);
@@ -720,7 +720,7 @@ static int save(
         retval = -3;
     }
 
-    rb->mpeg_resume();
+    rb->audio_resume();
 
     return retval;
 }
@@ -985,27 +985,27 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
 
                     case LOOP_MODE_ALL:
                     case LOOP_MODE_TO:
-                        rb->mpeg_pause();
-                        rb->mpeg_ff_rewind(range_start);
+                        rb->audio_pause();
+                        rb->audio_ff_rewind(range_start);
 #ifdef HAVE_MMC
 /* MMC is slow - wait some time to allow track reload to finish */
                         rb->sleep(HZ/20);
                         if (mp3->elapsed > play_end) /* reload in progress */
                             rb->splash(10*HZ, true, "Wait - reloading");
 #endif
-                        rb->mpeg_resume();
+                        rb->audio_resume();
                         break;
 
                     case LOOP_MODE_FROM:
-                        rb->mpeg_pause();
-                        rb->mpeg_ff_rewind(xpos_to_time(split_x));
+                        rb->audio_pause();
+                        rb->audio_ff_rewind(xpos_to_time(split_x));
 #ifdef HAVE_MMC
 /* MMC is slow - wait some time to allow track reload to finish */
                         rb->sleep(HZ/20);
                         if (mp3->elapsed > play_end) /* reload in progress */
                             rb->splash(10*HZ, true, "Wait - reloading");
 #endif
-                        rb->mpeg_resume();
+                        rb->audio_resume();
                         break;
 
                     case LOOP_MODE_FREE:
@@ -1037,9 +1037,9 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 if (lastbutton != SPLITEDIT_PLAY_PRE)
                     break;
 #endif
-                rb->mpeg_pause();
-                rb->mpeg_ff_rewind(xpos_to_time(split_x));
-                rb->mpeg_resume();
+                rb->audio_pause();
+                rb->audio_ff_rewind(xpos_to_time(split_x));
+                rb->audio_resume();
                 break;
 
             case BUTTON_UP:
@@ -1159,9 +1159,9 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
             }
             update_data();
 
-            if (mp3 != rb->mpeg_current_track())
+            if (mp3 != rb->audio_current_track())
             {
-                struct mp3entry *new_mp3 = rb->mpeg_current_track();
+                struct mp3entry *new_mp3 = rb->audio_current_track();
                 if (rb->strncasecmp(path_mp3, new_mp3->path,
                                     sizeof (path_mp3)))
                 {
@@ -1173,10 +1173,10 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 else
                 {
                     mp3 = new_mp3;
-                    rb->mpeg_pause();
-                    rb->mpeg_flush_and_reload_tracks();
-                    rb->mpeg_ff_rewind(range_start);
-                    rb->mpeg_resume();
+                    rb->audio_pause();
+                    rb->audio_flush_and_reload_tracks();
+                    rb->audio_ff_rewind(range_start);
+                    rb->audio_resume();
                 }
             }
         }
@@ -1192,12 +1192,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     rb = api;
     rb->lcd_clear_display();
     rb->lcd_update();
-    mp3 = rb->mpeg_current_track();
+    mp3 = rb->audio_current_track();
     if (mp3 != NULL)
     {
-        if (rb->mpeg_status() & MPEG_STATUS_PAUSE)
+        if (rb->audio_status() & AUDIO_STATUS_PAUSE)
         {
-            rb->mpeg_resume();
+            rb->audio_resume();
         }
         splitedit_editor(mp3, mp3->elapsed, MIN_RANGE_SIZE * 8);
     }