More audio code restructuring, mostly renaming functions so far

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

1 files changed, 0 insertions, 56 deletions

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