devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Misc: Compiling under SDL2 uncovered a few issues unrelated to SDL itself

Browse source 
Change-Id: I625d5dd02d3f70bc6484a8641eafdaf13812f4a7
This commit is contained in:
Solomon Peachy 2024-09-21 16:32:13 -04:00
parent bc56e9a9dc
commit 6ed8b9091c
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/playback.c
View file

@ -58,6 +58,10 @@
#include "pcm_mixer.h" #include "pcm_mixer.h"
#endif #endif
#ifdef SIMULATOR
#include <strings.h>
#endif
/* TODO: The audio thread really is doing multitasking of acting like a /* TODO: The audio thread really is doing multitasking of acting like a
consumer and producer of tracks. It may be advantageous to better consumer and producer of tracks. It may be advantageous to better
logically separate the two functions. I won't go that far just yet. */ 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_
} }
id3->skip_resume_adjustments = skip_resume_adjustments; id3->skip_resume_adjustments = skip_resume_adjustments;
} }
id3_write(PLAYING_ID3, id3); id3_write(PLAYING_ID3, id3);
if (!resume_info && id3) if (!resume_info && id3)
@ -2761,7 +2765,7 @@ static void audio_on_codec_complete(int status)
skip_pending = TRACK_SKIP_AUTO; skip_pending = TRACK_SKIP_AUTO;
int id3_hid = 0; int id3_hid = 0;
if (audio_can_change_track(&trackstat, &id3_hid)) if (audio_can_change_track(&trackstat, &id3_hid))
{ {
audio_begin_track_change( audio_begin_track_change(
single_mode_do_pause(id3_hid) single_mode_do_pause(id3_hid)
@ -3243,7 +3247,7 @@ static void audio_on_ff_rewind(long time)
bool finish_load = cur_info.audio_hid < 0; bool finish_load = cur_info.audio_hid < 0;
if (finish_load) if (finish_load)
{ {
// track is not yet loaded so simply update resume details for upcoming finish_load_track and quit // track is not yet loaded so simply update resume details for upcoming finish_load_track and quit
playing_id3_sync(&cur_info, &(struct audio_resume_info){ time, 0 }, true); playing_id3_sync(&cur_info, &(struct audio_resume_info){ time, 0 }, true);
return; return;
} }

4
firmware/asm/thread.h
View file

@ -46,7 +46,9 @@ struct regs
* give a decent amount of space and hope for the best... * give a decent amount of space and hope for the best...
* FIXME: this isn't a great solution. */ * FIXME: this isn't a great solution. */
#undef MINSIGSTKSZ #undef MINSIGSTKSZ
#define MINSIGSTKSZ 16384 #endif
#ifndef MINSIGSTKSZ
#define MINSIGSTKSZ 16384
#endif #endif
/* MINSIGSTKSZ for the OS to deliver the signal + 0x3000 for us */ /* MINSIGSTKSZ for the OS to deliver the signal + 0x3000 for us */
#define DEFAULT_STACK_SIZE (MINSIGSTKSZ+0x3000) /* Bytes */ #define DEFAULT_STACK_SIZE (MINSIGSTKSZ+0x3000) /* Bytes */

2
firmware/include/string-extra.h
View file

@ -30,7 +30,7 @@
#include "memset16.h" #include "memset16.h"
#if defined(WIN32) || defined(APPLICATION) \ #if defined(WIN32) || defined(APPLICATION) \
|| defined(__PCTOOL__) || defined(__PCTOOL__) || defined(SIMULATOR)
#ifndef mempcpy #ifndef mempcpy
#define mempcpy __builtin_mempcpy #define mempcpy __builtin_mempcpy
#endif #endif