summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2024-09-21 16:32:13 -0400
committerSolomon Peachy <pizza@shaftnet.org>2024-09-21 16:32:58 -0400
commit6ed8b9091c4abfec82f8c50be85ade79fae4ffb0 (patch)
treea0056ac34cf84fb879fe76055895b301fe284b9a /apps
parentbc56e9a9dc2ecfd5b9020f320a761454e1e9e3ba (diff)
downloadrockbox-6ed8b9091c4abfec82f8c50be85ade79fae4ffb0.tar.gz
rockbox-6ed8b9091c4abfec82f8c50be85ade79fae4ffb0.zip
Misc: Compiling under SDL2 uncovered a few issues unrelated to SDL itself
Change-Id: I625d5dd02d3f70bc6484a8641eafdaf13812f4a7
Diffstat (limited to 'apps')
-rw-r--r--apps/playback.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/playback.c b/apps/playback.c
index a284a1858d..9fe6da6d0e 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -58,6 +58,10 @@
58#include "pcm_mixer.h" 58#include "pcm_mixer.h"
59#endif 59#endif
60 60
61#ifdef SIMULATOR
62#include <strings.h>
63#endif
64
61/* TODO: The audio thread really is doing multitasking of acting like a 65/* TODO: The audio thread really is doing multitasking of acting like a
62 consumer and producer of tracks. It may be advantageous to better 66 consumer and producer of tracks. It may be advantageous to better
63 logically separate the two functions. I won't go that far just yet. */ 67 logically separate the two functions. I won't go that far just yet. */
@@ -1269,7 +1273,7 @@ static void playing_id3_sync(struct track_info *user_infop, struct audio_resume_
1269 } 1273 }
1270 id3->skip_resume_adjustments = skip_resume_adjustments; 1274 id3->skip_resume_adjustments = skip_resume_adjustments;
1271 } 1275 }
1272 1276
1273 id3_write(PLAYING_ID3, id3); 1277 id3_write(PLAYING_ID3, id3);
1274 1278
1275 if (!resume_info && id3) 1279 if (!resume_info && id3)
@@ -2761,7 +2765,7 @@ static void audio_on_codec_complete(int status)
2761 skip_pending = TRACK_SKIP_AUTO; 2765 skip_pending = TRACK_SKIP_AUTO;
2762 2766
2763 int id3_hid = 0; 2767 int id3_hid = 0;
2764 if (audio_can_change_track(&trackstat, &id3_hid)) 2768 if (audio_can_change_track(&trackstat, &id3_hid))
2765 { 2769 {
2766 audio_begin_track_change( 2770 audio_begin_track_change(
2767 single_mode_do_pause(id3_hid) 2771 single_mode_do_pause(id3_hid)
@@ -3243,7 +3247,7 @@ static void audio_on_ff_rewind(long time)
3243 bool finish_load = cur_info.audio_hid < 0; 3247 bool finish_load = cur_info.audio_hid < 0;
3244 if (finish_load) 3248 if (finish_load)
3245 { 3249 {
3246 // track is not yet loaded so simply update resume details for upcoming finish_load_track and quit 3250 // track is not yet loaded so simply update resume details for upcoming finish_load_track and quit
3247 playing_id3_sync(&cur_info, &(struct audio_resume_info){ time, 0 }, true); 3251 playing_id3_sync(&cur_info, &(struct audio_resume_info){ time, 0 }, true);
3248 return; 3252 return;
3249 } 3253 }