Thread: [OMPT-svn-commit] SF.net SVN: modplug:[4526] trunk/OpenMPT/mptrack (Page 21)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 4526
          http://sourceforge.net/p/modplug/code/4526
Author:   manxorist
Date:     2014-11-01 09:17:35 +0000 (Sat, 01 Nov 2014)
Log Message:
-----------
[Imp] VUMeter: Display mono or quad vu meter in toolbar when appropriate.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mainbar.cpp
    trunk/OpenMPT/mptrack/Mainbar.h
    trunk/OpenMPT/mptrack/Notification.h

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================

--- trunk/OpenMPT/mptrack/MainFrm.cpp	2014-11-01 07:32:51 UTC (rev 4525)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2014-11-01 09:17:35 UTC (rev 4526)
@@ -847,6 +847,10 @@
 			}
 		}
 	}
+	for(std::size_t channel = std::min(numChannels, maxChannels); channel < maxChannels; ++channel)
+	{
+		channels[channel] = Channel();
+	}
 }
 
 
@@ -889,7 +893,7 @@
 
 	// Add an entry to the notification history
 
-	Notification notification(notifyType, notifyItem, streamPosition, m_pSndFile->m_PlayState.m_nRow, m_pSndFile->m_PlayState.m_nTickCount, m_pSndFile->m_PlayState.m_nCurrentOrder, m_pSndFile->m_PlayState.m_nPattern, m_pSndFile->GetMixStat());
+	Notification notification(notifyType, notifyItem, streamPosition, m_pSndFile->m_PlayState.m_nRow, m_pSndFile->m_PlayState.m_nTickCount, m_pSndFile->m_PlayState.m_nCurrentOrder, m_pSndFile->m_PlayState.m_nPattern, m_pSndFile->GetMixStat(), static_cast<uint8>(m_pSndFile->m_MixerSettings.gnChannels));
 
 	m_pSndFile->ResetMixStat();
 
@@ -976,9 +980,12 @@
 		// Master VU meter
 		notification.masterVU[0] = Clamp(m_VUMeter[0].peak >> 11, 0, 0x10000);
 		notification.masterVU[1] = Clamp(m_VUMeter[1].peak >> 11, 0, 0x10000);
+		notification.masterVU[2] = Clamp(m_VUMeter[2].peak >> 11, 0, 0x10000);
+		notification.masterVU[3] = Clamp(m_VUMeter[3].peak >> 11, 0, 0x10000);
 		if(m_VUMeter[0].clipped) notification.masterVU[0] |= Notification::ClipVU;
 		if(m_VUMeter[1].clipped) notification.masterVU[1] |= Notification::ClipVU;
-		int32 us = Util::muldivr(dwSamplesRead, 1000000, m_pSndFile->m_MixerSettings.gdwMixingFreq);
+		if(m_VUMeter[2].clipped) notification.masterVU[2] |= Notification::ClipVU;
+		if(m_VUMeter[3].clipped) notification.masterVU[3] |= Notification::ClipVU;
 		m_VUMeter.Decay(dwSamplesRead, m_pSndFile->m_MixerSettings.gdwMixingFreq);
 
 	}
@@ -2280,7 +2287,7 @@
 				::SendMessage(GetFollowSong(), WM_MOD_UPDATEPOSITION, 0, lParam);
 		}
 		m_nMixChn = pnotify->mixedChannels;
-		m_wndToolBar.m_VuMeter.SetVuMeter(pnotify->masterVU[0], pnotify->masterVU[1], pnotify->type[Notification::Stop]);
+		m_wndToolBar.m_VuMeter.SetVuMeter(pnotify->masterVUchannels, pnotify->masterVU,  pnotify->type[Notification::Stop]);
 	}
 	return 0;
 }

Modified: trunk/OpenMPT/mptrack/Mainbar.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mainbar.cpp	2014-11-01 07:32:51 UTC (rev 4525)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp	2014-11-01 09:17:35 UTC (rev 4526)
@@ -1116,16 +1116,32 @@
 }
 
 
-void CStereoVU::SetVuMeter(uint32 left, uint32 right, bool force)
-//---------------------------------------------------------------
+void CStereoVU::SetVuMeter(uint8 validChannels, const uint32 channels[4], bool force)
+//-----------------------------------------------------------------------------------
 {
-	if(left != vuMeter[0] || right != vuMeter[1])
+	bool changed = false;
+	if(validChannels != numChannels)
 	{
+		changed = true;
+		force = true;
+		numChannels = validChannels;
+	}
+	for(uint8 c = 0; c < validChannels; ++c)
+	{
+		if(vuMeter[c] != channels[c])
+		{
+			changed = true;
+		}
+	}
+	if(changed)
+	{
 		DWORD curTime = timeGetTime();
 		if(curTime - lastVuUpdateTime >= TrackerSettings::Instance().VuMeterUpdateInterval || force)
 		{
-			vuMeter[0] = left;
-			vuMeter[1] = right;
+			for(uint8 c = 0; c < validChannels; ++c)
+			{
+				vuMeter[c] = channels[c];
+			}
 			CClientDC dc(this);
 			DrawVuMeters(dc);
 			lastVuUpdateTime = curTime;
@@ -1140,24 +1156,24 @@
 {
 	CRect rect;
 	GetClientRect(&rect);
-	CRect rectL = rect, rectR = rect;
 
-	if(horizontal)
+	for(uint8 channel = 0; channel < numChannels; ++channel)
 	{
-		const int mid = rect.top + rect.Height() / 2;
-		rectL.bottom = mid;
-
-		rectR.top = mid + 1;
-	} else
-	{
-		const int mid = rect.left + rect.Width() / 2;
-		rectL.right = mid;
-
-		rectR.left = mid + 1;
+		CRect chanrect = rect;
+		if(horizontal)
+		{
+			float height = rect.Height() / float(numChannels);
+			chanrect.top = Util::Round<int32>(rect.top + height * channel);
+			chanrect.bottom = Util::Round<int32>(chanrect.top + height) - 1;
+		} else
+		{
+			float width = rect.Width() / float(numChannels);
+			chanrect.left = Util::Round<int32>(rect.left + width * channel);
+			chanrect.right = Util::Round<int32>(chanrect.left + width) - 1;
+		}
+		DrawVuMeter(dc, chanrect, channel, redraw);
 	}
 
-	DrawVuMeter(dc, rectL, 0, redraw);
-	DrawVuMeter(dc, rectR, 1, redraw);
 }
 
 

Modified: trunk/OpenMPT/mptrack/Mainbar.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainbar.h	2014-11-01 07:32:51 UTC (rev 4525)
+++ trunk/OpenMPT/mptrack/Mainbar.h	2014-11-01 09:17:35 UTC (rev 4526)
@@ -17,15 +17,16 @@
 //=============================
 {
 protected:
-	uint32 vuMeter[2];
+	uint8 numChannels;
+	uint32 vuMeter[4];
 	DWORD lastVuUpdateTime;
-	int lastV[2];
-	bool lastClip[2];
+	int lastV[4];
+	bool lastClip[4];
 	bool horizontal;
 
 public:
-	CStereoVU() { vuMeter[0] = vuMeter[1] = 0; lastVuUpdateTime = timeGetTime(); horizontal = true; lastV[0] = lastV[1] = 0; lastClip[0] = lastClip[1] = false; }
-	void SetVuMeter(uint32 left, uint32 right, bool force=false);
+	CStereoVU() { numChannels = 2; MemsetZero(vuMeter); lastVuUpdateTime = timeGetTime(); horizontal = true; MemsetZero(lastV); MemsetZero(lastClip); }
+	void SetVuMeter(uint8 validChannels, const uint32 channels[4], bool force=false);
 	void SetOrientation(bool h) { horizontal = h; }
 
 protected:

Modified: trunk/OpenMPT/mptrack/Notification.h
===================================================================
--- trunk/OpenMPT/mptrack/Notification.h	2014-11-01 07:32:51 UTC (rev 4525)
+++ trunk/OpenMPT/mptrack/Notification.h	2014-11-01 09:17:35 UTC (rev 4526)
@@ -43,10 +43,11 @@
 	ORDERINDEX order;				// dito
 	PATTERNINDEX pattern;			// dito
 	uint32 mixedChannels;			// dito
-	uint32 masterVU[2];				// dito
+	uint32 masterVU[4];				// dito
+	uint8 masterVUchannels;			// dito
 	SmpLength pos[MAX_CHANNELS];	// Sample / envelope pos for each channel if != PosInvalid, or pattern channel VUs
 
-	Notification(Type t = Default, Item i = 0, int64 s = 0, ROWINDEX r = 0, uint32 ti = 0, ORDERINDEX o = 0, PATTERNINDEX p = 0, uint32 x = 0) : timestampSamples(s), type(t), item(i), row(r), tick(ti), order(o), pattern(p), mixedChannels(x)
+	Notification(Type t = Default, Item i = 0, int64 s = 0, ROWINDEX r = 0, uint32 ti = 0, ORDERINDEX o = 0, PATTERNINDEX p = 0, uint32 x = 0, uint8 outChannels = 2) : timestampSamples(s), type(t), item(i), row(r), tick(ti), order(o), pattern(p), mixedChannels(x), masterVUchannels(outChannels)
 	{
 		MemsetZero(masterVU);
 	}

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





Thread: [OMPT-svn-commit] SF.net SVN: modplug:[4526] trunk/OpenMPT/mptrack (Page 21)

A music tracker software for Windows.

modplug-svn-commit