Resync

Author: inactive123

audio/audio_mixer.c

@@ -61,6 +61,15 @@
 #include <ibxm/ibxm.h>
 #endif
 
+#ifdef HAVE_THREADS
+#include <rthreads/rthreads.h>
+#define AUDIO_MIXER_LOCK(voice)   slock_lock(voice->lock)
+#define AUDIO_MIXER_UNLOCK(voice) slock_unlock(voice->lock)
+#else
+#define AUDIO_MIXER_LOCK(voice)   do {} while(0)
+#define AUDIO_MIXER_UNLOCK(voice) do {} while(0)
+#endif
+
 #define AUDIO_MIXER_MAX_VOICES      8
 #define AUDIO_MIXER_TEMP_BUFFER 8192
 
@@ -183,6 +192,9 @@ struct audio_mixer_voice
    unsigned type;
    float    volume;
    bool     repeat;
+#ifdef HAVE_THREADS
+   slock_t *lock;
+#endif
 };
 
 /* TODO/FIXME - static globals */
@@ -312,15 +324,33 @@ void audio_mixer_init(unsigned rate)
    s_rate = rate;
 
    for (i = 0; i < AUDIO_MIXER_MAX_VOICES; i++)
-      s_voices[i].type = AUDIO_MIXER_TYPE_NONE;
+   {
+      audio_mixer_voice_t *voice = &s_voices[i];
+
+      voice->type = AUDIO_MIXER_TYPE_NONE;
+#ifdef HAVE_THREADS
+      if (!voice->lock)
+         voice->lock = slock_new();
+#endif
+   }
 }
 
 void audio_mixer_done(void)
 {
    unsigned i;
 
    for (i = 0; i < AUDIO_MIXER_MAX_VOICES; i++)
-      audio_mixer_release(&s_voices[i]);
+   {
+      audio_mixer_voice_t *voice = &s_voices[i];
+
+      AUDIO_MIXER_LOCK(voice);
+      audio_mixer_release(voice);
+      AUDIO_MIXER_UNLOCK(voice);
+#ifdef HAVE_THREADS
+      slock_free(voice->lock);
+      voice->lock = NULL;
+#endif
+   }
 }
 
 audio_mixer_sound_t* audio_mixer_load_wav(void *buffer, int32_t size,
@@ -837,6 +867,14 @@ audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound,
       if (voice->type != AUDIO_MIXER_TYPE_NONE)
          continue;
 
+      AUDIO_MIXER_LOCK(voice);
+
+      if (voice->type != AUDIO_MIXER_TYPE_NONE)
+      {
+         AUDIO_MIXER_UNLOCK(voice);
+         continue;
+      }
+
       /* claim the voice, also helps with cleanup on error */
       voice->type = sound->type;
 
@@ -881,16 +919,22 @@ audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound,
       voice->volume   = volume;
       voice->sound    = sound;
       voice->stop_cb  = stop_cb;
+      AUDIO_MIXER_UNLOCK(voice);
    }
    else
    {
-      audio_mixer_release(voice);
+      if(i < AUDIO_MIXER_MAX_VOICES)
+      {
+         audio_mixer_release(voice);
+         AUDIO_MIXER_UNLOCK(voice);
+      }
       voice = NULL;
    }
 
    return voice;
 }
 
+/* Need to hold lock for voice.  */
 static void audio_mixer_release(audio_mixer_voice_t* voice)
 {
    if (!voice)
@@ -933,11 +977,14 @@ void audio_mixer_stop(audio_mixer_voice_t* voice)
 
    if (voice)
    {
+      AUDIO_MIXER_LOCK(voice);
       stop_cb     = voice->stop_cb;
       sound       = voice->sound;
 
       audio_mixer_release(voice);
 
+      AUDIO_MIXER_UNLOCK(voice);
+
       if (stop_cb)
          stop_cb(sound, AUDIO_MIXER_SOUND_STOPPED);
    }
@@ -1287,7 +1334,11 @@ void audio_mixer_mix(float* buffer, size_t num_frames,
 
    for (i = 0; i < AUDIO_MIXER_MAX_VOICES; i++, voice++)
    {
-      float volume = (override) ? volume_override : voice->volume;
+      float volume;
+
+      AUDIO_MIXER_LOCK(voice);
+
+      volume = (override) ? volume_override : voice->volume;
 
       switch (voice->type)
       {
@@ -1317,6 +1368,8 @@ void audio_mixer_mix(float* buffer, size_t num_frames,
          case AUDIO_MIXER_TYPE_NONE:
             break;
       }
+
+      AUDIO_MIXER_UNLOCK(voice);
    }
 
    for (j = 0, sample = buffer; j < num_frames * 2; j++, sample++)
@@ -1341,5 +1394,7 @@ void audio_mixer_voice_set_volume(audio_mixer_voice_t *voice, float val)
    if (!voice)
       return;
 
+   AUDIO_MIXER_LOCK(voice);
    voice->volume = val;
+   AUDIO_MIXER_UNLOCK(voice);
 }

include/libretro.h

@@ -287,7 +287,8 @@ enum retro_language
    RETRO_LANGUAGE_SWEDISH             = 25,
    RETRO_LANGUAGE_UKRAINIAN           = 26,
    RETRO_LANGUAGE_CZECH               = 27,
-   RETRO_LANGUAGE_VALENCIAN           = 28,
+   RETRO_LANGUAGE_CATALAN_VALENCIA    = 28,
+   RETRO_LANGUAGE_CATALAN             = 29,
    RETRO_LANGUAGE_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */

include/string/stdstring.h

@@ -282,6 +282,9 @@ int string_index_last_occurance(char str[], char t);
 /* Find the position of a substring in a string. */
 int string_find_index_substring_string(const char* str1, const char* str2);
 
+/* Strips non-ASCII characters from a string. */
+void string_copy_only_ascii(char *str_stripped, const char* str);
+
 RETRO_END_DECLS
 
 #endif

libco/x86.c

@@ -41,11 +41,7 @@ static unsigned char co_swap_function[] = {
   0xff, 0xe0,         /* jmp eax            */
 };
 
-#if defined(__DJGPP__)
-static void co_init(void)
-{
-}
-#elif defined(_WIN32)
+#ifdef _WIN32
 #include <windows.h>
 
 static void co_init(void)

string/stdstring.c

@@ -630,3 +630,24 @@ int string_find_index_substring_string(const char* str1, const char* str2)
 
    return -1;
 }
+
+/* Strips non-ASCII characters from a string. */
+void string_copy_only_ascii(char *str_stripped, const char* str)
+{
+   if (!string_is_empty(str))
+   {
+      unsigned i = 0;
+      unsigned j = 0;
+
+      for (i = 0; i < strlen(str); i++)
+      {
+         if (str[i] > 0x1F && str[i] < 0x80)
+         {
+            str_stripped[j] = str[i];
+            j++;
+         }
+      }
+
+      str_stripped[j] = '\0';
+   }
+}