rnd-20020512-1-src

[rocksndiamonds.git] / src / libgame / sound.h

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index f1cd4aeb80eafa004851d66aa875f0bfb739d1f2..db99a81d2a77f660a4503973488b4cea5ae39dd5 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -219,14 +219,14 @@ struct SoundEffectInfo
 };
 
 struct SampleInfo
-{ 
-  int type;
+{
   char *source_filename;
   int num_references;
 
+  int type;
+  int format;
   long data_len;
   void *data_ptr;
-  int format;
 };
 
 typedef struct SampleInfo      SoundInfo;
@@ -259,7 +259,6 @@ typedef struct SampleInfo   MusicInfo;
 #define IS_STOPPING(x)         ((x).state & SND_CTRL_STOP)
 #define IS_RELOADING(x)                ((x).state & (SND_CTRL_RELOAD_SOUNDS | \
                                              SND_CTRL_RELOAD_MUSIC))
-#define IS_MUSIC_MODULE(x)     ((x).format == AUDIO_FORMAT_UNKNOWN)
 #define ALL_SOUNDS(x)          ((x).state & SND_CTRL_ALL_SOUNDS)
 
 struct SoundControl
@@ -268,16 +267,17 @@ struct SoundControl
 
   int nr;
   int volume;
-  int stereo;
+  int stereo_position;
 
   int state;
 
-  int playingtime;
-  long playingpos;
+  unsigned long playing_starttime;
+  unsigned long playing_pos;
 
+  int type;
+  int format;
   long data_len;
   void *data_ptr;
-  int format;
 
 #if defined(PLATFORM_MSDOS)
   int voice;