2 files changed, 4 insertions, 2 deletions

diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index 56c2a799ec..a2248c6437 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -91,6 +91,7 @@ next_track:
     sound_samples_done = ci->id3->offset;
 
     ci->configure(DSP_SET_FREQUENCY, (long *)(rb->id3->frequency));
+    codec_set_replaygain(rb->id3);
 
     stream_create(&input_stream,ci);
 
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index 06c81544cd..d65cdb7129 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -75,10 +75,11 @@ enum codec_status codec_start(struct codec_api* api)
     goto exit;
   }
 
-  while (!rb->taginfo_ready)
-    rb->yield();
+  while (!*ci->taginfo_ready && !ci->stop_codec)
+    ci->sleep(1);
   
   ci->configure(DSP_SET_FREQUENCY, (long *)(rb->id3->frequency));
+  codec_set_replaygain(rb->id3);
 
   stream_create(&input_stream,ci);