(svn r3641) - Rename MusicFilesettings 'btn_down' to more sensible 'playing'

3 files changed, 6 insertions, 6 deletions

diff --git a/music_gui.c b/music_gui.c
index bdd1c550c..3a9eb2e69 100644
--- a/music_gui.c
+++ b/music_gui.c
@@ -182,9 +182,9 @@ void ResetMusic(void)
 
 void MusicLoop(void)
 {
-	if (!msf.btn_down && _song_is_active) {
+	if (!msf.playing && _song_is_active) {
 		StopMusic();
-	} else if (msf.btn_down && !_song_is_active) {
+	} else if (msf.playing && !_song_is_active) {
 		PlayPlaylistSong();
 	}
 
@@ -405,10 +405,10 @@ static void MusicWindowWndProc(Window *w, WindowEvent *e)
 			SkipToNextSong();
 			break;
 		case 4: // stop playing
-			msf.btn_down = false;
+			msf.playing = false;
 			break;
 		case 5: // start playing
-			msf.btn_down = true;
+			msf.playing = true;
 			break;
 		case 6:{ // volume sliders
 			byte *vol,new_vol;
diff --git a/settings.c b/settings.c
index e64907c02..555a7c329 100644
--- a/settings.c
+++ b/settings.c
@@ -794,7 +794,7 @@ static const SettingDesc music_settings[] = {
 	{"effect_vol",SDT_UINT8,	(void*)128,		&msf.effect_vol, NULL},
 	{"custom_1",	SDT_INTLIST | SDT_UINT8 | lengthof(msf.custom_1) << 16, NULL, &msf.custom_1, NULL},
 	{"custom_2",	SDT_INTLIST | SDT_UINT8 | lengthof(msf.custom_2) << 16, NULL, &msf.custom_2, NULL},
-	{"playing",		SDT_BOOL,		(void*)true,	&msf.btn_down, NULL},
+	{"playing",		SDT_BOOL,		(void*)true,	&msf.playing, NULL},
 	{"shuffle",		SDT_BOOL,		(void*)false, &msf.shuffle, NULL},
 	{"extmidi",   SDT_STRINGBUF | (lengthof(msf.extmidi)<<16), EXTERNAL_PLAYER, &msf.extmidi, NULL},
 	{NULL,				0,					NULL,					NULL,																NULL}
diff --git a/sound.h b/sound.h
index f129d3612..9f9edaddc 100644
--- a/sound.h
+++ b/sound.h
@@ -9,7 +9,7 @@ typedef struct MusicFileSettings {
 	byte effect_vol;
 	byte custom_1[33];
 	byte custom_2[33];
-	bool btn_down;
+	bool playing;
 	bool shuffle;
 	char extmidi[80];
 } MusicFileSettings;