diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-04-25 08:21:10 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-04-25 08:21:10 +0000 |
| commit | 78c829f5766709b6b1cffa7ee24710d73cc3ac72 (patch) | |
| tree | 5fc27eedd803fe1c85532b2432cce76ee195a7c5 | |
| parent | e2ae4f3b4b9aa81720729d3d3703c65b6adbeaf4 (diff) | |
| download | rockbox-78c829f5766709b6b1cffa7ee24710d73cc3ac72.zip rockbox-78c829f5766709b6b1cffa7ee24710d73cc3ac72.tar.gz rockbox-78c829f5766709b6b1cffa7ee24710d73cc3ac72.tar.bz2 rockbox-78c829f5766709b6b1cffa7ee24710d73cc3ac72.tar.xz | |
Bad conditions for including mpeg_get_last_header()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6342 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugin.c | 2 | ||||
| -rw-r--r-- | apps/plugin.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index 2062c88..c1c561c 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -226,8 +226,8 @@ static const struct plugin_api rockbox_api = { audio_current_track, audio_flush_and_reload_tracks, audio_get_file_pos, - mpeg_get_last_header, #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) + mpeg_get_last_header, sound_set_pitch, #endif diff --git a/apps/plugin.h b/apps/plugin.h index 21d13db..5ffde6b 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -44,7 +44,9 @@ #include "mpeg.h" #include "audio.h" #include "mp3_playback.h" +#if (HWCODEC == MASNONE) #include "pcm_playback.h" +#endif #include "settings.h" #include "thread.h" #include "playlist.h" @@ -269,10 +271,8 @@ struct plugin_api { struct mp3entry* (*audio_current_track)(void); void (*audio_flush_and_reload_tracks)(void); int (*audio_get_file_pos)(void); -#if (CONFIG_HWCODEC == MAS3587F) - unsigned long (*mpeg_get_last_header)(void); -#endif #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) + unsigned long (*mpeg_get_last_header)(void); void (*sound_set_pitch)(int pitch); #endif |