5 files changed, 131 insertions, 105 deletions

diff --git a/firmware/export/audio.h b/firmware/export/audio.h
new file mode 100644
index 0000000000..b276490ab3
--- /dev/null
+++ b/firmware/export/audio.h
@@ -0,0 +1,81 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2005 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef AUDIO_H
+#define AUDIO_H
+
+#include <stdbool.h>
+
+#ifdef SIMULATOR
+#define audio_play(x) sim_audio_play(x)
+#endif
+
+#define AUDIO_STATUS_PLAY 1
+#define AUDIO_STATUS_PAUSE 2
+#define AUDIO_STATUS_RECORD 4
+#define AUDIO_STATUS_PRERECORD 8
+#define AUDIO_STATUS_ERROR 16
+
+#define AUDIOERR_DISK_FULL 1
+
+struct audio_debug
+{
+        int mp3buflen;
+        int mp3buf_write;
+        int mp3buf_swapwrite;
+        int mp3buf_read;
+
+        int last_dma_chunk_size;
+
+        bool dma_on;
+        bool playing;
+        bool play_pending;
+        bool is_playing;
+        bool filling;
+        bool dma_underrun;
+
+        int unplayed_space;
+        int playable_space;
+        int unswapped_space;
+
+        int low_watermark_level;
+        int lowest_watermark_level;
+};
+
+void audio_init(void);
+void audio_play(int offset);
+void audio_stop(void);
+void audio_pause(void);
+void audio_resume(void);
+void audio_next(void);
+void audio_prev(void);
+int audio_status(void);
+void audio_ff_rewind(int newtime);
+void audio_flush_and_reload_tracks(void);
+struct mp3entry* audio_current_track(void);
+struct mp3entry* audio_next_track(void);
+bool audio_has_changed_track(void);
+void audio_get_debugdata(struct audio_debug *dbgdata);
+void audio_set_buffer_margin(int seconds);
+unsigned int audio_error(void);
+void audio_error_clear(void);
+int audio_get_file_pos(void);
+void audio_beep(int duration);
+void audio_init_playback(void);
+
+#endif
diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h
index 479c5f2317..ca0de1f823 100644
--- a/firmware/export/mpeg.h
+++ b/firmware/export/mpeg.h
@@ -42,50 +42,8 @@
 /* For ID3 info and VBR header */
 #define MPEG_RESERVED_HEADER_SPACE (4096 + 1500)
 
-#ifdef SIMULATOR
-#define mpeg_play(x) sim_mpeg_play(x)
-#endif
-
-struct mpeg_debug
-{
-        int mp3buflen;
-        int mp3buf_write;
-        int mp3buf_swapwrite;
-        int mp3buf_read;
-
-        int last_dma_chunk_size;
-
-        bool dma_on;
-        bool playing;
-        bool play_pending;
-        bool is_playing;
-        bool filling;
-        bool dma_underrun;
-
-        int unplayed_space;
-        int playable_space;
-        int unswapped_space;
-
-        int low_watermark_level;
-        int lowest_watermark_level;
-};
-
-void mpeg_init(void);
-void mpeg_play(int offset);
-void mpeg_stop(void);
-void mpeg_pause(void);
-void mpeg_resume(void);
-void mpeg_next(void);
-void mpeg_prev(void);
-void mpeg_ff_rewind(int newtime);
-void mpeg_flush_and_reload_tracks(void);
-struct mp3entry* mpeg_current_track(void);
-struct mp3entry* mpeg_next_track(void);
-bool mpeg_has_changed_track(void);
-int mpeg_status(void);
 #if (CONFIG_HWCODEC == MAS3587F) || defined(SIMULATOR)
 void mpeg_init_recording(void);
-void mpeg_init_playback(void);
 void mpeg_record(const char *filename);
 void mpeg_new_file(const char *filename);
 void mpeg_set_recording_options(int frequency, int quality,
@@ -97,25 +55,11 @@ unsigned long mpeg_num_recorded_bytes(void);
 void mpeg_pause_recording(void);
 void mpeg_resume_recording(void);
 #endif
-void mpeg_get_debugdata(struct mpeg_debug *dbgdata);
-void mpeg_set_buffer_margin(int seconds);
-unsigned int mpeg_error(void);
-void mpeg_error_clear(void);
-int mpeg_get_file_pos(void);
 unsigned long mpeg_get_last_header(void);
-void mpeg_beep(int duration);
 
 /* in order to keep the recording here, I have to expose this */
 void rec_tick(void);
 void playback_tick(void); /* FixMe: get rid of this, use mp3_get_playtime() */
 void mpeg_id3_options(bool _v1first);
 
-#define MPEG_STATUS_PLAY 1
-#define MPEG_STATUS_PAUSE 2
-#define MPEG_STATUS_RECORD 4
-#define MPEG_STATUS_PRERECORD 8
-#define MPEG_STATUS_ERROR 16
-
-#define MPEGERR_DISK_FULL 1
-
 #endif
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index d8de1a37b4..79265e4452 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -23,6 +23,7 @@
 #include "panic.h"
 #include "id3.h"
 #include "mpeg.h"
+#include "audio.h"
 #include "ata.h"
 #include "string.h"
 #include <kernel.h>
@@ -220,10 +221,10 @@ static void set_elapsed(struct mp3entry* id3)
         id3->elapsed = id3->offset / id3->bpf * id3->tpf;
 }
 
-int mpeg_get_file_pos(void)
+int audio_get_file_pos(void)
 {
     int pos = -1;
-    struct mp3entry *id3 = mpeg_current_track();
+    struct mp3entry *id3 = audio_current_track();
     
     if (id3->vbr)
     {
@@ -402,12 +403,12 @@ static void recalculate_watermark(int bitrate)
     }
 }
 
-void mpeg_set_buffer_margin(int seconds)
+void audio_set_buffer_margin(int seconds)
 {
     low_watermark_margin = seconds;
 }
 
-void mpeg_get_debugdata(struct mpeg_debug *dbgdata)
+void audio_get_debugdata(struct audio_debug *dbgdata)
 {
     dbgdata->mp3buflen = mp3buflen;
     dbgdata->mp3buf_write = mp3buf_write;
@@ -1264,7 +1265,7 @@ static void mpeg_thread(void)
             }
 
             case MPEG_FF_REWIND: {
-                struct mp3entry *id3  = mpeg_current_track();
+                struct mp3entry *id3  = audio_current_track();
                 unsigned int oldtime  = id3->elapsed;
                 unsigned int newtime  = (unsigned int)ev.data;
                 int curpos, newpos, diffpos;
@@ -1272,7 +1273,7 @@ static void mpeg_thread(void)
 
                 id3->elapsed = newtime;
 
-                newpos = mpeg_get_file_pos();
+                newpos = audio_get_file_pos();
                 if(newpos < 0)
                 {
                     id3->elapsed = oldtime;
@@ -1808,7 +1809,7 @@ static void mpeg_thread(void)
                         {
                             if(errno == ENOSPC)
                             {
-                                mpeg_errno = MPEGERR_DISK_FULL;
+                                mpeg_errno = AUDIOERR_DISK_FULL;
                                 demand_irq_enable(false);
                                 stop_recording();
                                 queue_post(&mpeg_queue, MPEG_STOP_DONE, 0);
@@ -1830,7 +1831,7 @@ static void mpeg_thread(void)
                         {
                             if(errno == ENOSPC)
                             {
-                                mpeg_errno = MPEGERR_DISK_FULL;
+                                mpeg_errno = AUDIOERR_DISK_FULL;
                                 demand_irq_enable(false);
                                 stop_recording();
                                 queue_post(&mpeg_queue, MPEG_STOP_DONE, 0);
@@ -1902,7 +1903,7 @@ static void mpeg_thread(void)
                             {
                                 if(errno == ENOSPC)
                                 {
-                                    mpeg_errno = MPEGERR_DISK_FULL;
+                                    mpeg_errno = AUDIOERR_DISK_FULL;
                                     stop_recording();
                                     queue_post(&mpeg_queue, MPEG_STOP_DONE, 0);
                                     break;
@@ -2013,7 +2014,7 @@ void mpeg_id3_options(bool _v1first)
    v1first = _v1first;
 }
 
-struct mp3entry* mpeg_current_track()
+struct mp3entry* audio_current_track()
 {
 #ifdef SIMULATOR
     return &taginfo;
@@ -2025,7 +2026,7 @@ struct mp3entry* mpeg_current_track()
 #endif /* #ifdef SIMULATOR */
 }
 
-struct mp3entry* mpeg_next_track()
+struct mp3entry* audio_next_track()
 {
 #ifdef SIMULATOR
     return &taginfo;
@@ -2037,7 +2038,7 @@ struct mp3entry* mpeg_next_track()
 #endif /* #ifdef SIMULATOR */
 }
 
-bool mpeg_has_changed_track(void)
+bool audio_has_changed_track(void)
 {
     if(last_track_counter != current_track_counter)
     {
@@ -2048,7 +2049,7 @@ bool mpeg_has_changed_track(void)
 }
 
 #if CONFIG_HWCODEC == MAS3587F
-void mpeg_init_playback(void)
+void audio_init_playback(void)
 {
     init_playback_done = false;
     queue_post(&mpeg_queue, MPEG_INIT_PLAYBACK, NULL);
@@ -2407,7 +2408,7 @@ void mpeg_set_recording_gain(int left, int right, bool use_mic)
 }
 
 /* try to make some kind of beep, also in recording mode */
-void mpeg_beep(int duration)
+void audio_beep(int duration)
 {
     long starttick = current_tick;
     do
@@ -2495,7 +2496,7 @@ void bitswap(unsigned char *data, int length)
     (void)length;
 }
 
-void mpeg_init_playback(void)
+void audio_init_playback(void)
 {
     /* a dummy */
 }
@@ -2504,7 +2505,7 @@ unsigned long mpeg_recorded_time(void)
     /* a dummy */
     return 0;
 }
-void mpeg_beep(int duration)
+void audio_beep(int duration)
 {
     /* a dummy */
     (void)duration;
@@ -2558,7 +2559,7 @@ void mpeg_set_recording_options(int frequency, int quality,
 }
 #endif
 
-void mpeg_play(int offset)
+void audio_play(int offset)
 {
 #ifdef SIMULATOR
     char* trackname;
@@ -2595,7 +2596,7 @@ void mpeg_play(int offset)
     mpeg_errno = 0;
 }
 
-void mpeg_stop(void)
+void audio_stop(void)
 {
 #ifndef SIMULATOR
     mpeg_stop_done = false;
@@ -2610,7 +2611,7 @@ void mpeg_stop(void)
     
 }
 
-void mpeg_pause(void)
+void audio_pause(void)
 {
 #ifndef SIMULATOR
     queue_post(&mpeg_queue, MPEG_PAUSE, NULL);
@@ -2621,7 +2622,7 @@ void mpeg_pause(void)
 #endif /* #ifndef SIMULATOR */
 }
 
-void mpeg_resume(void)
+void audio_resume(void)
 {
 #ifndef SIMULATOR
     queue_post(&mpeg_queue, MPEG_RESUME, NULL);
@@ -2632,7 +2633,7 @@ void mpeg_resume(void)
 #endif /* #ifndef SIMULATOR */
 }
 
-void mpeg_next(void)
+void audio_next(void)
 {
 #ifndef SIMULATOR
     queue_post(&mpeg_queue, MPEG_NEXT, NULL);
@@ -2660,7 +2661,7 @@ void mpeg_next(void)
 #endif /* #ifndef SIMULATOR */
 }
 
-void mpeg_prev(void)
+void audio_prev(void)
 {
 #ifndef SIMULATOR
     queue_post(&mpeg_queue, MPEG_PREV, NULL);
@@ -2687,7 +2688,7 @@ void mpeg_prev(void)
 #endif /* #ifndef SIMULATOR */
 }
 
-void mpeg_ff_rewind(int newtime)
+void audio_ff_rewind(int newtime)
 {
 #ifndef SIMULATOR
     queue_post(&mpeg_queue, MPEG_FF_REWIND, (void *)newtime);
@@ -2696,43 +2697,43 @@ void mpeg_ff_rewind(int newtime)
 #endif /* #ifndef SIMULATOR */
 }
 
-void mpeg_flush_and_reload_tracks(void)
+void audio_flush_and_reload_tracks(void)
 {
 #ifndef SIMULATOR
     queue_post(&mpeg_queue, MPEG_FLUSH_RELOAD, NULL);
 #endif /* #ifndef SIMULATOR*/
 }
 
-int mpeg_status(void)
+int audio_status(void)
 {
     int ret = 0;
 
     if(is_playing)
-        ret |= MPEG_STATUS_PLAY;
+        ret |= AUDIO_STATUS_PLAY;
 
     if(paused)
-        ret |= MPEG_STATUS_PAUSE;
+        ret |= AUDIO_STATUS_PAUSE;
     
 #if CONFIG_HWCODEC == MAS3587F
     if(is_recording && !is_prerecording)
-        ret |= MPEG_STATUS_RECORD;
+        ret |= AUDIO_STATUS_RECORD;
 
     if(is_prerecording)
-        ret |= MPEG_STATUS_PRERECORD;
+        ret |= AUDIO_STATUS_PRERECORD;
 #endif /* #if CONFIG_HWCODEC == MAS3587F */
 
     if(mpeg_errno)
-        ret |= MPEG_STATUS_ERROR;
+        ret |= AUDIO_STATUS_ERROR;
     
     return ret;
 }
 
-unsigned int mpeg_error(void)
+unsigned int audio_error(void)
 {
     return mpeg_errno;
 }
 
-void mpeg_error_clear(void)
+void audio_error_clear(void)
 {
     mpeg_errno = 0;
 }
@@ -2745,21 +2746,21 @@ static void mpeg_thread(void)
     struct mp3entry* id3;
     while ( 1 ) {
         if (is_playing) {
-            id3 = mpeg_current_track();
+            id3 = audio_current_track();
             if (!paused)
             {
                 id3->elapsed+=1000;
                 id3->offset+=1000;
             }
             if (id3->elapsed>=id3->length)
-                mpeg_next();
+                audio_next();
         }
         sleep(HZ);
     }
 }
 #endif /* #ifdef SIMULATOR */
 
-void mpeg_init(void)
+void audio_init(void)
 {
     mpeg_errno = 0;
 
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 71b0f08fff..9cfacad9b0 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -31,7 +31,7 @@
 #include "power.h"
 #include "button.h"
 #include "ata.h"
-#include "mpeg.h"
+#include "audio.h"
 #include "mp3_playback.h"
 #include "usb.h"
 #include "powermgmt.h"
@@ -343,7 +343,7 @@ static void battery_level_update(void)
 static void handle_auto_poweroff(void)
 {
     long timeout = poweroff_idle_timeout_value[poweroff_timeout]*60*HZ;
-    int  mpeg_stat = mpeg_status();
+    int  audio_stat = audio_status();
 
 #ifdef HAVE_CHARGING
     /*
@@ -360,8 +360,8 @@ static void handle_auto_poweroff(void)
        (radio_get_status() != FMRADIO_PLAYING) &&
 #endif
        !usb_inserted() &&
-       ((mpeg_stat == 0) ||
-        ((mpeg_stat == (MPEG_STATUS_PLAY | MPEG_STATUS_PAUSE)) &&
+       ((audio_stat == 0) ||
+        ((audio_stat == (AUDIO_STATUS_PLAY | AUDIO_STATUS_PAUSE)) &&
          !sleeptimer_active)))
     {
         if(TIME_AFTER(current_tick, last_event_tick    + timeout) &&
@@ -377,7 +377,7 @@ static void handle_auto_poweroff(void)
         {
             if(TIME_AFTER(current_tick, sleeptimer_endtick))
             {
-                mpeg_stop();
+                audio_stop();
 #ifdef HAVE_CHARGING
                 if((charger_input_state == CHARGER) ||
                    (charger_input_state == CHARGER_PLUGGED))
@@ -413,8 +413,8 @@ static void car_adapter_mode_processing(void)
 
         if (waiting_to_resume_play) {
             if (TIME_AFTER(current_tick, play_resume_time)) {
-                if (mpeg_status() & MPEG_STATUS_PAUSE) {
-                    mpeg_resume(); 
+                if (audio_status() & AUDIO_STATUS_PAUSE) {
+                    audio_resume(); 
                 }
                 waiting_to_resume_play = false;
             }
@@ -423,15 +423,15 @@ static void car_adapter_mode_processing(void)
                 /*
                  * Just got unplugged, pause if playing
                  */
-                if ((mpeg_status() & MPEG_STATUS_PLAY) &&
-                    !(mpeg_status() & MPEG_STATUS_PAUSE)) {
-                    mpeg_pause(); 
+                if ((audio_status() & AUDIO_STATUS_PLAY) &&
+                    !(audio_status() & AUDIO_STATUS_PAUSE)) {
+                    audio_pause(); 
                 }
             } else if(charger_input_state == CHARGER_PLUGGED) { 
                 /*
                  * Just got plugged in, delay & resume if we were playing
                  */
-                if (mpeg_status() & MPEG_STATUS_PAUSE) {
+                if (audio_status() & AUDIO_STATUS_PAUSE) {
                     /* delay resume a bit while the engine is cranking */
                     play_resume_time = current_tick + HZ*5;
                     waiting_to_resume_play = true;
@@ -920,7 +920,7 @@ void shutdown_hw(void)
         fd = -1;
     }
 #endif
-    mpeg_stop();
+    audio_stop();
     ata_flush();
     ata_spindown(1);
     while(ata_disk_is_active())
diff --git a/firmware/rolo.c b/firmware/rolo.c
index ceb70791cf..e2ef26b3aa 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -23,7 +23,7 @@
 #include "sprintf.h"
 #include "button.h"
 #include "file.h"
-#include "mpeg.h"
+#include "audio.h"
 #include "system.h"
 #include "i2c.h"
 #include "string.h"
@@ -101,7 +101,7 @@ int rolo_load(const char* filename)
     lcd_puts(0, 1, "Loading");
     lcd_update();
 
-    mpeg_stop();
+    audio_stop();
 
     fd = open(filename, O_RDONLY);
     if(-1 == fd) {