From 9576851f5037ab047f2c73722e182665794d116a Mon Sep 17 00:00:00 2001
From: pingflood
Date: Wed, 15 Jan 2020 17:29:37 -0300
Subject: Fix ogg player

---
 hcl/data/midi/allclear.ogg | Bin 106894 -> 95118 bytes
 hcl/data/midi/boss.ogg     | Bin 1743448 -> 1638895 bytes
 hcl/data/midi/clear.ogg    | Bin 56760 -> 47108 bytes
 hcl/data/midi/ending.ogg   | Bin 468616 -> 402196 bytes
 hcl/data/midi/gameover.ogg | Bin 101272 -> 81667 bytes
 hcl/data/midi/init.ogg     | Bin 7711 -> 7728 bytes
 hcl/data/midi/lastboss.ogg | Bin 1946650 -> 1646477 bytes
 hcl/data/midi/main01.ogg   | Bin 3157303 -> 2887049 bytes
 hcl/data/midi/main02.ogg   | Bin 2933863 -> 2486037 bytes
 hcl/data/midi/main03.ogg   | Bin 3239523 -> 2924833 bytes
 hcl/data/midi/main04.ogg   | Bin 2298544 -> 2075257 bytes
 hcl/data/midi/main05.ogg   | Bin 1690990 -> 1515280 bytes
 hcl/data/midi/main06.ogg   | Bin 3386710 -> 2998701 bytes
 hcl/data/midi/nazo.ogg     | Bin 38778 -> 38588 bytes
 hcl/data/midi/start.ogg    | Bin 40773 -> 36655 bytes
 src/sdl/audio.c            |  13 ++++---------
 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
Binary files a/hcl/data/midi/allclear.ogg and b/hcl/data/midi/allclear.ogg differ
diff --git a/hcl/data/midi/boss.ogg b/hcl/data/midi/boss.ogg
index 1ae66a5..0b2b4bc 100644
Binary files a/hcl/data/midi/boss.ogg and b/hcl/data/midi/boss.ogg differ
diff --git a/hcl/data/midi/clear.ogg b/hcl/data/midi/clear.ogg
index 3654893..20f4d25 100644
Binary files a/hcl/data/midi/clear.ogg and b/hcl/data/midi/clear.ogg differ
diff --git a/hcl/data/midi/ending.ogg b/hcl/data/midi/ending.ogg
index dbde529..5025c71 100644
Binary files a/hcl/data/midi/ending.ogg and b/hcl/data/midi/ending.ogg differ
diff --git a/hcl/data/midi/gameover.ogg b/hcl/data/midi/gameover.ogg
index bd66e46..b13a8ff 100644
Binary files a/hcl/data/midi/gameover.ogg and b/hcl/data/midi/gameover.ogg differ
diff --git a/hcl/data/midi/init.ogg b/hcl/data/midi/init.ogg
index 6b94f26..b5db5dd 100644
Binary files a/hcl/data/midi/init.ogg and b/hcl/data/midi/init.ogg differ
diff --git a/hcl/data/midi/lastboss.ogg b/hcl/data/midi/lastboss.ogg
index d2d72a8..b865ae6 100644
Binary files a/hcl/data/midi/lastboss.ogg and b/hcl/data/midi/lastboss.ogg differ
diff --git a/hcl/data/midi/main01.ogg b/hcl/data/midi/main01.ogg
index 32f8ce8..ba5f1f1 100644
Binary files a/hcl/data/midi/main01.ogg and b/hcl/data/midi/main01.ogg differ
diff --git a/hcl/data/midi/main02.ogg b/hcl/data/midi/main02.ogg
index f8cf58a..fc18373 100644
Binary files a/hcl/data/midi/main02.ogg and b/hcl/data/midi/main02.ogg differ
diff --git a/hcl/data/midi/main03.ogg b/hcl/data/midi/main03.ogg
index e0001d0..9b2a42c 100644
Binary files a/hcl/data/midi/main03.ogg and b/hcl/data/midi/main03.ogg differ
diff --git a/hcl/data/midi/main04.ogg b/hcl/data/midi/main04.ogg
index 44cd8c7..c379822 100644
Binary files a/hcl/data/midi/main04.ogg and b/hcl/data/midi/main04.ogg differ
diff --git a/hcl/data/midi/main05.ogg b/hcl/data/midi/main05.ogg
index d650fbe..e962cb8 100644
Binary files a/hcl/data/midi/main05.ogg and b/hcl/data/midi/main05.ogg differ
diff --git a/hcl/data/midi/main06.ogg b/hcl/data/midi/main06.ogg
index 84acdab..6dadc23 100644
Binary files a/hcl/data/midi/main06.ogg and b/hcl/data/midi/main06.ogg differ
diff --git a/hcl/data/midi/nazo.ogg b/hcl/data/midi/nazo.ogg
index 7c8a913..49c7186 100644
Binary files a/hcl/data/midi/nazo.ogg and b/hcl/data/midi/nazo.ogg differ
diff --git a/hcl/data/midi/start.ogg b/hcl/data/midi/start.ogg
index 38b5d72..e6a1091 100644
Binary files a/hcl/data/midi/start.ogg and b/hcl/data/midi/start.ogg differ
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)
-- 
cgit v1.2.3