From bf78e40b5979ea76bdcb1b67037d2ca8cbc0890d Mon Sep 17 00:00:00 2001
From: xHire <xhire@tuxportal.cz>
Date: Mon, 1 Jun 2009 23:52:32 +0200
Subject: Revert "[Audio] Cleanup. Next: make it more abstract to not duplicate
 various calls."

Reverting as it was *only* breaking our coding style

This reverts commit 439ff17f2782c2bfbc5588743be26511f0de8d0c.
---
 src/audio/music.c | 31 ++++++++++++++++++++-----------
 src/audio/music.h |  9 +++++++++
 src/audio/sound.c | 14 +++++++++-----
 src/audio/sound.h |  9 +++++++++
 4 files changed, 47 insertions(+), 16 deletions(-)

(limited to 'src/audio')

diff --git a/src/audio/music.c b/src/audio/music.c
index c6db7ee..2d2194f 100644
--- a/src/audio/music.c
+++ b/src/audio/music.c
@@ -40,10 +40,11 @@ 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);
+	}
 }
 
 /*
@@ -56,10 +57,11 @@ 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);
 
@@ -78,8 +80,9 @@ static Mix_Music *loadMixMusic(char *file)
  */
 static void playMixMusic()
 {
-	if (currentMusic != NULL)
+	if (currentMusic != NULL) {
 		Mix_PlayMusic(currentMusic, 1000);
+	}
 }
 
 /*
@@ -97,8 +100,9 @@ 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);
@@ -113,8 +117,9 @@ 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"));
@@ -139,8 +144,9 @@ 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 &&
@@ -148,8 +154,9 @@ 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);
@@ -201,8 +208,9 @@ 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);
 }
@@ -212,8 +220,9 @@ 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 efd4f09..9eedac7 100644
--- a/src/audio/music.h
+++ b/src/audio/music.h
@@ -9,6 +9,15 @@
 #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 15cac69..58a78ba 100644
--- a/src/audio/sound.c
+++ b/src/audio/sound.c
@@ -37,10 +37,11 @@ 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);
+	}
 }
 
 /*
@@ -91,8 +92,9 @@ 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);
@@ -107,8 +109,9 @@ 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));
 }
@@ -134,8 +137,9 @@ 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 88cc6a3..f8cf2d3 100644
--- a/src/audio/sound.h
+++ b/src/audio/sound.h
@@ -9,6 +9,15 @@
 #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);
-- 
cgit v1.2.3