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

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

Revision: 1779
          http://sourceforge.net/p/modplug/code/1779
Author:   saga-games
Date:     2013-04-08 17:17:19 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
[Fix] Options dialog: Preamp warning was also shown when changing stereo separation
[Ref] Changed some notification generating code to not query the same static information again and again.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/mptrack/View_smp.cpp

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

--- trunk/OpenMPT/mptrack/MainFrm.cpp	2013-04-08 16:35:10 UTC (rev 1778)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2013-04-08 17:17:19 UTC (rev 1779)
@@ -986,63 +986,74 @@
 	// Add an entry to the notification history
 
 	Notification notification(notifyType, notifyItem, notificationtimestamp, m_pSndFile->m_nRow, m_pSndFile->m_nTickCount, m_pSndFile->m_nCurrentOrder, m_pSndFile->m_nPattern);
-	Notification *p = &notification;
 
-	if(endOfStream) p->type.set(Notification::EOS);
+	if(endOfStream) notification.type.set(Notification::EOS);
 
 	if(notifyType[Notification::Sample])
 	{
 		// Sample positions
-		SAMPLEINDEX smp = notifyItem;
-		for(CHANNELINDEX k = 0; k < MAX_CHANNELS; k++)
+		const SAMPLEINDEX smp = notifyItem;
+		if(smp > 0 && smp <= m_pSndFile->GetNumSamples() && m_pSndFile->GetSample(smp).pSample != nullptr)
 		{
-			const ModChannel &chn = m_pSndFile->Chn[k];
-			if(smp && smp <= m_pSndFile->GetNumSamples() && chn.nLength && chn.pSample	// There is a sample and it's playing
-				&& chn.pSample == m_pSndFile->GetSample(smp).pSample					// And it's the correct sample
-				&& (!chn.dwFlags[CHN_NOTEFADE] || chn.nFadeOutVol))						// And it hasn't completely faded out yet, so it's still playing
+			for(CHANNELINDEX k = 0; k < MAX_CHANNELS; k++)
 			{
-				p->pos[k] = chn.nPos;
-			} else
-			{
-				p->pos[k] = Notification::PosInvalid;
+				const ModChannel &chn = m_pSndFile->Chn[k];
+				if(chn.pSample == m_pSndFile->GetSample(smp).pSample && chn.nLength != 0	// Corrent sample is set up on this channel
+					&& (!chn.dwFlags[CHN_NOTEFADE] || chn.nFadeOutVol))						// And it hasn't completely faded out yet, so it's still playing
+				{
+					notification.pos[k] = chn.nPos;
+				} else
+				{
+					notification.pos[k] = Notification::PosInvalid;
+				}
 			}
+		} else
+		{
+			// Can't generate a valid notification.
+			notification.type.reset(Notification::Sample);
 		}
 	} else if(notifyType[Notification::VolEnv | Notification::PanEnv | Notification::PitchEnv])
 	{
 		// Instrument envelopes
-		INSTRUMENTINDEX ins = notifyItem;
-		for(CHANNELINDEX k = 0; k < MAX_CHANNELS; k++)
+		const INSTRUMENTINDEX ins = notifyItem;
+
+		enmEnvelopeTypes notifyEnv = ENV_VOLUME;
+		if(notifyType[Notification::PitchEnv])
+			notifyEnv = ENV_PITCH;
+		else if(notifyType[Notification::PanEnv])
+			notifyEnv = ENV_PANNING;
+
+		if(ins > 0 && ins <= m_pSndFile->GetNumInstruments() && m_pSndFile->Instruments[ins] != nullptr)
 		{
-			const ModChannel &chn = m_pSndFile->Chn[k];
-			if(ins != 0 && ins <= m_pSndFile->GetNumInstruments()								// There is an instrument
-				&& chn.pModInstrument && chn.pModInstrument == m_pSndFile->Instruments[ins]		// And it's the correct instrument
-				&& (chn.nLength || chn.pModInstrument->HasValidMIDIChannel())					// And it's playing something (sample or instrument)
-				&& (!chn.dwFlags[CHN_NOTEFADE] || chn.nFadeOutVol))								// And it hasn't completely faded out yet, so it's still playing
+			for(CHANNELINDEX k = 0; k < MAX_CHANNELS; k++)
 			{
-				enmEnvelopeTypes notifyEnv = ENV_VOLUME;
-				if(notifyType[Notification::PitchEnv])
-					notifyEnv = ENV_PITCH;
-				else if(notifyType[Notification::PanEnv])
-					notifyEnv = ENV_PANNING;
+				const ModChannel &chn = m_pSndFile->Chn[k];
+				uint32 pos = Notification::PosInvalid;
 
-				const ModChannel::EnvInfo &chnEnv = chn.GetEnvelope(notifyEnv);
-				if(chnEnv.flags[ENV_ENABLED])
+				if(chn.pModInstrument == m_pSndFile->Instruments[ins]				// Correct instrument is set up on this channel
+					&& (chn.nLength || chn.pModInstrument->HasValidMIDIChannel())	// And it's playing something (sample or instrument plugin)
+					&& (!chn.dwFlags[CHN_NOTEFADE] || chn.nFadeOutVol))				// And it hasn't completely faded out yet, so it's still playing
 				{
-					uint32 pos = chnEnv.nEnvPosition;
-					if(m_pSndFile->IsCompatibleMode(TRK_IMPULSETRACKER))
+					const ModChannel::EnvInfo &chnEnv = chn.GetEnvelope(notifyEnv);
+					if(chnEnv.flags[ENV_ENABLED])
 					{
-						// Impulse Tracker envelope handling (see e.g. CSoundFile::IncrementEnvelopePosition in SndMix.cpp for details)
-						if(pos > 0)
-							pos--;
-						else
-							continue;
+						pos = chnEnv.nEnvPosition;
+						if(m_pSndFile->IsCompatibleMode(TRK_IMPULSETRACKER))
+						{
+							// Impulse Tracker envelope handling (see e.g. CSoundFile::IncrementEnvelopePosition in SndMix.cpp for details)
+							if(pos > 0)
+								pos--;
+							else
+								pos = Notification::PosInvalid;	// Envelope isn't playing yet (e.g. when disabling it right when triggering a note)
+						}
 					}
-					p->pos[k] = pos;
 				}
-			} else
-			{
-				p->pos[k] = Notification::PosInvalid;
+				notification.pos[k] = pos;
 			}
+		} else
+		{
+			// Can't generate a valid notification.
+			notification.type.reset(Notification::VolEnv | Notification::PanEnv | Notification::PitchEnv);
 		}
 	} else if(notifyType[Notification::VUMeters])
 	{
@@ -1051,7 +1062,7 @@
 		{
 			uint32 vul = m_pSndFile->Chn[k].nLeftVU;
 			uint32 vur = m_pSndFile->Chn[k].nRightVU;
-			p->pos[k] = (vul << 8) | (vur);
+			notification.pos[k] = (vul << 8) | (vur);
 		}
 	}
 
@@ -1061,10 +1072,10 @@
 		uint32 rVu = (gnRVuMeter >> 11);
 		if(lVu > 0x10000) lVu = 0x10000;
 		if(rVu > 0x10000) rVu = 0x10000;
-		p->masterVU[0] = lVu;
-		p->masterVU[1] = rVu;
-		if(gnClipLeft) p->masterVU[0] |= Notification::ClipVU;
-		if(gnClipRight) p->masterVU[1] |= Notification::ClipVU;
+		notification.masterVU[0] = lVu;
+		notification.masterVU[1] = rVu;
+		if(gnClipLeft) notification.masterVU[0] |= Notification::ClipVU;
+		if(gnClipRight) notification.masterVU[1] |= Notification::ClipVU;
 		uint32 dwVuDecay = Util::muldiv(dwSamplesRead, 120000, TrackerSettings::Instance().m_dwRate) + 1;
 
 		if (lVu >= dwVuDecay) gnLVuMeter = (lVu - dwVuDecay) << 11; else gnLVuMeter = 0;

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2013-04-08 16:35:10 UTC (rev 1778)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2013-04-08 17:17:19 UTC (rev 1779)
@@ -36,7 +36,7 @@
 };
 
 
-UINT nCPUMix[8] =
+UINT nCPUMix[] =
 {
 	16,
 	24,
@@ -141,7 +141,7 @@
 
 	// Max Mixing Channels
 	{
-		for (UINT n=0; n<8; n++)
+		for (UINT n = 0; n < CountOf(nCPUMix); n++)
 		{
 			wsprintf(s, "%d (%s)", nCPUMix[n], szCPUNames[n]);
 			m_CbnPolyphony.AddString(s);
@@ -279,6 +279,7 @@
 		UpdateStereoSep();
 	}
 	// PreAmp
+	if(p == (CScrollBar *)(&m_SliderPreAmp))
 	{
 		if(m_PreAmpNoteShowed == true)
 		{
@@ -288,8 +289,7 @@
 				CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
 				if (pMainFrm) pMainFrm->SetPreAmp(64 + (n * 8));
 			}
-		}
-		else
+		} else
 		{
 			m_PreAmpNoteShowed = true;
 			Reporting::Information(str_preampChangeNote);

Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp	2013-04-08 16:35:10 UTC (rev 1778)
+++ trunk/OpenMPT/mptrack/View_smp.cpp	2013-04-08 17:17:19 UTC (rev 1779)
@@ -925,6 +925,10 @@
 //------------------------------------------
 {
 	CRect rect;
+	if(GetDocument()->GetrSoundFile().GetSample(m_nSample).pSample == nullptr)
+	{
+		return;
+	}
 	for (UINT i=0; i<MAX_CHANNELS; i++) if (m_dwNotifyPos[i] != Notification::PosInvalid)
 	{
 		rect.top = -2;

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:[1779] trunk/OpenMPT/mptrack (Page 13)

A music tracker software for Windows.

modplug-svn-commit