diff --git a/resources/bgm/bgm.conf b/resources/bgm/bgm.conf deleted file mode 100644 index 2365abb1..00000000 --- a/resources/bgm/bgm.conf +++ /dev/null @@ -1,14 +0,0 @@ - -stage1 = Generic Stage 1 Theme -stage2 = Generic Stage 2 Theme -stage3 = Generic Stage 3 Theme -stage4 = Generic Stage 4 Theme -stage5 = Generic Stage 5 Theme -stage6 = Generic Stage 6 Theme - -stage1boss = Stage 1 Boss Theme -stage2boss = Stage 2 Boss Theme -stage3boss = Stage 3 Boss Theme -stage4boss = Stage 4 Boss Theme -stage5boss = Stage 5 Boss Theme -stage6boss = Stage 6 Boss Theme diff --git a/src/audio_common.c b/src/audio_common.c index 870de563..c4201b74 100644 --- a/src/audio_common.c +++ b/src/audio_common.c @@ -18,7 +18,6 @@ CurrentBGM current_bgm = { .name = NULL }; static char *saved_bgm; -static Hashtable *bgm_descriptions; static Hashtable *sfx_volumes; static struct enqueued_sound { @@ -197,7 +196,6 @@ static bool store_sfx_volume(const char *key, const char *val, void *data) { } static void load_config_files(void) { - bgm_descriptions = parse_keyvalue_file(BGM_PATH_PREFIX "bgm.conf"); sfx_volumes = hashtable_new_stringkeys(); parse_keyvalue_file_cb(SFX_PATH_PREFIX "volumes.conf", store_sfx_volume, sfx_volumes); } @@ -205,12 +203,7 @@ static void load_config_files(void) { static inline char* get_bgm_desc(char *name) { Music *music = get_music(name); assert(music != NULL); - - if(music->title) { - return music->title; - } - - return bgm_descriptions ? (char*)hashtable_get_string(bgm_descriptions, name) : NULL; + return music->title; } int get_default_sfx_volume(const char *sfx) { @@ -329,12 +322,6 @@ void audio_init(void) { void audio_shutdown(void) { audio_backend_shutdown(); - if(bgm_descriptions) { - hashtable_foreach(bgm_descriptions, hashtable_iter_free_data, NULL); - hashtable_free(bgm_descriptions); - bgm_descriptions = NULL; - } - if(sfx_volumes) { hashtable_free(sfx_volumes); sfx_volumes = NULL;