sound: move sound/music configuration to sound driver

[flatwaifu.git] / src / sdl / main.c

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 1c16dc33307100048c40af58c3a38ee2060b7319..057c82ec2123842550a3ab41bf69df1e14b86aed 100644 (file)
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -62,8 +62,7 @@ static const cfg_t arg[] = {
   {"file", NULL, Y_FILES},
   {"cheat", &cheat, Y_SW_ON},
 //  {"vga", &shot_vga, Y_SW_ON},
-  {"sndvol", &snd_vol, Y_WORD},
-  {"musvol", &mus_vol, Y_WORD},
+//  {"musvol", &mus_vol, Y_WORD},
   {"mon", &nomon, Y_SW_OFF},
   {"warp", &_warp, Y_BYTE},
 //  {"config", NULL, cfg_file, Y_STRING},
@@ -72,11 +71,10 @@ static const cfg_t arg[] = {
 
 static const cfg_t cfg[] = {
 //  {"screenshot", &shot_vga, Y_SW_ON},
-  {"sound_volume", &snd_vol, Y_WORD},
-  {"music_volume", &mus_vol, Y_WORD},
-  {"music_random", &music_random, Y_SW_ON},
-  {"music_time", &music_time, Y_DWORD},
-  {"music_fade", &music_fade, Y_DWORD},
+//  {"music_volume", &mus_vol, Y_WORD},
+//  {"music_random", &music_random, Y_SW_ON},
+//  {"music_time", &music_time, Y_DWORD},
+//  {"music_fade", &music_fade, Y_DWORD},
   {"pl1_left", &pl1.kl, Y_KEY},
   {"pl1_right",&pl1.kr, Y_KEY},
   {"pl1_up", &pl1.ku, Y_KEY},
@@ -99,19 +97,19 @@ static const cfg_t cfg[] = {
 };
 
 static void CFG_args (int argc, char **argv) {
-  const cfg_t *list[] = { arg, R_args() };
-  ARG_parse(argc, argv, 2, list);
+  const cfg_t *list[] = { arg, R_args(), S_args(), MUS_args() };
+  ARG_parse(argc, argv, 4, list);
 }
 
 static void CFG_load (void) {
-  const cfg_t *list[] = { cfg, R_conf() };
-  CFG_read_config("default.cfg", 2, list);
-  CFG_read_config("doom2d.cfg", 2, list);
+  const cfg_t *list[] = { cfg, R_conf(), S_conf(), MUS_conf() };
+  CFG_read_config("default.cfg", 4, list);
+  CFG_read_config("doom2d.cfg", 4, list);
 }
 
 static void CFG_save (void) {
-  const cfg_t *list[] = { cfg, R_conf() };
-  CFG_update_config("doom2d.cfg", "doom2d.cfg", 2, list, "generated by doom2d, do not modify");
+  const cfg_t *list[] = { cfg, R_conf(), S_conf(), MUS_conf() };
+  CFG_update_config("doom2d.cfg", "doom2d.cfg", 4, list, "generated by doom2d, do not modify");
 }
 
 /* --- error.h --- */
@@ -140,8 +138,8 @@ void ERR_failinit (char *s, ...) {
 void ERR_fatal (char *s, ...) {
   va_list ap;
   R_done();
+  MUS_done();
   S_done();
-  S_donemusic();
   M_shutdown();
   SDL_Quit();
   puts("\nКРИТИЧЕСКАЯ ОШИБКА:");
@@ -481,7 +479,7 @@ static void poll_events (void) {
 
 static void step (void) {
   poll_events();
-  S_updatemusic();
+  MUS_update();
   Uint32 t = SDL_GetTicks();
   if (t - ticks > DELAY) {
     ticks = t;
@@ -536,7 +534,7 @@ int main (int argc, char *argv[]) {
   M_startup();
   F_allocres();
   S_init();
-  S_initmusic();
+  MUS_init();
   R_init();
   G_init();
   ticks = SDL_GetTicks();
@@ -549,7 +547,7 @@ int main (int argc, char *argv[]) {
 #endif
   CFG_save();
   R_done();
-  S_donemusic();
+  MUS_done();
   S_done();
   M_shutdown();
   SDL_Quit();