[Pingus-CVS] CVS: Games/Pingus/src Makefile.am,1.122,1.123 config.cxx,1.8,1.9 pingus_main.cxx,1.37,1.38 sound_real.hxx,1.7,1.8 theme.cxx,1.9,1.10 audio.cxx,1.1,NONE audio.hxx,1.3,NONE message_box.cxx,1.2,NONE message_box.hxx,1.5,NONE music_provider.cxx,1.3,NONE music_provider.hxx,1.4,NONE

[grumbel]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv1429

Modified Files:
        Makefile.am config.cxx pingus_main.cxx sound_real.hxx 
        theme.cxx 
Removed Files:
        audio.cxx audio.hxx message_box.cxx message_box.hxx 
        music_provider.cxx music_provider.hxx 
Log Message:
- removed some old cruft


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/Makefile.am,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- Makefile.am 8 Nov 2002 01:38:27 -0000       1.122
+++ Makefile.am 1 Dec 2002 17:08:47 -0000       1.123
@@ -84,8 +84,6 @@
 algo.hxx \
 alpha_button.cxx \
 alpha_button.hxx \
-audio.cxx \
-audio.hxx \
 blitter.cxx \
 blitter.hxx \
 blitter_impl.hxx \
@@ -187,12 +185,8 @@
 math.hxx \
 menu_background.cxx \
 menu_background.hxx \
-message_box.cxx \
-message_box.hxx \
 multiline_text.cxx \
 multiline_text.hxx \
-music_provider.cxx \
-music_provider.hxx \
 my_gettext.hxx \
 option_menu.cxx \
 option_menu.hxx \

Index: config.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/config.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- config.cxx  27 Nov 2002 20:05:42 -0000      1.8
+++ config.cxx  1 Dec 2002 17:08:47 -0000       1.9
@@ -21,7 +21,6 @@
 #include <iostream>
 
 #include "globals.hxx"
-#include "audio.hxx"
 #include "pingus_error.hxx"
 #include "config.hxx"
 
@@ -371,25 +370,6 @@
   else if (valueid == "music")
     {
       music_enabled = str_to_bool(value);
-    }
-  else if (valueid == "audio-format")
-    {
-      if (value == "8")
-       pingus_audio_format = AUDIO_S8;
-      else
-       pingus_audio_format = AUDIO_S16;
-    }
-  else if (valueid == "audio-rate")
-    {
-      pingus_audio_rate = str_to_int(value);
-    }
-  else if (valueid == "audio-channels")
-    {
-      pingus_audio_buffers = str_to_int(value);      
-    }
-  else if (valueid == "audio-buffers")
-    {
-      pingus_audio_buffers = str_to_int(value);
     }
   else if (valueid == "swcursor-enabled")
     {

Index: pingus_main.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/pingus_main.cxx,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- pingus_main.cxx     8 Nov 2002 01:38:27 -0000       1.37
+++ pingus_main.cxx     1 Dec 2002 17:08:47 -0000       1.38
@@ -70,8 +70,6 @@
 #include "config_xml.hxx"
 #include "console.hxx"
 #include "fps_counter.hxx"
-#include "message_box.hxx"
-#include "audio.hxx"
 #include "game_session.hxx"
 #include "demo_session.hxx"
 #include "debug.hxx"
@@ -238,14 +236,6 @@
       {"maintainer-mode", no_argument,       0, 134},
       {"disable-auto-scrolling",   no_argument,       0, 137},
 
-#ifdef HAVE_LIBSDL_MIXER
-      // Sound stuff
-      {"audio-format",     required_argument, 0, 138},
-      {"audio-rate",       required_argument, 0, 139},
-      {"audio-channels",   required_argument, 0, 140},
-      {"audio-buffers",    required_argument, 0, 141},
-#endif
-
       // 
       {"no-cfg-file",    no_argument,       0, 142},
       {"tile-size",      required_argument, 0, 144},
@@ -413,26 +403,6 @@
     case 137:
       auto_scrolling = false;
       break;
-#ifdef HAVE_LIBSDL_MIXER
-    case 138:
-      if (strcmp(optarg, "8") == 0)
-       pingus_audio_format = AUDIO_S8;
-      else
-       pingus_audio_format = AUDIO_S16;
-      break;
-
-    case 139:
-      sscanf(optarg, "%d", &pingus_audio_rate);
-      break;
-      
-    case 140:
-      sscanf(optarg, "%d", &pingus_audio_channels);
-      break; 
-      
-    case 141:
-      sscanf(optarg, "%d", &pingus_audio_buffers);
-      break;
-#endif
     case 142: // --no-cfg-file
       // Nothing, since that is handled in quick_check_args()
       break;
@@ -592,17 +562,11 @@
           "   -r, --record-demo FILE   Record a demo session to FILE\n"
           "   -p, --play-demo FILE     Plays a demo session from FILE\n")
                 << std::endl;
-#ifdef HAVE_LIBSDL_MIXER
-      std::cout <<
-       _("\nSound:\n"
-          "   -s, --enable-sound       Enable sound\n"
-          "   -m, --enable-music       Enable music\n"
-          "   --audio-format {8,16}    Number of bits (default: 16)\n"
-          "   --audio-rate INT         Audio rate in Hz (default: 44000)\n"
-          "   --audio-channels {1,2}   Mono(1) or Stereo(2) output (default: 
2)\n"
-          "   --audio-buffers INT      Audio buffer (default: 4096)\n")
-                << std::endl;
-#endif
+      std::cout
+        << _("\nSound:\n"
+             "   -s, --enable-sound       Enable sound\n"
+             "   -m, --enable-music       Enable music\n")
+        << std::endl;
       exit(EXIT_SUCCESS);
       break;
     }

Index: sound_real.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/sound_real.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sound_real.hxx      2 Nov 2002 22:10:52 -0000       1.7
+++ sound_real.hxx      1 Dec 2002 17:08:47 -0000       1.8
@@ -24,7 +24,6 @@
 
 #include <map>
 #include <vector>
-#include "audio.hxx"
 #include "sound.hxx"
 
 class CL_SoundBuffer;

Index: theme.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/theme.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- theme.cxx   12 Oct 2002 00:49:10 -0000      1.9
+++ theme.cxx   1 Dec 2002 17:08:47 -0000       1.10
@@ -30,7 +30,6 @@
 #include "pingus_resource.hxx"
 #include "pingus_error.hxx"
 #include "game_session.hxx"
-#include "message_box.hxx"
 #include "globals.hxx"
 #include "theme.hxx"
 #include "xml_plf.hxx"
@@ -279,9 +278,7 @@
 
   catch (PingusError& err) 
     {
-      std::string str = "Pingus_Error: ";
-      str += err.get_message ();
-      PingusMessageBox box(str);
+      std::cout <<  "Pingus_Error: " << err.get_message () << std::endl;
     }
 
   // Wait for escape release

--- audio.cxx DELETED ---

--- audio.hxx DELETED ---

--- message_box.cxx DELETED ---

--- message_box.hxx DELETED ---

--- music_provider.cxx DELETED ---

--- music_provider.hxx DELETED ---