summaryrefslogtreecommitdiff
path: root/apps/playback.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/playback.c')
-rw-r--r--apps/playback.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/apps/playback.c b/apps/playback.c
index daa9ab3f2e..ee1993a2da 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -822,7 +822,7 @@ void audio_set_crossfade(int enable)
822 { 822 {
823 /* Store the track resume position */ 823 /* Store the track resume position */
824 offset = curtrack_id3.offset; 824 offset = curtrack_id3.offset;
825 gui_syncsplash(0, str(LANG_RESTARTING_PLAYBACK)); 825 splash(0, str(LANG_RESTARTING_PLAYBACK));
826 } 826 }
827 827
828 /* Blast it - audio buffer will have to be setup again next time 828 /* Blast it - audio buffer will have to be setup again next time
@@ -1334,7 +1334,7 @@ static void codec_thread(void)
1334 if (!ci.new_track) 1334 if (!ci.new_track)
1335 { 1335 {
1336 logf("Codec failure"); 1336 logf("Codec failure");
1337 gui_syncsplash(HZ*2, "Codec failure"); 1337 splash(HZ*2, "Codec failure");
1338 } 1338 }
1339 1339
1340 if (!codec_load_next_track()) 1340 if (!codec_load_next_track())
@@ -1395,7 +1395,7 @@ static void codec_thread(void)
1395 break; 1395 break;
1396 1396
1397 logf("Encoder failure"); 1397 logf("Encoder failure");
1398 gui_syncsplash(HZ*2, "Encoder failure"); 1398 splash(HZ*2, "Encoder failure");
1399 1399
1400 if (ci.enc_codec_loaded < 0) 1400 if (ci.enc_codec_loaded < 0)
1401 break; 1401 break;
@@ -1717,7 +1717,6 @@ static bool audio_load_track(size_t offset, bool start_play)
1717 buffering_handle_finished_callback callback. */ 1717 buffering_handle_finished_callback callback. */
1718static void audio_finish_load_track(void) 1718static void audio_finish_load_track(void)
1719{ 1719{
1720 char msgbuf[80];
1721 size_t file_offset = 0; 1720 size_t file_offset = 0;
1722 size_t offset = 0; 1721 size_t offset = 0;
1723 bool start_play = start_play_g; 1722 bool start_play = start_play_g;
@@ -1791,9 +1790,8 @@ static void audio_finish_load_track(void)
1791 1790
1792 /* This is an error condition, either no codec was found, or reading 1791 /* This is an error condition, either no codec was found, or reading
1793 * the codec file failed part way through, either way, skip the track */ 1792 * the codec file failed part way through, either way, skip the track */
1794 snprintf(msgbuf, sizeof(msgbuf)-1, "No codec for: %s", track_id3->path); 1793 /* FIXME: We should not use splashf from audio thread! */
1795 /* We should not use gui_syncplash from audio thread! */ 1794 splashf(HZ*2, "No codec for: %s", track_id3->path);
1796 gui_syncsplash(HZ*2, msgbuf);
1797 /* Skip invalid entry from playlist. */ 1795 /* Skip invalid entry from playlist. */
1798 playlist_skip_entry(NULL, last_peek_offset); 1796 playlist_skip_entry(NULL, last_peek_offset);
1799 return; 1797 return;