Changeset 536Tweet

Timestamp:

Apr 23, 2011, 12:48:41 AM (6 years ago)

Author:

sam

Message:

sdlport: add some error reporting to the new SDL_Mixer features.

File:

• abuse/trunk/src/sdlport/sound.cpp (modified) (12 diffs)

abuse/trunk/src/sdlport/sound.cpp

@@ -69 +69 @@
 };
 
+#ifndef USE_SDL_MIXER
 static effect_handle * fx_list = NULL;
+#endif
 extern flags_struct flags;
 static int sound_enabled = 0;
@@ -121 +123 @@
 int sound_init( int argc, char **argv )
 {
-    SDL_AudioSpec audioWanted;
     char *sfxdir, *datadir;
     FILE *fd = NULL;
@@ -129 +130 @@
     {
         // User requested that sound be disabled
-        printf( "Sound : Disabled (-nosound)\n" );
+        printf( "Sound: Disabled (-nosound)\n" );
         return 0;
     }
@@ -140 +141 @@
     {
         // Didn't find the directory, so disable sound.
-        printf( "Sound : Disabled (couldn't find the sfx directory)\n" );
+        printf( "Sound: Disabled (couldn't find the sfx directory)\n" );
         return 0;
     }
@@ -148 +149 @@
     if (Mix_OpenAudio(11025, AUDIO_U8, 2, 128) < 0)
     {
-        printf( "Sound : Unable to open audio - %s\nSound : Disabled (error)\n", SDL_GetError() );
+        printf( "Sound: Unable to open audio - %s\nSound: Disabled (error)\n", SDL_GetError() );
         return 0;
     }
@@ -159 +160 @@
 
     sound_enabled = SFX_INITIALIZED | MUSIC_INITIALIZED;
-#else
+
+    printf( "Music: Enabled\n" );
+#else
+    SDL_AudioSpec audioWanted;
     audioWanted.freq = 11025;
     audioWanted.format = AUDIO_U8;
@@ -170 +174 @@
     if( SDL_OpenAudio( &audioWanted, &audioObtained ) < 0 )
     {
-        printf( "Sound : Unable to open audio - %s\nSound : Disabled (error)\n", SDL_GetError() );
+        printf( "Sound: Unable to open audio - %s\nSound: Disabled (error)\n", SDL_GetError() );
         return 0;
     }
@@ -179 +183 @@
 #endif
 
-    printf( "Sound : Enabled\n" );
+    printf( "Sound: Enabled\n" );
 
     // It's all good
@@ -299 +303 @@
         if( fx_list == NULL )
         {
-            printf( "Sound : ERROR - Failed to create new effect.\n" );
+            printf( "Sound: ERROR - Failed to create new effect.\n" );
             SDL_UnlockAudio();
             return;
@@ -361 +365 @@
 // Play music using SDL_Mixer
 
-song::song( char const * filename )
+song::song(char const * filename)
 {
     data = NULL;
@@ -378 +382 @@
     data = load_hmi(realname, data_size);
 
-    if (data)
-    {
-        rw = SDL_RWFromMem(data, data_size);
-        music = Mix_LoadMUS_RW(rw);
+    if (!data)
+    {
+        printf("Music: ERROR - could not load %s\n", realname);
+        return;
+    }
+
+    rw = SDL_RWFromMem(data, data_size);
+    music = Mix_LoadMUS_RW(rw);
+
+    if (!music)
+    {
+        printf("Music: ERROR - %s while loading %s\n",
+               Mix_GetError(), realname);
+        return;
     }
 #endif
@@ -388 +402 @@
 song::~song()
 {
-    if( playing() )
-    {
+    if(playing())
         stop();
-    }
-    if( data )
-    {
-        free( data );
-    }
-    free( Name );
-
-#ifdef USE_SDL_MIXER
-    Mix_FreeMusic(this->music);
-    SDL_FreeRW(this->rw);
+    free(data);
+    free(Name);
+
+#ifdef USE_SDL_MIXER
+    Mix_FreeMusic(music);
+    SDL_FreeRW(rw);
 #endif
 }