Enforce that codecs wait for their metadata in a proper-ish and consistent manner. Sort of a halfway patch; best would be to give them an internal copy of the current track information which lasts unaltered by playback until a track switch or unload.

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

2 files changed, 14 insertions, 0 deletions

diff --git a/apps/codecs/lib/codeclib.c b/apps/codecs/lib/codeclib.c
index 5af4e01fff..af0894c498 100644
--- a/apps/codecs/lib/codeclib.c
+++ b/apps/codecs/lib/codeclib.c
@@ -49,6 +49,19 @@ void codec_set_replaygain(struct mp3entry* id3)
     ci->configure(DSP_SET_ALBUM_PEAK, id3->album_peak);
 }
 
+/* Note: codec really needs its own private metdata copy for the current
+   track being processed in order to be stable. */
+int codec_wait_taginfo(void)
+{
+    while (!*ci->taginfo_ready && !ci->stop_codec && !ci->new_track)
+        ci->sleep(0);
+    if (ci->stop_codec)
+        return -1;
+    if (ci->new_track)
+        return 1;
+    return 0;
+}
+
 /* Various "helper functions" common to all the xxx2wav decoder plugins  */
 
 
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h
index b7685ebbcb..41b466ed1f 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/apps/codecs/lib/codeclib.h
@@ -157,6 +157,7 @@ static inline unsigned int bs_generic(unsigned int v, int mode)
 
 int codec_init(void);
 void codec_set_replaygain(struct mp3entry* id3);
+int codec_wait_taginfo(void); /* 0 = success */
 
 #ifdef RB_PROFILE
 void __cyg_profile_func_enter(void *this_fn, void *call_site)