Fixed|Music: Expand symbols in the soundfont path

skyjake · Apr 6, 2013 · 9746e60 · 9746e60
1 parent dfc642e
commit 9746e60
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/doomsday/api/api_audiod.h b/doomsday/api/api_audiod.h
@@ -64,7 +64,7 @@ typedef struct audiodriver_s {
     int (*Init) (void);
     void (*Shutdown) (void);
     void (*Event) (int type);
-    int (*Set) (int prop, const void* ptr);
+    int (*Set) (int prop, void const *ptr);
 } audiodriver_t;
 
 typedef struct audiointerface_base_s {

diff --git a/doomsday/client/include/audio/audiodriver_music.h b/doomsday/client/include/audio/audiodriver_music.h
@@ -36,7 +36,7 @@
 extern "C" {
 #endif
 
-void AudioDriver_Music_Set(int property, void* ptr);
+void AudioDriver_Music_Set(int property, void const *ptr);
 
 int AudioDriver_Music_PlayNativeFile(const char* fileName, boolean looped);
 

diff --git a/doomsday/client/src/audio/audiodriver_music.cpp b/doomsday/client/src/audio/audiodriver_music.cpp
@@ -40,7 +40,7 @@ static AutoStr *composeBufferedMusicFilename(int id, char const *ext)
     return Str_Appendf(AutoStr_NewStd(), "%s%i", BUFFERED_MUSIC_FILE, id);
 }
 
-static void musicSet(audiointerface_music_t *iMusic, int property, void *ptr)
+static void musicSet(audiointerface_music_t *iMusic, int property, void const *ptr)
 {
     audiodriver_t *d = AudioDriver_Interface(iMusic);
     if(!d || !d->Set) return;
@@ -140,7 +140,7 @@ AutoStr *AudioDriver_Music_ComposeTempBufferFilename(char const *ext)
     return composeBufferedMusicFilename(currentBufFile, ext);
 }
 
-void AudioDriver_Music_Set(int property, void *ptr)
+void AudioDriver_Music_Set(int property, void const *ptr)
 {
     void *ifs[MAX_AUDIO_INTERFACES];
     int i, count = AudioDriver_FindInterfaces(AUDIO_IMUSIC, ifs);

diff --git a/doomsday/client/src/audio/s_mus.cpp b/doomsday/client/src/audio/s_mus.cpp
@@ -109,7 +109,8 @@ boolean Mus_Init(void)
     }
 
     // Tell the audio driver about our soundfont config.
-    AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME, soundFontPath);
+    AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME,
+                          de::NativePath(soundFontPath).expand().toString().toLatin1().constData());
 
     musAvail = true;
     return true;
@@ -447,7 +448,8 @@ int Mus_Start(ded_music_t* def, boolean looped)
 
 static void Mus_UpdateSoundFont(void)
 {
-    AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME, (void*)Con_GetString("music-soundfont"));
+    AudioDriver_Music_Set(AUDIOP_SOUNDFONT_FILENAME,
+        de::NativePath(Con_GetString("music-soundfont")).expand().toString().toLatin1().constData());
 }
 
 /**