From b56104ab45cfd43ed4fc427f4fda7bb6dfb7440c Mon Sep 17 00:00:00 2001
From: Nicolas Pennequin <nicolas@nicolas-laptop.(none)>
Date: Thu, 11 Oct 2007 15:41:49 +0200
Subject: [PATCH] A bit of maintenance

---
 apps/playback.c | 52 ++++++++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/apps/playback.c b/apps/playback.c
index 156c03ee5..594df3886 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1839,6 +1839,7 @@ static void codec_discard_codec_callback(void)
     {
         bufclose(CUR_TI->codec_hid);
         CUR_TI->codec_hid = 0;
+        CUR_TI->codecsize = 0;
     }
 
 #if 0
@@ -2392,9 +2393,7 @@ static void audio_clear_track_entries(bool clear_unbuffered)
             last_idx = cur_idx;
         }
         else if (clear_unbuffered)
-        {
             clear_track_info(&tracks[cur_idx]);
-        }
     }
 
     /* We clear the previous instance of a buffered track throughout
@@ -2739,7 +2738,7 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
 {
     (void)rebuffer;
     char *trackname;
-    /* char msgbuf[80]; */
+    char msgbuf[80];
     int fd;
     int file_offset = 0;
     struct mp3entry id3;
@@ -2780,6 +2779,22 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
 
     tracks[track_widx].filesize = filesize(fd);
 
+    /* Set default values */
+    if (start_play)
+    {
+        int last_codec = current_codec;
+
+        set_current_codec(CODEC_IDX_AUDIO);
+        conf_watermark = AUDIO_DEFAULT_WATERMARK;
+        conf_filechunk = AUDIO_DEFAULT_FILECHUNK;
+        conf_preseek = AUDIO_REBUFFER_GUESS_SIZE;
+        dsp_configure(DSP_RESET, 0);
+        set_current_codec(last_codec);
+
+        track_changed = true;
+        playlist_update_resume_info(audio_current_track());
+    }
+
     /* Get track metadata if we don't already have it. */
     if (tracks[track_widx].id3_hid <= 0)
     {
@@ -2822,22 +2837,6 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
 
     close(fd);
 
-    /* Set default values */
-    if (start_play)
-    {
-        int last_codec = current_codec;
-
-        set_current_codec(CODEC_IDX_AUDIO);
-        conf_watermark = AUDIO_DEFAULT_WATERMARK;
-        conf_filechunk = AUDIO_DEFAULT_FILECHUNK;
-        conf_preseek = AUDIO_REBUFFER_GUESS_SIZE;
-        dsp_configure(DSP_RESET, 0);
-        set_current_codec(last_codec);
-
-        track_changed = true;
-        playlist_update_resume_info(audio_current_track());
-    }
-
 #if 0
     if (cuesheet_is_enabled() && tracks[track_widx].id3.cuesheet_type == 1)
     {
@@ -2858,13 +2857,6 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
     /* Load the codec. */
     if (!audio_loadcodec(start_play))
     {
-#if 0
-        /* Set filesize to zero to indicate no file was loaded. */
-        /* tracks[track_widx].filesize = 0;
-        tracks[track_widx].filerem = 0;
-        close(current_fd);
-        current_fd = -1; */
-
         if (tracks[track_widx].codecsize)
         {
             /* No space for codec on buffer, not an error */
@@ -2881,8 +2873,6 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
         playlist_skip_entry(NULL, last_peek_offset);
         tracks[track_widx].taginfo_ready = false;
         goto peek_again;
-#endif
-        return false;
     }
 
     struct mp3entry *track_id3;
@@ -2894,7 +2884,6 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
     else
         track_id3 = bufgetid3(tracks[track_widx].id3_hid);
 
-    /* tracks[track_widx].start_pos = 0; */
     set_filebuf_watermark(buffer_margin);
     track_id3->elapsed = 0;
 
@@ -2931,9 +2920,6 @@ static bool audio_load_track(int offset, bool start_play, bool rebuffer)
     }
 
     logf("alt:%s", trackname);
-    /* tracks[track_widx].buf_idx = buf_widx; */
-
-    //return audio_read_file(rebuffer);
 
     tracks[track_widx].audio_hid = bufopen(trackname, file_offset, TYPE_AUDIO);
 
@@ -3330,8 +3316,6 @@ static int audio_rebuffer_and_seek(size_t newpos)
 
     buf_ridx = RINGBUF_ADD(buf_ridx, real_preseek);
 
-    (void)newpos;
-    DEBUGF("/!\\ not implemented /!\\");
     LOGFQUEUE("audio >|= codec Q_CODEC_REQUEST_COMPLETE");
     return Q_CODEC_REQUEST_COMPLETE;
 }
-- 
2.11.4.GIT