Replace menu music (fixes #105)

Setting music volume to/from 0 pauses/resumes Remove debugging printf
cxong · Jun 25, 2013 · 3be3605 · 3be3605
1 parent 5f1fd4b
commit 3be3605
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 4 deletions.
diff --git a/music/menu/ac-lol.it b/music/menu/ac-lol.it
diff --git a/music/menu/ac-lol.it.txt b/music/menu/ac-lol.it.txt
diff --git a/music/menu/space_0.ogg b/music/menu/space_0.ogg
diff --git a/music/menu/space_0.ogg.txt b/music/menu/space_0.ogg.txt
@@ -0,0 +1,4 @@
+Reencoded from Space by Alexandr Zhelanov
+http://opengameart.org/content/space-1
+
+http://creativecommons.org/licenses/by/3.0/
diff --git a/src/cdogs/music.c b/src/cdogs/music.c
@@ -39,7 +39,7 @@
 
 int MusicPlay(SoundDevice *device, const char *path)
 {
-	if (!device->isInitialised || gConfig.Sound.MusicVolume == 0)
+	if (!device->isInitialised)
 	{
 		return 0;
 	}
@@ -65,6 +65,11 @@ int MusicPlay(SoundDevice *device, const char *path)
 	Mix_PlayMusic(device->music, -1);
 	device->musicStatus = MUSIC_PLAYING;
 
+	if (gConfig.Sound.MusicVolume == 0)
+	{
+		MusicPause(device);
+	}
+
 	return 0;
 }
 
@@ -78,6 +83,24 @@ void MusicStop(SoundDevice *device)
 	}
 }
 
+void MusicPause(SoundDevice *device)
+{
+	if (device->musicStatus == MUSIC_PLAYING)
+	{
+		Mix_PauseMusic();
+		device->musicStatus = MUSIC_PAUSED;
+	}
+}
+
+void MusicResume(SoundDevice *device)
+{
+	if (device->musicStatus == MUSIC_PAUSED)
+	{
+		Mix_ResumeMusic();
+		device->musicStatus = MUSIC_PLAYING;
+	}
+}
+
 int MusicGetStatus(SoundDevice *device)
 {
 	return device->musicStatus;

diff --git a/src/cdogs/music.h b/src/cdogs/music.h
@@ -53,6 +53,8 @@
 
 int MusicPlay(SoundDevice *device, const char *path);
 void MusicStop(SoundDevice *device);
+void MusicPause(SoundDevice *device);
+void MusicResume(SoundDevice *device);
 int MusicGetStatus(SoundDevice *device);
 const char *MusicGetErrorMessage(SoundDevice *device);
 

diff --git a/src/cdogs/sounds.c b/src/cdogs/sounds.c
@@ -177,6 +177,14 @@ void SoundReconfigure(SoundDevice *device, SoundConfig *config)
 
 	Mix_Volume(-1, config->SoundVolume);
 	Mix_VolumeMusic(config->MusicVolume);
+	if (config->MusicVolume > 0)
+	{
+		MusicResume(device);
+	}
+	else
+	{
+		MusicPause(device);
+	}
 
 	device->isInitialised = 1;
 }
@@ -227,8 +235,6 @@ void SoundPlayAtPosition(
 
 	debug(D_VERBOSE, "sound: %d distance: %d bearing: %d\n",
 		sound, distance, bearing);
-	printf("sound: %d distance: %d bearing: %d\n",
-		sound, distance, bearing);
 
 	channel = Mix_PlayChannel(-1, device->sounds[sound].data , 0);
 	Mix_SetPosition(channel, (Sint16)bearing, (Uint8)distance);