[Exult-cvs-logs] SF.net SVN: exult:[7467] exult/trunk

[<do...@us...>]

Revision: 7467
          http://sourceforge.net/p/exult/code/7467
Author:   dominus
Date:     2014-03-24 15:02:00 +0000 (Mon, 24 Mar 2014)
Log Message:
-----------
changing audio settings during playback of non-looping music tracks flagged these as looping - fixed by i30817

Modified Paths:
--------------
    exult/trunk/ChangeLog
    exult/trunk/gumps/AudioOptions_gump.cc

Modified: exult/trunk/ChangeLog
===================================================================
--- exult/trunk/ChangeLog	2014-03-23 01:42:41 UTC (rev 7466)
+++ exult/trunk/ChangeLog	2014-03-24 15:02:00 UTC (rev 7467)
@@ -1,3 +1,7 @@
+2014-03-24	Dominik Reichardt <do...@us...>
+	* gumps/AudioOptions_gump.cc: chnaging audio settings during playback of 
+	  non-looping music tracks flagged these as looping - fixed by i30817
+
 2014-03-23	Malignant Manor <mal...@us...>
 	* Fix timing issue that could cause the Guardian's intro speech not to play.
 

Modified: exult/trunk/gumps/AudioOptions_gump.cc
===================================================================
--- exult/trunk/gumps/AudioOptions_gump.cc	2014-03-23 01:42:41 UTC (rev 7466)
+++ exult/trunk/gumps/AudioOptions_gump.cc	2014-03-24 15:02:00 UTC (rev 7467)
@@ -510,9 +510,12 @@
 
 void AudioOptions_gump::save_settings() {
 	int track_playing = -1;
+	bool looping = false;
 	MyMidiPlayer *midi = Audio::get_ptr()->get_midi();
-	if (midi)
+	if (midi) {
 		track_playing = midi->get_current_track();
+		looping = midi->is_repeating();
+	}
 	config->set("config/audio/sample_rate", sample_rates[sample_rate], false);
 	config->set("config/audio/stereo", speaker_type ? "yes" : "no", false);
 	if (sample_rates[sample_rate] != static_cast<uint32>(o_sample_rate) ||
@@ -606,7 +609,7 @@
 		if (gwin->is_in_exult_menu())
 			Audio::get_ptr()->start_music(EXULT_FLX_MEDITOWN_MID, true, EXULT_FLX);
 		else
-			Audio::get_ptr()->start_music(track_playing, midi_looping == 1);
+			Audio::get_ptr()->start_music(track_playing, looping);
 	}
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.