[Widelands-cvs] widelands/src files.cc,1.26,1.27 filesystem.h,1.12,1.13 sound_handler.h,1.25,1.26

[Florian W. <be...@us...>]

Update of /cvsroot/widelands/widelands/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22629/src

Modified Files:
	files.cc filesystem.h sound_handler.h 
Log Message:
- WLApplication patch #10/12:
  A few lines of const and doc


Index: sound_handler.h
===================================================================
RCS file: /cvsroot/widelands/widelands/src/sound_handler.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sound_handler.h	21 Apr 2006 18:56:23 -0000	1.25
+++ sound_handler.h	29 Apr 2006 19:05:17 -0000	1.26
@@ -153,10 +153,6 @@
  * sound servers like gstreamer, EsounD or aRts. For the moment (and probably
  * forever), the only backend supported is SDL_mixer.
  *
- * The Sound_Handler is (obviously) a singleton object and is therefore stored
- * in a global variable \ref g_sound_handler to be easily accessible by other
- * classes.
- *
  * \par Music
  *
  * Background music for different situations (e.g. 'Menu', 'Gameplay') is
@@ -185,7 +181,9 @@
  * any name you want. All audio files below sound/ingame_01 will be played as
  * ingame music.
  *
- * \note You should only be using the ogg format for music.
+ * For more information about the naming scheme, see \ref load_fx()
+ *
+ * You should be using the ogg format for music.
  *
  * \par Sound effects
  *
@@ -202,8 +200,6 @@
  * building/worker \e animation. For more information about this look at class
  * \ref AnimationManager.
  *
- * \note You should only be using the ogg format for sound effects.
- *
  * \par Usage of callbacks
  *
  * SDL_mixer's way to notify the application of important sound events, e.g.
@@ -233,7 +229,7 @@
  *
  * The only way around that resctriction is to send an SDL event(SDL_USEREVENT)
  * from the callback (non-sound SDL functions \e can be used). Then, later,
- * the main event loop (system.cc) will process this event \e but \e not in
+ * the main event loop will process this event \e but \e not in
  * SDL_mixer's context, so locking is no problem.
  *
  * Yes, that's just a tad ugly.
@@ -262,7 +258,6 @@
  *
  * \todo Describe priorities
  * \todo Describe play-or-not algo
- * \todo Internationalized sound effects/music
  * \todo Environmental sound effects (e.g. wind)
  * \todo repair and reenable animation sound effects for 1-pic-animations
  * \todo accomodate runtime changes of i18n language

Index: files.cc
===================================================================
RCS file: /cvsroot/widelands/widelands/src/files.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- files.cc	29 Apr 2006 18:52:23 -0000	1.26
+++ files.cc	29 Apr 2006 19:05:17 -0000	1.27
@@ -1408,7 +1408,7 @@
  * \todo is exename still neccessary, now that BINDIR can be seen from config.h?
  *       same question for slash/backslash detection, it's trivial with scons
 */
-static std::string getexename(const char **argv)
+static const std::string getexename(const char **argv)
 {
 	static const char* const s_selfptr = "/proc/self/exe";
 	char buf[PATH_MAX]="";
@@ -1430,8 +1430,7 @@
 	return std::string(buf, ret);
 }
 
-/** void setup_searchpaths(int argc, char **argv)
- *
+/**
  * Sets the filelocators default searchpaths (partly OS specific)
  */
 void setup_searchpaths(const int argc, const char **argv)

Index: filesystem.h
===================================================================
RCS file: /cvsroot/widelands/widelands/src/filesystem.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- filesystem.h	29 Apr 2006 18:52:23 -0000	1.12
+++ filesystem.h	29 Apr 2006 19:05:17 -0000	1.13
@@ -44,7 +44,7 @@
 bool FS_CanonicalizeName(char *buf, int bufsize, const char *path);
 const char *FS_Filename(const char* buf);
 
-void setup_searchpaths(int argc, const char **argv);
+void setup_searchpaths(const int argc, const char **argv);
 
 /**
 FileSystem is a base class representing certain filesystem operations.