Commit FS#12069 - Playback rework - first stages. Gives as thorough as possible a treatment of codec management, track change and metadata logic as possible while maintaining fairly narrow focus and not rewriting everything all at once. Please see the rockbox-dev mail archive on 2011-04-25 (Playback engine rework) for a more thorough manifest of what was addressed. Plugins and codecs become incompatible.

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

1 files changed, 28 insertions, 26 deletions

diff --git a/apps/codecs/aiff_enc.c b/apps/codecs/aiff_enc.c
index 69496f70ac..fc44196eb0 100644
--- a/apps/codecs/aiff_enc.c
+++ b/apps/codecs/aiff_enc.c
@@ -359,40 +359,42 @@ static bool init_encoder(void)
     return true;
 } /* init_encoder */
 
-/* main codec entry point */
-enum codec_status codec_main(void)
+/* this is the codec entry point */
+enum codec_status codec_main(enum codec_entry_call_reason reason)
 {
-    if (!init_encoder())
-        return CODEC_ERROR;
+    if (reason == CODEC_LOAD) {
+        if (!init_encoder())
+            return CODEC_ERROR;
+    }
+    else if (reason == CODEC_UNLOAD) {
+        /* reset parameters to initial state */
+        ci->enc_set_parameters(NULL);
+    }
 
+    return CODEC_OK;
+}
+
+/* this is called for each file to process */
+enum codec_status codec_run(void)
+{
     /* main encoding loop */
-    while(!ci->stop_codec)
+    while (ci->get_command(NULL) != CODEC_ACTION_HALT)
     {
-        uint32_t *src;
+        uint32_t *src = (uint32_t *)ci->enc_get_pcm_data(PCM_CHUNK_SIZE);
+        struct enc_chunk_hdr *chunk;
 
-        while ((src = (uint32_t *)ci->enc_get_pcm_data(PCM_CHUNK_SIZE)) != NULL)
-        {
-            struct enc_chunk_hdr *chunk;
-
-            if (ci->stop_codec)
-                break;
+        if (src == NULL)
+            continue;
 
-            chunk           = ci->enc_get_chunk();
-            chunk->enc_size = enc_size;
-            chunk->num_pcm  = PCM_SAMP_PER_CHUNK;
-            chunk->enc_data = ENC_CHUNK_SKIP_HDR(chunk->enc_data, chunk);
+        chunk           = ci->enc_get_chunk();
+        chunk->enc_size = enc_size;
+        chunk->num_pcm  = PCM_SAMP_PER_CHUNK;
+        chunk->enc_data = ENC_CHUNK_SKIP_HDR(chunk->enc_data, chunk);
 
-            chunk_to_aiff_format(src, (uint32_t *)chunk->enc_data);
-
-            ci->enc_finish_chunk();
-            ci->yield();
-        }
+        chunk_to_aiff_format(src, (uint32_t *)chunk->enc_data);
 
-        ci->yield();
+        ci->enc_finish_chunk();
     }
 
-    /* reset parameters to initial state */
-    ci->enc_set_parameters(NULL);
- 
     return CODEC_OK;
-} /* codec_start */
+}