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

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

Revision: 4545
          http://sourceforge.net/p/modplug/code/4545
Author:   manxorist
Date:     2014-11-03 19:29:38 +0000 (Mon, 03 Nov 2014)
Log Message:
-----------
[Ref] Tiny cleanup.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/mptrack/Mpdlgs.h
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-11-03 18:23:01 UTC (rev 4544)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2014-11-03 19:29:38 UTC (rev 4545)
@@ -149,8 +149,8 @@
 }
 
 
-COptionsSoundcard::COptionsSoundcard(std::wstring deviceIdentifier)
-//-----------------------------------------------------------------
+COptionsSoundcard::COptionsSoundcard(SoundDevice::Identifier deviceIdentifier)
+//----------------------------------------------------------------------------
 	: CPropertyPage(IDD_OPTIONS_SOUNDCARD)
 	, m_InitialDeviceIdentifier(deviceIdentifier)
 {

Modified: trunk/OpenMPT/mptrack/Mpdlgs.h
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.h	2014-11-03 18:23:01 UTC (rev 4544)
+++ trunk/OpenMPT/mptrack/Mpdlgs.h	2014-11-03 19:29:38 UTC (rev 4545)
@@ -42,7 +42,7 @@
 	SoundDevice::Settings m_Settings;
 
 public:
-	COptionsSoundcard(std::wstring deviceIdentifier);
+	COptionsSoundcard(SoundDevice::Identifier deviceIdentifier);
 
 	void UpdateStatistics();
 

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-11-03 18:23:01 UTC (rev 4544)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2014-11-03 19:29:38 UTC (rev 4545)
@@ -173,7 +173,7 @@
 	, m_SoundSettingsStopMode(conf, "Sound Settings", "StopMode", SoundDevice::StopModeClosed)
 	, m_SoundDeviceSettingsUseOldDefaults(false)
 	, m_SoundDeviceID_DEPRECATED(SoundDevice::ID())
-	, m_SoundDeviceIdentifier(conf, "Sound Settings", "Device", std::wstring())
+	, m_SoundDeviceIdentifier(conf, "Sound Settings", "Device", SoundDevice::Identifier())
 	, m_SoundDevicePreferSameTypeIfDeviceUnavailable(conf, "Sound Settings", "PreferSameTypeIfDeviceUnavailable", false)
 	, MixerMaxChannels(conf, "Sound Settings", "MixChannels", MixerSettings().m_nMaxMixChannels)
 	, MixerDSPMask(conf, "Sound Settings", "Quality", MixerSettings().DSPMask)

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2014-11-03 18:23:01 UTC (rev 4544)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2014-11-03 19:29:38 UTC (rev 4545)
@@ -378,7 +378,7 @@
 	SoundDevice::Settings m_SoundDeviceSettingsDefaults;
 	SoundDevice::Settings GetSoundDeviceSettingsDefaults() const;
 
-	Setting<std::wstring> m_SoundDeviceIdentifier;
+	Setting<SoundDevice::Identifier> m_SoundDeviceIdentifier;
 	Setting<bool> m_SoundDevicePreferSameTypeIfDeviceUnavailable;
 	SoundDevice::Identifier GetSoundDeviceIdentifier() const;
 	void SetSoundDeviceIdentifier(const SoundDevice::Identifier &identifier);

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