refa Remove SDL2 mixer

5 files changed, 4 insertions, 40 deletions

diff --git a/src/blu_cat/int/core.cpp b/src/blu_cat/int/core.cpp
index 7e78b89..5b9e53b 100644
--- a/src/blu_cat/int/core.cpp
+++ b/src/blu_cat/int/core.cpp
@@ -80,42 +80,6 @@ unload_sdl(void *obj)
 }
 
 void
-load_sdl_mixer(void *obj)
-{
-	int flags = MIX_INIT_OGG|MIX_INIT_MOD;
-	int initted = Mix_Init(flags);
-	if(initted&flags != flags)
-	{
-		std::string error{"Could not initialize SDL mixer → "};
-		error += Mix_GetError();
-		throw CommandError{error};
-	}
-}
-
-void
-unload_sdl_mixer(void *obj)
-{
-	while(Mix_Init(0)) Mix_Quit();
-}
-
-void
-load_sdl_open_audio(void *obj)
-{
-	if(Mix_OpenAudio(22050, MIX_DEFAULT_FORMAT, 2, 1024) == -1)
-	{
-		std::string error{"Could not open SDL mixer audio → "};
-		error += Mix_GetError();
-		throw CommandError{error};
-	}
-}
-
-void
-unload_sdl_open_audio(void *obj)
-{
-	Mix_CloseAudio();
-}
-
-void
 load_window(void *obj)
 {
 	BluCat::INT::core.window = nullptr;
@@ -722,8 +686,6 @@ std::mt19937 random_number_generator;
 
 const CommandChain Core::loader{
 	{&load_sdl, &unload_sdl},
-	{&load_sdl_mixer, &unload_sdl_mixer},
-	{&load_sdl_open_audio, &unload_sdl_open_audio},
 	{&load_window, &unload_window},
 	{&load_vk_instance, &unload_vk_instance},
 	{&load_window_surface, &unload_window_surface},
diff --git a/src/blu_cat/int/core.hpp b/src/blu_cat/int/core.hpp
index a334dfa..c369e7b 100644
--- a/src/blu_cat/int/core.hpp
+++ b/src/blu_cat/int/core.hpp
@@ -34,7 +34,6 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_vulkan.h>
-#include <SDL2/SDL_mixer.h>
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/src/candy_gear/core.cpp b/src/candy_gear/core.cpp
index 0f5330c..16782fd 100644
--- a/src/candy_gear/core.cpp
+++ b/src/candy_gear/core.cpp
@@ -110,7 +110,6 @@ load_mruby_interface(void *obj)
   cg_skeletal_mesh_init(cg_core.mrb);
   cg_static_model_init(cg_core.mrb);
   cg_static_mesh_init(cg_core.mrb);
-  cg_sound_init(cg_core.mrb);
   cg_sprite_init(cg_core.mrb);
   cg_sprite_3d_init(cg_core.mrb);
   cg_texture_init(cg_core.mrb);
diff --git a/src/candy_gear/sound.cpp b/src/candy_gear/sound.cpp
index 0b3518f..3a3282b 100644
--- a/src/candy_gear/sound.cpp
+++ b/src/candy_gear/sound.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/*
 #include "sound.hpp"
 
 void
@@ -71,3 +72,5 @@ cg_sound_init(mrb_state *mrb)
     mrb, cg_cSound, "initialize", cg_cSound_initialize, MRB_ARGS_REQ(1));
   mrb_define_method(mrb, cg_cSound, "play", cg_cSound_play, MRB_ARGS_NONE());
 }
+
+*/
diff --git a/src/candy_gear/sound.hpp b/src/candy_gear/sound.hpp
index 2f483e3..ad8c47f 100644
--- a/src/candy_gear/sound.hpp
+++ b/src/candy_gear/sound.hpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+/*
 #ifndef CANDY_GEAR_SOUND_H
 #define CANDY_GEAR_SOUND_H 1