Thread: [OMPT-svn-commit] SF.net SVN: modplug:[4183] trunk/OpenMPT (Page 51)

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

Revision: 4183
          http://sourceforge.net/p/modplug/code/4183
Author:   saga-games
Date:     2014-07-03 21:56:48 +0000 (Thu, 03 Jul 2014)
Log Message:
-----------
[Fix] Glissando in semitones mode didn't take finetune into account.
[Fix] Pattern tab: When the main tracker window was not maximized, the note properties would wouldn't pop up at the center of the window.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp
    trunk/OpenMPT/mptrack/PatternEditorDialogs.h
    trunk/OpenMPT/mptrack/View_pat.cpp
    trunk/OpenMPT/soundlib/Sndmix.cpp

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

--- trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	2014-07-01 00:31:16 UTC (rev 4182)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.cpp	2014-07-03 21:56:48 UTC (rev 4183)
@@ -652,8 +652,8 @@
 }
 
 
-bool CEditCommand::ShowEditWindow(PATTERNINDEX pat, const PatternCursor &cursor, CWnd *parent)
-//--------------------------------------------------------------------------------------------
+bool CEditCommand::ShowEditWindow(PATTERNINDEX pat, const PatternCursor &cursor)
+//------------------------------------------------------------------------------
 {
 	editPos.pattern = pat;
 	const ROWINDEX row = editPos.row = cursor.GetRow();
@@ -703,7 +703,8 @@
 	SetWindowText(s);
 
 	SetParent(CMainFrame::GetMainFrame());
-	CenterWindow(parent);
+	// Note: Centering against a child window seems to be buggy.
+	CenterWindow(CMainFrame::GetMainFrame());
 
 	ShowWindow(SW_RESTORE);
 	return true;

Modified: trunk/OpenMPT/mptrack/PatternEditorDialogs.h
===================================================================
--- trunk/OpenMPT/mptrack/PatternEditorDialogs.h	2014-07-01 00:31:16 UTC (rev 4182)
+++ trunk/OpenMPT/mptrack/PatternEditorDialogs.h	2014-07-03 21:56:48 UTC (rev 4183)
@@ -134,7 +134,7 @@
 	CEditCommand(CSoundFile &sndFile);
 
 public:
-	bool ShowEditWindow(PATTERNINDEX pat, const PatternCursor &cursor, CWnd *parent);
+	bool ShowEditWindow(PATTERNINDEX pat, const PatternCursor &cursor);
 
 protected:
 	void InitAll() { InitNote(); InitVolume(); InitEffect(); }

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2014-07-01 00:31:16 UTC (rev 4182)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2014-07-03 21:56:48 UTC (rev 4183)
@@ -643,7 +643,7 @@
 	}
 	if (m_pEditWnd)
 	{
-		m_pEditWnd->ShowEditWindow(m_nPattern, m_Cursor, this);
+		m_pEditWnd->ShowEditWindow(m_nPattern, m_Cursor);
 		return true;
 	}
 	return false;

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2014-07-01 00:31:16 UTC (rev 4182)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2014-07-03 21:56:48 UTC (rev 4183)
@@ -1201,15 +1201,15 @@
 			}
 			pChn->m_CalculateFreq = true;
 			pChn->m_ReCalculateFreqOnFirstTick = true;
-		}
-		else
+		} else
 		{
-			//IT playback compatibility 01 & 02
 			if(IsCompatibleMode(TRK_IMPULSETRACKER))
 			{
+				//IT playback compatibility 01 & 02
+
 				// Pattern delay restarts tick counting. Not quite correct yet!
 				const UINT tick = m_PlayState.m_nTickCount % (m_PlayState.m_nMusicSpeed + m_PlayState.m_nFrameDelay);
-				if(pChn->nArpeggio >> 4 != 0 || (pChn->nArpeggio & 0x0F) != 0)
+				if(pChn->nArpeggio != 0)
 				{
 					switch(tick % 3)
 					{
@@ -1217,9 +1217,7 @@
 					case 2: period = Util::Round<int>(period / TwoToPowerXOver12(pChn->nArpeggio & 0x0F)); break;
 					}
 				}
-			}
-			// FastTracker 2: Swedish tracker logic (TM) arpeggio
-			else if(IsCompatibleMode(TRK_FASTTRACKER2))
+			} else if(IsCompatibleMode(TRK_FASTTRACKER2))
 			{
 				uint8 note = pChn->nNote;
 				int arpPos = 0;
@@ -1245,7 +1243,6 @@
 					note = 108 + NOTE_MIN; // FT2's note limit
 
 				period = GetPeriodFromNote(note, pChn->nFineTune, pChn->nC5Speed);
-
 			}
 			// Other trackers
 			else
@@ -1832,7 +1829,15 @@
 				{
 					// Only recompute this whole thing in case the base period has changed.
 					pChn->cachedPeriod = period;
-					pChn->glissandoPeriod = GetPeriodFromNote(GetNoteFromPeriod(period), pChn->nFineTune, pChn->nC5Speed);
+					for(uint32 i = NOTE_MIN; i < NOTE_MAX; i++)
+					{
+						int32 n = GetPeriodFromNote(i, pChn->nFineTune, pChn->nC5Speed);
+						if(n > 0 && n <= period)
+						{
+							pChn->glissandoPeriod = n;
+							break;
+						}
+					}
 				}
 				period = pChn->glissandoPeriod;
 			}
@@ -2274,23 +2279,23 @@
 	} 
 
 	// calculate ramping step
-	long step = 0;
+	int32 step = 0;
 	if (m_PlayState.m_nSamplesToGlobalVolRampDest > 0)
 	{
 
 		// Still some ramping left to do.
-		long highResGlobalVolumeDestination = static_cast<long>(m_PlayState.m_nGlobalVolumeDestination) << VOLUMERAMPPRECISION;
+		int32 highResGlobalVolumeDestination = static_cast<int32>(m_PlayState.m_nGlobalVolumeDestination) << VOLUMERAMPPRECISION;
 
 		const long delta = highResGlobalVolumeDestination - m_PlayState.m_lHighResRampingGlobalVolume;
 		step = delta / static_cast<long>(m_PlayState.m_nSamplesToGlobalVolRampDest);
 
 		// Define max step size as some factor of user defined ramping value: the lower the value, the more likely the click.
 		// If step is too big (might cause click), extend ramp length.
-		UINT maxStep = MAX(50, (10000 / (m_PlayState.m_nGlobalVolumeRampAmount + 1)));
-		while(static_cast<UINT>(abs(step)) > maxStep)
+		int32 maxStep = std::max(50, (10000 / (m_PlayState.m_nGlobalVolumeRampAmount + 1)));
+		while(abs(step) > maxStep)
 		{
 			m_PlayState.m_nSamplesToGlobalVolRampDest += m_PlayState.m_nGlobalVolumeRampAmount;
-			step = delta / static_cast<long>(m_PlayState.m_nSamplesToGlobalVolRampDest);
+			step = delta / static_cast<int32>(m_PlayState.m_nSamplesToGlobalVolRampDest);
 		}
 	}
 

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:[4183] trunk/OpenMPT (Page 51)

A music tracker software for Windows.

modplug-svn-commit