[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/sound slot_manager.cxx, 1.2, 1.3 slot
From: |
Ingo Ruhnke |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/sound slot_manager.cxx, 1.2, 1.3 slot_manager.hxx, 1.2, 1.3 sound.cxx, 1.6, 1.7 sound.hxx, 1.3, 1.4 sound_dummy.hxx, 1.2, 1.3 sound_real.cxx, 1.10, 1.11 sound_real.hxx, 1.3, 1.4 sound_res_mgr.cxx, 1.4, 1.5 sounds.hxx, 1.2, 1.3 |
Date: |
Tue, 21 Oct 2003 13:01:54 +0200 |
Update of /var/lib/cvs/Games/Pingus/src/sound
In directory dark:/tmp/cvs-serv31821/sound
Modified Files:
slot_manager.cxx slot_manager.hxx sound.cxx sound.hxx
sound_dummy.hxx sound_real.cxx sound_real.hxx
sound_res_mgr.cxx sounds.hxx
Log Message:
- bunch of misc changes
Index: slot_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/slot_manager.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slot_manager.cxx 19 Apr 2003 10:23:19 -0000 1.2
+++ slot_manager.cxx 21 Oct 2003 11:01:52 -0000 1.3
@@ -19,7 +19,11 @@
#include "slot_manager.hxx"
-SlotEntry& find_slot(const std::string& name)
+namespace Pingus {
+namespace Sound {
+
+SlotEntry&
+SlotManager::find_slot(const std::string& name)
{
}
@@ -45,4 +49,7 @@
sess.play();
}
+} // namespace Sound
+} // namespace Pingus
+
/* EOF */
Index: slot_manager.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/slot_manager.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- slot_manager.hxx 19 Apr 2003 10:23:19 -0000 1.2
+++ slot_manager.hxx 21 Oct 2003 11:01:52 -0000 1.3
@@ -20,6 +20,7 @@
#ifndef HEADER_PINGUS_SLOT_MANAGER_HXX
#define HEADER_PINGUS_SLOT_MANAGER_HXX
+namespace Pingus {
namespace Sound {
struct SlotEntry
@@ -58,6 +59,7 @@
};
} // namespace Sound
+} // namespace Pingus
#endif
Index: sound.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/sound.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- sound.cxx 20 Oct 2003 19:28:55 -0000 1.6
+++ sound.cxx 21 Oct 2003 11:01:52 -0000 1.7
@@ -26,11 +26,10 @@
#include "sound_real.hxx"
namespace Pingus {
+namespace Sound {
PingusSound* PingusSound::sound;
-using namespace Sound;
-
void
PingusSound::init (PingusSound* s)
{
@@ -124,6 +123,7 @@
sound->real_stop_music();
}
+} // namespace Sound
} // namespace Pingus
/* EOF */
Index: sound.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/sound.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound.hxx 19 Apr 2003 10:23:19 -0000 1.3
+++ sound.hxx 21 Oct 2003 11:01:52 -0000 1.4
@@ -23,6 +23,8 @@
#include <string>
#include "sounds.hxx"
+namespace Pingus {
+namespace Sound {
class PingusSound
{
protected:
@@ -57,6 +59,9 @@
PingusSound& operator= (const PingusSound&);
};
+} // namespace Sound
+} // namespace Pingus
+
#endif
/* EOF */
Index: sound_dummy.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/sound_dummy.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sound_dummy.hxx 19 Apr 2003 10:23:19 -0000 1.2
+++ sound_dummy.hxx 21 Oct 2003 11:01:52 -0000 1.3
@@ -22,6 +22,7 @@
#include "sound.hxx"
+namespace Pingus {
namespace Sound {
class PingusSoundDummy : public PingusSound
@@ -38,6 +39,7 @@
};
} // namespace Sound
+} // namespace Pingus
#endif
Index: sound_real.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/sound_real.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- sound_real.cxx 19 Oct 2003 12:25:47 -0000 1.10
+++ sound_real.cxx 21 Oct 2003 11:01:52 -0000 1.11
@@ -146,7 +146,9 @@
}
else if (filename.substr(filename.size()-4, 4) == ".wav")
{
+#ifdef CLANLIB_0_6
music_sample = new CL_SoundBuffer (new CL_Sample(filename.c_str(),
NULL), true);
+#endif
}
else
{ // MikMod should support the rest...
Index: sound_real.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/sound_real.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sound_real.hxx 19 Apr 2003 10:23:19 -0000 1.3
+++ sound_real.hxx 21 Oct 2003 11:01:52 -0000 1.4
@@ -28,6 +28,7 @@
class CL_SoundBuffer;
class CL_SoundBuffer_Session;
+namespace Pingus {
namespace Sound {
/** A simple wrapper class around SDL_Mixer, it will init itself
@@ -67,6 +68,7 @@
};
} // namespace Sound
+} // namespace Pingus
#endif
Index: sound_res_mgr.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/sound_res_mgr.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound_res_mgr.cxx 19 Oct 2003 12:25:47 -0000 1.4
+++ sound_res_mgr.cxx 21 Oct 2003 11:01:52 -0000 1.5
@@ -35,7 +35,7 @@
if (i == sound_map.end())
{
std::string filename = path_manager.complete("sounds/" + name + ".wav");
- CL_SoundBuffer* buffer = new CL_SoundBuffer (new CL_Sample(filename,
NULL), true);
+ CL_SoundBuffer* buffer = new CL_SoundBuffer (filename, true);
pout(PINGUS_DEBUG_LOADING) << "SoundResMgr: Loading sound from disk: "
<< name << " -> " << filename << std::endl;
Index: sounds.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/sound/sounds.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sounds.hxx 19 Apr 2003 10:23:19 -0000 1.2
+++ sounds.hxx 21 Oct 2003 11:01:52 -0000 1.3
@@ -22,8 +22,9 @@
#include "../pingus.hxx"
-namespace Sound
-{
+namespace Pingus {
+namespace Sound {
+
enum Name {
DIGGER,
PLOP,
@@ -31,7 +32,9 @@
OHNO,
TICK
};
-}
+
+} // namespace Sound
+} // namespace Pingus
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/sound slot_manager.cxx, 1.2, 1.3 slot_manager.hxx, 1.2, 1.3 sound.cxx, 1.6, 1.7 sound.hxx, 1.3, 1.4 sound_dummy.hxx, 1.2, 1.3 sound_real.cxx, 1.10, 1.11 sound_real.hxx, 1.3, 1.4 sound_res_mgr.cxx, 1.4, 1.5 sounds.hxx, 1.2, 1.3,
Ingo Ruhnke <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/particles snow_particle_holder.cxx, 1.8, 1.9
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.155, 1.156 action_button.cxx, 1.34, 1.35 action_button.hxx, 1.19, 1.20 action_holder.cxx, 1.13, 1.14 alpha_button.cxx, 1.6, 1.7 alpha_button.hxx, 1.7, 1.8 blitter.cxx, 1.32, 1.33 blitter_impl.hxx, 1.14, 1.15 button_panel.cxx, 1.26, 1.27 button_panel.hxx, 1.19, 1.20 capture_rectangle.cxx, 1.15, 1.16 capture_rectangle.hxx, 1.8, 1.9 client.cxx, 1.49, 1.50 client.hxx, 1.29, 1.30 col_map.cxx, 1.21, 1.22 col_map.hxx, 1.13, 1.14 console.cxx, 1.17, 1.18 credits.cxx, 1.40, 1.41 exit_menu.cxx, 1.22, 1.23 fade_out.cxx, 1.10, 1.11 fps_counter.hxx, 1.8, 1.9 global_event.cxx, 1.12, 1.13 globals.cxx, 1.16, 1.17 hurry_up.hxx, 1.9, 1.10 indexed_canvas.hxx, 1.5, 1.6 loading.cxx, 1.8, 1.9 menu_button.cxx, 1.13, 1.14 multiline_text.cxx, 1.8, 1.9 multiline_text.hxx, 1.7, 1.8 pingu.cxx, 1.44, 1.45 pingu_map.cxx, 1.9, 1.10 pingu_map.hxx, 1.7, 1.8 pingus_counter.hxx, 1.12, 1.13 pingus_counter_bar.cxx, 1.9, 1.10 pingus_map_manager.cxx, 1.5, 1.6 pingus_menu_manager.cxx, 1.27, 1.28 pingus_resource.cxx, 1.30, 1.31 pingus_resource.hxx, 1.18, 1.19 playfield.cxx, 1.37, 1.38 playfield_view.cxx, 1.5, 1.6 savegame.hxx, 1.5, 1.6 theme_selector.cxx, 1.14, 1.15 theme_selector.hxx, 1.8, 1.9 time_display.cxx, 1.17, 1.18 time_display.hxx, 1.12, 1.13 world.cxx, 1.46, 1.47
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/particles snow_particle_holder.cxx, 1.8, 1.9
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src Makefile.am, 1.155, 1.156 action_button.cxx, 1.34, 1.35 action_button.hxx, 1.19, 1.20 action_holder.cxx, 1.13, 1.14 alpha_button.cxx, 1.6, 1.7 alpha_button.hxx, 1.7, 1.8 blitter.cxx, 1.32, 1.33 blitter_impl.hxx, 1.14, 1.15 button_panel.cxx, 1.26, 1.27 button_panel.hxx, 1.19, 1.20 capture_rectangle.cxx, 1.15, 1.16 capture_rectangle.hxx, 1.8, 1.9 client.cxx, 1.49, 1.50 client.hxx, 1.29, 1.30 col_map.cxx, 1.21, 1.22 col_map.hxx, 1.13, 1.14 console.cxx, 1.17, 1.18 credits.cxx, 1.40, 1.41 exit_menu.cxx, 1.22, 1.23 fade_out.cxx, 1.10, 1.11 fps_counter.hxx, 1.8, 1.9 global_event.cxx, 1.12, 1.13 globals.cxx, 1.16, 1.17 hurry_up.hxx, 1.9, 1.10 indexed_canvas.hxx, 1.5, 1.6 loading.cxx, 1.8, 1.9 menu_button.cxx, 1.13, 1.14 multiline_text.cxx, 1.8, 1.9 multiline_text.hxx, 1.7, 1.8 pingu.cxx, 1.44, 1.45 pingu_map.cxx, 1.9, 1.10 pingu_map.hxx, 1.7, 1.8 pingus_counter.hxx, 1.12, 1.13 pingus_counter_bar.cxx, 1.9, 1.10 pingus_map_manager.cxx, 1.5, 1.6 pingus_menu_manager.cxx, 1.27, 1.28 pingus_resource.cxx, 1.30, 1.31 pingus_resource.hxx, 1.18, 1.19 playfield.cxx, 1.37, 1.38 playfield_view.cxx, 1.5, 1.6 savegame.hxx, 1.5, 1.6 theme_selector.cxx, 1.14, 1.15 theme_selector.hxx, 1.8, 1.9 time_display.cxx, 1.17, 1.18 time_display.hxx, 1.12, 1.13 world.cxx, 1.46, 1.47
- Index(es):