[Stratagus-CVS] stratagus/src include/sound.h include/sound_id....

[Jimmy Salmon]

CVSROOT:        /cvsroot/stratagus
Module name:    stratagus
Branch:         
Changes by:     Jimmy Salmon <address@hidden>   03/12/01 12:22:18

Modified files:
        src/include    : sound.h sound_id.h sound_server.h 
        src/sound      : music.c sound_id.c sound_server.c 

Log message:
        PlayFile, MakeSound, and RegisterSound take consts

Patches:
Index: stratagus/src/include/sound.h
diff -u stratagus/src/include/sound.h:1.49 stratagus/src/include/sound.h:1.50
--- stratagus/src/include/sound.h:1.49  Fri Nov  7 16:21:13 2003
+++ stratagus/src/include/sound.h       Mon Dec  1 12:22:16 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: sound.h,v 1.49 2003/11/07 21:21:13 jsalmon3 Exp $
+//     $Id: sound.h,v 1.50 2003/12/01 17:22:16 jsalmon3 Exp $
 
 #ifndef __SOUND_H__
 #define __SOUND_H__
@@ -148,7 +148,7 @@
 extern void PlaySectionMusic(PlaySectionType section);
 
     /// Play a sample file
-extern void PlayFile(char* name);
+extern void PlayFile(const char* name);
     /// Play a music file
 extern int PlayMusic(const char* name);
     /// Stop music playing
Index: stratagus/src/include/sound_id.h
diff -u stratagus/src/include/sound_id.h:1.17 
stratagus/src/include/sound_id.h:1.18
--- stratagus/src/include/sound_id.h:1.17       Fri Jul 11 10:35:30 2003
+++ stratagus/src/include/sound_id.h    Mon Dec  1 12:22:17 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: sound_id.h,v 1.17 2003/07/11 14:35:30 n0body Exp $
+//     $Id: sound_id.h,v 1.18 2003/12/01 17:22:17 jsalmon3 Exp $
 
 #ifndef __SOUND_ID_H__
 #define __SOUND_ID_H__
@@ -54,7 +54,7 @@
 ----------------------------------------------------------------------------*/
 
     /// Make a sound bound to identifier
-extern SoundId MakeSound(const char* sound_name,char* file[], int nb);
+extern SoundId MakeSound(const char* sound_name,const char* file[], int nb);
     /// Get the sound id bound to an identifier
 extern SoundId SoundIdForName(const char* sound_name);
     /// Map sound to identifier
Index: stratagus/src/include/sound_server.h
diff -u stratagus/src/include/sound_server.h:1.63 
stratagus/src/include/sound_server.h:1.64
--- stratagus/src/include/sound_server.h:1.63   Fri Nov 14 02:23:40 2003
+++ stratagus/src/include/sound_server.h        Mon Dec  1 12:22:17 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: sound_server.h,v 1.63 2003/11/14 07:23:40 mr-russ Exp $
+//     $Id: sound_server.h,v 1.64 2003/12/01 17:22:17 jsalmon3 Exp $
 
 #ifndef __SOUND_SERVER_H__
 #define __SOUND_SERVER_H__
@@ -266,7 +266,7 @@
     int bitrate, int channels, int bytes);
 
     ///        Register a sound (can be a simple sound or a group)
-extern SoundId RegisterSound(char* file[],unsigned number);
+extern SoundId RegisterSound(const char* file[],unsigned number);
 
     /**
     ** Ask the sound server to put together two sounds to form a special sound.
Index: stratagus/src/sound/music.c
diff -u stratagus/src/sound/music.c:1.83 stratagus/src/sound/music.c:1.84
--- stratagus/src/sound/music.c:1.83    Fri Oct 31 16:56:29 2003
+++ stratagus/src/sound/music.c Mon Dec  1 12:22:17 2003
@@ -26,7 +26,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: music.c,v 1.83 2003/10/31 21:56:29 jsalmon3 Exp $
+//     $Id: music.c,v 1.84 2003/12/01 17:22:17 jsalmon3 Exp $
 
 //@{
 
@@ -413,7 +413,7 @@
 **
 **     @param name     Name of sound file
 */
-global void PlayFile(char* name)
+global void PlayFile(const char* name)
 {
     SoundId id;
     if (SoundIdForName("dynamic-sound")) {
Index: stratagus/src/sound/sound_id.c
diff -u stratagus/src/sound/sound_id.c:1.20 stratagus/src/sound/sound_id.c:1.21
--- stratagus/src/sound/sound_id.c:1.20 Wed Oct  1 19:56:21 2003
+++ stratagus/src/sound/sound_id.c      Mon Dec  1 12:22:18 2003
@@ -20,7 +20,7 @@
 //     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //     GNU General Public License for more details.
 //
-//     $Id: sound_id.c,v 1.20 2003/10/01 23:56:21 jsalmon3 Exp $
+//     $Id: sound_id.c,v 1.21 2003/12/01 17:22:18 jsalmon3 Exp $
 
 //@{
 
@@ -134,7 +134,7 @@
 **
 **     @return the sound id of the created group
 */
-global SoundId MakeSound(const char* name, char* file[], int nb)
+global SoundId MakeSound(const char* name, const char* file[], int nb)
 {
     SoundId id;
     const SoundId* result;
Index: stratagus/src/sound/sound_server.c
diff -u stratagus/src/sound/sound_server.c:1.126 
stratagus/src/sound/sound_server.c:1.127
--- stratagus/src/sound/sound_server.c:1.126    Wed Nov 12 15:26:52 2003
+++ stratagus/src/sound/sound_server.c  Mon Dec  1 12:22:18 2003
@@ -27,7 +27,7 @@
 //      Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //      02111-1307, USA.
 //
-//     $Id: sound_server.c,v 1.126 2003/11/12 20:26:52 jsalmon3 Exp $
+//     $Id: sound_server.c,v 1.127 2003/12/01 17:22:18 jsalmon3 Exp $
 
 //@{
 
@@ -898,7 +898,7 @@
 **     @todo   FIXME: Must handle the errors better.
 **             FIXME: Support for more sample files (ogg/flac/mp3).
 */
-global SoundId RegisterSound(char* files[], unsigned number)
+global SoundId RegisterSound(const char* files[], unsigned number)
 {
     unsigned i;
     ServerSoundId id;