2 files changed, 19 insertions, 1 deletions

diff --git a/apps/plugins/sdl/src/audio/SDL_audio.c b/apps/plugins/sdl/src/audio/SDL_audio.c
index 9c0feeddfc..f2a2e59323 100644
--- a/apps/plugins/sdl/src/audio/SDL_audio.c
+++ b/apps/plugins/sdl/src/audio/SDL_audio.c
@@ -204,6 +204,7 @@ int SDLCALL SDL_RunAudio(void *audiop)
 
                 /* Convert the audio if necessary */
                 if ( audio->convert.needed ) {
+                    LOGF("RB AUDIO: converting audio. Will be slow!");
                         SDL_ConvertAudio(&audio->convert);
                         stream = audio->GetAudioBuf(audio);
                         if ( stream == NULL ) {
diff --git a/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c b/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c
index 78334303af..cb72687d48 100644
--- a/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c
+++ b/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c
@@ -225,12 +225,29 @@ static void ROCKBOXAUD_CloseAudio(_THIS)
     rb->pcm_set_frequency(HW_SAMPR_DEFAULT);
 }
 
+static bool freq_ok(unsigned int freq)
+{
+    for(int i = 0; i < SAMPR_NUM_FREQ; i++)
+    {
+        if(rb->hw_freq_sampr[i] == freq)
+            return true;
+    }
+    return false;
+}
+
 static int ROCKBOXAUD_OpenAudio(_THIS, SDL_AudioSpec *spec)
 {
     /* change to our format */
     spec->format = AUDIO_S16SYS;
     spec->channels = 2;
-    spec->freq = RB_SAMPR;
+
+    if(!freq_ok(spec->freq))
+    {
+        rb->splashf(HZ, "Warning: Unsupported audio rate. Defaulting to %d Hz", RB_SAMPR);
+
+        // switch to default
+        spec->freq = RB_SAMPR;
+    }
 
     /* we've changed it */
     SDL_CalculateAudioSpec(spec);