Changeset 534 for abuse/trunk/src/sdlportTweet

Timestamp:

Apr 22, 2011, 7:32:17 PM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: remove a lot of dead code, especially from the linked list and
the WAV reader.

Location:

abuse/trunk/src/sdlport

Files:

• sound.cpp (modified) (1 diff)
• sound.h (modified) (2 diffs)

abuse/trunk/src/sdlport/sound.cpp

@@ -218 +218 @@
     if( sound_enabled )
     {
-        long sample_speed;
+        int sample_speed;
 
 #ifdef USE_SDL_MIXER

abuse/trunk/src/sdlport/sound.h

@@ -9 +9 @@
  */
 
-#ifndef __SOUND_HPP_
-#define __SOUND_HPP_
+#ifndef __SOUND_H__
+#define __SOUND_H__
 
 #ifdef USE_SDL_MIXER
-#include <SDL/SDL_mixer.h>
+#   include <SDL/SDL_mixer.h>
 #endif
 
@@ -23 +23 @@
 int sound_init(int argc, char **argv);
 void sound_uninit();
-void print_sound_options();                         // print the options avaible for sound
+void print_sound_options(); // print the options avaible for sound
 
 class sound_effect
 {
-  long size;
-  void *data;
+public:
+    sound_effect(char *filename);
+    void play(int volume = 127, int pitch = 128, int panpot = 128);
+    ~sound_effect();
+
+private:
+    void *data;
 #ifdef USE_SDL_MIXER
-  Mix_Chunk* chunk;
+    Mix_Chunk* chunk;
 #endif
-public :
-  sound_effect(char *filename);
-  void play(int volume=127, int pitch=128, int panpot=128);
-  ~sound_effect();
-} ;
-
+    int size;
+};
 
 class song
 {
-  char *Name;
-  unsigned char *data;
-  unsigned long song_id;
+public:
+    char const *name() { return Name; }
+    song(char const *filename);
+    void play(unsigned char volume=127);
+    void stop(long fadeout_time=0); // time in ms
+    int playing();
+    void set_volume(int volume);
+    ~song();
+
+private:
+    char *Name;
+    unsigned char *data;
+    unsigned long song_id;
 #ifdef USE_SDL_MIXER
-  Mix_Music* music;
-  SDL_RWops* rw;
+    Mix_Music* music;
+    SDL_RWops* rw;
 #endif
-public :
-  char const *name() { return Name; }
-  song(char const *filename);
-  void play(unsigned char volume=127);
-  void stop(long fadeout_time=0);                                        // time in ms
-  int playing();
-  void set_volume(int volume);
-  ~song();
-} ;
+};
+
 #endif
 
-
-
-
-
-
-
-
-
-
-