svn_sync

Author: LiXizhi

Client/trunk/ParaEngineClient/ParaScriptBindings/ParaScriptingAudio.cpp

@@ -27,6 +27,7 @@ void ParaAudio::EnableAudioEngine(bool bEnable )
 void ParaAudio::SetVolume(float fVolume)
 {
 	CAudioEngine2::GetInstance()->SetGlobalVolume(fVolume);
+	CMidiMsg::GetSingleton().SetVolumeFloat(fVolume);
 }
 
 float ParaAudio::GetVolume()

Client/trunk/ParaEngineClient/doc/changes.txt

@@ -1,6 +1,9 @@
 /** @page ParaEngine_change	ParaEngine Change History
 @author LiXizhi
 Copyright 2004-2012 ParaEngine Corporation.
+2016.9.18
+	- audio midi api volume can now be changed with global audio settings
+
 2016.9.14
 	- BlockModel now supports fbx file, fixed coplanar index. 
 

Client/trunk/ParaEngineClient/util/MidiMsg.cpp

@@ -16,7 +16,7 @@ CMidiMsg::CMidiMsg() :
 #ifdef PARAENGINE_CLIENT
 m_deviceMidiOut(NULL), 
 #endif
-m_bIsValid(false), m_bIsLoaded(false)
+m_bIsValid(false), m_bIsLoaded(false), m_dwVolume(0xffffffff)
 {
 }
 
@@ -38,6 +38,7 @@ bool ParaEngine::CMidiMsg::CheckLoad()
 		else
 		{
 			m_bIsValid = true;
+			midiOutSetVolume(m_deviceMidiOut, m_dwVolume);
 			OUTPUT_LOG("successfully opened default MIDI device\n");
 		}
 #endif
@@ -46,6 +47,40 @@ bool ParaEngine::CMidiMsg::CheckLoad()
 
 }
 
+DWORD ParaEngine::CMidiMsg::GetVolume() const
+{
+	return m_dwVolume;
+}
+
+void ParaEngine::CMidiMsg::SetVolume(DWORD val)
+{
+	if (m_dwVolume != val)
+	{
+		m_dwVolume = val;
+
+#ifdef PARAENGINE_CLIENT
+		if (IsLoaded())
+		{
+			midiOutSetVolume(m_deviceMidiOut, m_dwVolume);
+		}
+#endif
+	}
+}
+
+void ParaEngine::CMidiMsg::SetVolumeFloat(float val)
+{
+	if (val > 1.0f)
+		val = 1.0f;
+	DWORD volume = (DWORD)(val * 0xffff);
+	volume = (volume << 16) + volume;
+	SetVolume(volume);
+}
+
+bool ParaEngine::CMidiMsg::IsLoaded() const
+{
+	return m_bIsLoaded;
+}
+
 CMidiMsg& CMidiMsg::GetSingleton()
 {
 	static CMidiMsg midiPlayer;

Client/trunk/ParaEngineClient/util/MidiMsg.h

@@ -19,11 +19,27 @@ namespace ParaEngine
 		bool CheckLoad();
 		// @param filename: if empty, it will stop last one. 
 		static void PlayMidiFile(const std::string& filename, int nLoopCount = 0);
+
+		/**
+		* New volume setting. The low-order word contains the left-channel volume setting,
+		* and the high-order word contains the right-channel setting. A value of 0xFFFF represents full volume, and a value of 0x0000 is silence.
+		*/
+		DWORD GetVolume() const;
+		void SetVolume(DWORD val);
+		/** set both left/right volume
+		* @param val: 0-1. where 1 is biggest one, 0 is mute. 
+		*/
+		void SetVolumeFloat(float val);
+
+		/** only load when first note is played. */
+		bool IsLoaded() const;
 	private:
 #ifdef PARAENGINE_CLIENT
 		HMIDIOUT m_deviceMidiOut;
 #endif
 		bool m_bIsValid;
 		bool m_bIsLoaded;
+		
+		DWORD m_dwVolume;
 	};
 }