[OMPT-svn-commit] SF.net SVN: modplug:[4037] trunk/OpenMPT

[<man...@us...>]

Revision: 4037
          http://sourceforge.net/p/modplug/code/4037
Author:   manxorist
Date:     2014-05-04 09:02:37 +0000 (Sun, 04 May 2014)
Log Message:
-----------
[Fix] Always propagate the current actual sound device samplerate to the global mixer samplerate. Revert sound device default samplerate to 48000 (reverts part of r4035 ).
[Mod] OpenMPT: Version is now 1.23.02.01

Revision Links:
--------------
    http://sourceforge.net/p/modplug/code/4035

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/sounddev/SoundDevice.h

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2014-05-03 21:33:05 UTC (rev 4036)
+++ trunk/OpenMPT/common/versionNumber.h	2014-05-04 09:02:37 UTC (rev 4037)
@@ -17,7 +17,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               23
 #define VER_MINOR               02
-#define VER_MINORMINOR          00
+#define VER_MINORMINOR          01
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2014-05-03 21:33:05 UTC (rev 4036)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2014-05-04 09:02:37 UTC (rev 4037)
@@ -828,7 +828,8 @@
 	}
 	gpSoundDevice->SetMessageReceiver(this);
 	gpSoundDevice->SetSource(this);
-	if(!gpSoundDevice->Open(TrackerSettings::Instance().GetSoundDeviceSettings(deviceID)))
+	SoundDeviceSettings deviceSettings = TrackerSettings::Instance().GetSoundDeviceSettings(deviceID);
+	if(!gpSoundDevice->Open(deviceSettings))
 	{
 		Reporting::Error("Unable to open sound device: Could not open sound device.");
 		return false;
@@ -839,8 +840,8 @@
 		Reporting::Error("Unable to open sound device: Unknown sample format.");
 		return false;
 	}
-	SoundDeviceSettings deviceSettings = TrackerSettings::Instance().GetSoundDeviceSettings(deviceID);
 	deviceSettings.sampleFormat = actualSampleFormat;
+	TrackerSettings::Instance().MixerSamplerate = gpSoundDevice->GetSettings().Samplerate;
 	TrackerSettings::Instance().SetSoundDeviceSettings(deviceID, deviceSettings);
 	return true;
 }

Modified: trunk/OpenMPT/sounddev/SoundDevice.h
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevice.h	2014-05-03 21:33:05 UTC (rev 4036)
+++ trunk/OpenMPT/sounddev/SoundDevice.h	2014-05-04 09:02:37 UTC (rev 4037)
@@ -257,7 +257,7 @@
 		: hWnd(NULL)
 		, LatencyMS(100)
 		, UpdateIntervalMS(5)
-		, Samplerate(44100)
+		, Samplerate(48000)
 		, Channels(2)
 		, sampleFormat(SampleFormatFloat32)
 		, ExclusiveMode(false)

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