Fix ogg player

16 files changed, 4 insertions, 9 deletions

diff --git a/hcl/data/midi/allclear.ogg b/hcl/data/midi/allclear.ogg
index 5965bed..b27e52d 100644
--- a/hcl/data/midi/allclear.ogg
+++ b/hcl/data/midi/allclear.ogg
diff --git a/hcl/data/midi/boss.ogg b/hcl/data/midi/boss.ogg
index 1ae66a5..0b2b4bc 100644
--- a/hcl/data/midi/boss.ogg
+++ b/hcl/data/midi/boss.ogg
diff --git a/hcl/data/midi/clear.ogg b/hcl/data/midi/clear.ogg
index 3654893..20f4d25 100644
--- a/hcl/data/midi/clear.ogg
+++ b/hcl/data/midi/clear.ogg
diff --git a/hcl/data/midi/ending.ogg b/hcl/data/midi/ending.ogg
index dbde529..5025c71 100644
--- a/hcl/data/midi/ending.ogg
+++ b/hcl/data/midi/ending.ogg
diff --git a/hcl/data/midi/gameover.ogg b/hcl/data/midi/gameover.ogg
index bd66e46..b13a8ff 100644
--- a/hcl/data/midi/gameover.ogg
+++ b/hcl/data/midi/gameover.ogg
diff --git a/hcl/data/midi/init.ogg b/hcl/data/midi/init.ogg
index 6b94f26..b5db5dd 100644
--- a/hcl/data/midi/init.ogg
+++ b/hcl/data/midi/init.ogg
diff --git a/hcl/data/midi/lastboss.ogg b/hcl/data/midi/lastboss.ogg
index d2d72a8..b865ae6 100644
--- a/hcl/data/midi/lastboss.ogg
+++ b/hcl/data/midi/lastboss.ogg
diff --git a/hcl/data/midi/main01.ogg b/hcl/data/midi/main01.ogg
index 32f8ce8..ba5f1f1 100644
--- a/hcl/data/midi/main01.ogg
+++ b/hcl/data/midi/main01.ogg
diff --git a/hcl/data/midi/main02.ogg b/hcl/data/midi/main02.ogg
index f8cf58a..fc18373 100644
--- a/hcl/data/midi/main02.ogg
+++ b/hcl/data/midi/main02.ogg
diff --git a/hcl/data/midi/main03.ogg b/hcl/data/midi/main03.ogg
index e0001d0..9b2a42c 100644
--- a/hcl/data/midi/main03.ogg
+++ b/hcl/data/midi/main03.ogg
diff --git a/hcl/data/midi/main04.ogg b/hcl/data/midi/main04.ogg
index 44cd8c7..c379822 100644
--- a/hcl/data/midi/main04.ogg
+++ b/hcl/data/midi/main04.ogg
diff --git a/hcl/data/midi/main05.ogg b/hcl/data/midi/main05.ogg
index d650fbe..e962cb8 100644
--- a/hcl/data/midi/main05.ogg
+++ b/hcl/data/midi/main05.ogg
diff --git a/hcl/data/midi/main06.ogg b/hcl/data/midi/main06.ogg
index 84acdab..6dadc23 100644
--- a/hcl/data/midi/main06.ogg
+++ b/hcl/data/midi/main06.ogg
diff --git a/hcl/data/midi/nazo.ogg b/hcl/data/midi/nazo.ogg
index 7c8a913..49c7186 100644
--- a/hcl/data/midi/nazo.ogg
+++ b/hcl/data/midi/nazo.ogg
diff --git a/hcl/data/midi/start.ogg b/hcl/data/midi/start.ogg
index 38b5d72..e6a1091 100644
--- a/hcl/data/midi/start.ogg
+++ b/hcl/data/midi/start.ogg
diff --git a/src/sdl/audio.c b/src/sdl/audio.c
index 20b036d..ec09050 100644
--- a/src/sdl/audio.c
+++ b/src/sdl/audio.c
@@ -7,9 +7,7 @@ void PHL_AudioInit()
 {
     SDL_InitSubSystem(SDL_INIT_AUDIO);
     Mix_Init(0);
-    Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 4096);
-
-    PHL_MusicVolume(0.25f * music_volume);
+    Mix_OpenAudio(44100, MIX_DEFAULT_FORMAT, 2, 1024);
 }
 
 void PHL_AudioClose()
@@ -24,9 +22,7 @@ PHL_Music PHL_LoadMusic(char* fname, int loop)
     PHL_Music ret;
     ret.loop = loop;
     char buff[4096];
-    strcpy(buff, "data/");
-    strcat(buff, fname);
-    strcat(buff, ".ogg");
+    sprintf(buff, "data/%s.ogg", fname);
     ret.snd = Mix_LoadMUS(buff);
     return ret;
 }
@@ -34,8 +30,7 @@ PHL_Music PHL_LoadMusic(char* fname, int loop)
 PHL_Sound PHL_LoadSound(char* fname)
 {
     char buff[4096];
-    strcpy(buff, "data/");
-    strcat(buff, fname);
+    sprintf(buff, "data/%s", fname);
     return Mix_LoadWAV(buff);
 }
 
@@ -47,7 +42,7 @@ void PHL_MusicVolume(float vol)
 void PHL_PlayMusic(PHL_Music snd)
 {
     if(snd.snd)
-        Mix_PlayMusic(snd.snd, snd.loop?-1:0);
+        Mix_PlayMusic(snd.snd, snd.loop ? -1 : 0);
 }
 
 void PHL_PlaySound(PHL_Sound snd, int channel)