[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rockbox-cvs
Subject:    playback: Fix build with LOGF_ENABLE.
From:       gerrit () rockbox ! org
Date:       2013-11-10 11:39:03
Message-ID: 201311101139.rAABd3ZM007597 () giant ! haxx ! se
[Download RAW message or body]

commit 500b137308a6ee5c2aba873734a8956d70472f56
Author: Andrew Ryabinin <ryabinin.a.a@gmail.com>
Date:   Sun Nov 10 15:34:31 2013 +0400

    playback: Fix build with LOGF_ENABLE.
    
    Change-Id: I01154d4a9441f44852748c910c267419f7f4149e

diff --git a/apps/playback.c b/apps/playback.c
index a1db82e..b240e95 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1714,7 +1714,7 @@ static int audio_load_track(void)
             {
                 /* Haven't finished the metadata but the notification is
                    anticipated to come soon */
-                logf("%s(): in progress ok: %d". __func__, info->id3_hid);
+                logf("%s(): in progress ok: %d", __func__, info->id3_hid);
                 return LOAD_TRACK_OK;
             }
             else if (filling == STATE_FULL)
@@ -1722,7 +1722,7 @@ static int audio_load_track(void)
                 /* Buffer was full trying to complete the load after the
                    metadata finished, so attempt to continue - older handles
                    should have been cleared already */
-                logf("%s(): finishing load: %d". __func__, info->id3_hid);
+                logf("%s(): finishing load: %d", __func__, info->id3_hid);
                 filling = STATE_FILLING;
                 buffer_event_finished_callback(&info->id3_hid);
                 return LOAD_TRACK_OK;
@@ -1730,7 +1730,7 @@ static int audio_load_track(void)
         }
 
         /* Some old, stray buffering message */
-        logf("%s(): already in progress: %d". __func__, info->id3_hid);
+        logf("%s(): already in progress: %d", __func__, info->id3_hid);
         return LOAD_TRACK_ERR_BUSY;
     }
 
@@ -1929,7 +1929,7 @@ static int audio_finish_load_track(struct track_info *info)
         track_id3->offset = 0;
 
     logf("%s: set offset for %s to %lu\n", __func__,
-         id3->title, (unsigned long)offset);
+         track_id3->title, (unsigned long)track_id3->offset);
 
     /* Adjust for resume rewind so we know what to buffer - starting the codec
        calls it again, so we don't save it (and they shouldn't accumulate) */
@@ -2061,7 +2061,7 @@ static int audio_fill_file_buffer(void)
 static int audio_reset_and_rebuffer(
     enum track_clear_action action, int peek_offset)
 {
-    logf("Forcing rebuffer: 0x%X, %d", flags, peek_offset);
+    logf("Forcing rebuffer: 0x%X, %d", action, peek_offset);
 
     id3_write_locked(UNBUFFERED_ID3, NULL);
 
_______________________________________________
rockbox-cvs mailing list
rockbox-cvs@cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs
[prev in list] [next in list] [prev in thread] [next in thread]