[Audio] Cleanup. Next: make it more abstract to not duplicate various calls.

4 files changed, 16 insertions, 47 deletions

diff --git a/src/audio/music.c b/src/audio/music.c
index 2d2194f..c6db7ee 100644
--- a/src/audio/music.c
+++ b/src/audio/music.c
@@ -40,11 +40,10 @@ void music_init()
 	isMusicInit = TRUE;
 	var_music_is_active = TRUE;
 
-	if (isParamFlag("--no-music")) {
+	if (isParamFlag("--no-music"))
 		music_set_active(FALSE);
-	} else if (isParamFlag("--music")) {
+	else if (isParamFlag("--music"))
 		music_set_active(TRUE);
-	}
 }
 
 /*
@@ -57,11 +56,10 @@ static Mix_Music *loadMixMusic(char *file)
 
 	DEBUG_MSG(_("[Debug] Loading music [%s]\n"), file);
 
-	if (isFillPath(file)) {
+	if (isFillPath(file))
 		strcpy(str, file);
-	} else {
+	else
 		sprintf(str, PATH_MUSIC "%s", file);
-	}
 
 	accessExistFile(str);
 
@@ -80,9 +78,8 @@ static Mix_Music *loadMixMusic(char *file)
  */
 static void playMixMusic()
 {
-	if (currentMusic != NULL) {
+	if (currentMusic != NULL)
 		Mix_PlayMusic(currentMusic, 1000);
-	}
 }
 
 /*
@@ -100,9 +97,8 @@ void music_add(char *file, char *name, char *group)
 {
 	Mix_Music *new;
 
-	if (isMusicInit == FALSE) {
+	if (isMusicInit == FALSE)
 		return;
-	}
 
 	assert(file != NULL);
 	assert(name != NULL);
@@ -117,9 +113,8 @@ void music_add(char *file, char *name, char *group)
  */
 void music_stop()
 {
-	if (isMusicInit == FALSE || var_music_is_active == FALSE) {
+	if (isMusicInit == FALSE || var_music_is_active == FALSE)
 		return;
-	}
 
 	if (currentMusic != NULL) {
 		DEBUG_MSG(_("[Debug] Stopping playing music\n"));
@@ -144,9 +139,8 @@ void music_play(char *name, char *group)
 		isStrInit = 1;
 	}
 
-	if (isMusicInit == FALSE || var_music_is_active == FALSE) {
+	if (isMusicInit == FALSE || var_music_is_active == FALSE)
 		return;
-	}
 
 	if (currentMusic != NULL &&
 	    strcmp(currentMusic_group, group) == 0 &&
@@ -154,9 +148,8 @@ void music_play(char *name, char *group)
 		return;
 	}
 
-	if (currentMusic != NULL) {
+	if (currentMusic != NULL)
 		music_stop();
-	}
 
 	currentMusic = storage_get(listStorage, group, name);
 	strcpy(currentMusic_group, group);
@@ -208,9 +201,8 @@ char *music_get_current()
  */
 void music_del_all_in_group(char *group)
 {
-	if (isMusicInit == FALSE) {
+	if (isMusicInit == FALSE)
 		return;
-	}
 
 	storage_del_all(listStorage, group, destroyMusic);
 }
@@ -220,9 +212,8 @@ void music_del_all_in_group(char *group)
  */
 void music_quit()
 {
-	if (isMusicInit == FALSE) {
+	if (isMusicInit == FALSE)
 		return;
-	}
 
 	DEBUG_MSG(_("[Debug] Shutting down music\n"));
 
diff --git a/src/audio/music.h b/src/audio/music.h
index 9eedac7..efd4f09 100644
--- a/src/audio/music.h
+++ b/src/audio/music.h
@@ -9,15 +9,6 @@
 #define MUSIC_GROUP_BASE "base"
 #define MUSIC_GROUP_USER "user"
 
-/*
-   typedef struct music_struct
-   {
-   char *name;
-   int group;
-   Mix_Music *music;
-   } music_t;
- */
-
 extern bool_t music_is_inicialized();
 extern void music_init();
 extern void music_add(char *file, char *name, char *group);
diff --git a/src/audio/sound.c b/src/audio/sound.c
index 58a78ba..15cac69 100644
--- a/src/audio/sound.c
+++ b/src/audio/sound.c
@@ -37,11 +37,10 @@ void sound_init()
 	isSoundInit = TRUE;
 	var_sound_is_active = TRUE;
 
-	if (isParamFlag("--no-sound")) {
+	if (isParamFlag("--no-sound"))
 		sound_set_active(FALSE);
-	} else if (isParamFlag("--sound")) {
+	else if (isParamFlag("--sound"))
 		sound_set_active(TRUE);
-	}
 }
 
 /*
@@ -92,9 +91,8 @@ void sound_add(char *file, char *name, char *group)
 {
 	Mix_Chunk *new;
 
-	if (isSoundInit == FALSE) {
+	if (isSoundInit == FALSE)
 		return;
-	}
 
 	assert(file != NULL);
 	assert(name != NULL);
@@ -109,9 +107,8 @@ void sound_add(char *file, char *name, char *group)
  */
 void sound_play(char *name, char *group)
 {
-	if (isSoundInit == FALSE || var_sound_is_active == FALSE) {
+	if (isSoundInit == FALSE || var_sound_is_active == FALSE)
 		return;
-	}
 
 	playMixSound(storage_get(listStorage, group, name));
 }
@@ -137,9 +134,8 @@ bool_t sound_is_active()
  */
 void sound_quit()
 {
-	if (isSoundInit == FALSE) {
+	if (isSoundInit == FALSE)
 		return;
-	}
 
 	DEBUG_MSG(_("[Debug] Shutting down sound\n"));
 
diff --git a/src/audio/sound.h b/src/audio/sound.h
index f8cf2d3..88cc6a3 100644
--- a/src/audio/sound.h
+++ b/src/audio/sound.h
@@ -9,15 +9,6 @@
 #define SOUND_GROUP_BASE "base"
 #define SOUND_GROUP_USER "user"
 
-/*
-   typedef struct sound_struct
-   {
-   char *name;
-   int group;
-   Mix_Chunk *sound;
-   } sound_t;
- */
-
 extern bool_t sound_is_inicialized();
 extern void sound_init();
 extern void sound_add(char *file, char *name, char *group);