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

[<sag...@us...>]

Revision: 1371
          http://modplug.svn.sourceforge.net/modplug/?rev=1371&view=rev
Author:   saga-games
Date:     2012-10-04 17:16:19 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
[Mod] Changed default resampling type to XMMS-ModPlug
[Mod] Scrollwheel improvements in pattern/instrument editor (http://bugs.openmpt.org/view.php?id=99#c904)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/mptrack/Ctrl_pat.cpp
    trunk/OpenMPT/mptrack/Mpdlgs.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/soundlib/Snd_defs.h

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2012-09-29 22:06:17 UTC (rev 1370)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2012-10-04 17:16:19 UTC (rev 1371)
@@ -2389,7 +2389,7 @@
 //----------------------------------------------------------------------
 {
 	CModControlDlg::OnVScroll(nCode, nPos, pSB);
-	if (nCode == SB_ENDSCROLL) SwitchToView();
+	//if (nCode == SB_ENDSCROLL) SwitchToView();
 }
 
 

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2012-09-29 22:06:17 UTC (rev 1370)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2012-10-04 17:16:19 UTC (rev 1371)
@@ -654,10 +654,10 @@
 		m_CbnInstrument.SetCurSel(nins);
 		OnInstrumentChanged();
 	}
-	if ((nSBCode == SB_ENDSCROLL) && (m_hWndView))
-	{
-		SwitchToView();
-	}
+// 	if ((nSBCode == SB_ENDSCROLL) && (m_hWndView))
+// 	{
+// 		SwitchToView();
+// 	}
 }
 
 

Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp	2012-09-29 22:06:17 UTC (rev 1370)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp	2012-10-04 17:16:19 UTC (rev 1371)
@@ -195,11 +195,11 @@
 		}
 		COMBOBOXEXITEM cbi;
 		UINT iItem = 0;
-		for (UINT nDevType=0; nDevType<SNDDEV_NUM_DEVTYPES; nDevType++)
+		for (UINT nDevType = 0; nDevType < SNDDEV_NUM_DEVTYPES; nDevType++)
 		{
 			UINT nDev = 0;
 
-			while (EnumerateSoundDevices(nDevType, nDev, s, sizeof(s)))
+			while (EnumerateSoundDevices(nDevType, nDev, s, CountOf(s)))
 			{
 				cbi.mask = CBEIF_IMAGE | CBEIF_LPARAM | CBEIF_TEXT | CBEIF_SELECTEDIMAGE | CBEIF_OVERLAY;
 				cbi.iItem = iItem;
@@ -602,7 +602,7 @@
 	char s[10] = "";
 	switch (dwSrcMode)
 	{
-		case SRCMODE_POLYPHASE:
+	case SRCMODE_POLYPHASE:
 		m_CbnWFIRType.AddString("Kaiser 8 Tap");
 		m_CbnWFIRType.SetCurSel(0);
 		m_CbnWFIRType.EnableWindow(FALSE);
@@ -633,16 +633,15 @@
 	OnSettingsChanged();
 }
 
+
 void COptionsPlayer::OnDefaultResampling()
+//----------------------------------------
 {
-	//CMainFrame::GetSettings().gbWFIRType = 7; //WFIR_KAISER4T
-	//CMainFrame::GetSettings().gdWFIRCutoff = 0.97;
-	//CMainFrame::GetSettings().m_nSrcMode = SRCMODE_POLYPHASE
-	//CMainFrame::glVolumeRampSamples = 42;
-	m_CbnResampling.SetCurSel(SRCMODE_POLYPHASE);
+	m_CbnResampling.SetCurSel(SRCMODE_FIRFILTER);
 	OnResamplerChanged();
+	m_CbnWFIRType.SetCurSel(7 /*WFIR_KAISER4T*/);
 	m_CEditWFIRCutoff.SetWindowText("97");
-	m_CEditRampUp.SetWindowText("42");
+	m_CEditRampUp.SetWindowText("16");
 	m_CEditRampDown.SetWindowText("42");
 	
 }

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2012-09-29 22:06:17 UTC (rev 1370)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2012-10-04 17:16:19 UTC (rev 1371)
@@ -63,7 +63,7 @@
 	m_dwSoundSetup = SOUNDSETUP_SECONDARY;
 	m_nChannels = 2;
 	m_dwQuality = 0;
-	m_nSrcMode = SRCMODE_POLYPHASE;
+	m_nSrcMode = SRCMODE_FIRFILTER;
 	m_nBitsPerSample = 16;
 	m_nPreAmp = 128;
 	gbLoopSong = TRUE;
@@ -390,7 +390,7 @@
 	orderlistMargins = GetPrivateProfileInt("Pattern Editor", "DefaultSequenceMargins", orderlistMargins, iniFile);
 	gbShowHackControls = (0 != CMainFrame::GetPrivateProfileDWord("Misc", "ShowHackControls", gbShowHackControls ? 1 : 0, iniFile));
 	CSoundFile::s_DefaultPlugVolumeHandling = static_cast<uint8>(GetPrivateProfileInt("Misc", "DefaultPlugVolumeHandling", CSoundFile::s_DefaultPlugVolumeHandling, iniFile));
-	if(CSoundFile::s_DefaultPlugVolumeHandling > 2) CSoundFile::s_DefaultPlugVolumeHandling = PLUGIN_VOLUMEHANDLING_IGNORE;
+	if(CSoundFile::s_DefaultPlugVolumeHandling >= PLUGIN_VOLUMEHANDLING_MAX) CSoundFile::s_DefaultPlugVolumeHandling = PLUGIN_VOLUMEHANDLING_IGNORE;
 
 	m_nSampleUndoMaxBuffer = CMainFrame::GetPrivateProfileLong("Sample Editor" , "UndoBufferSize", m_nSampleUndoMaxBuffer >> 20, iniFile);
 	m_nSampleUndoMaxBuffer = max(1, m_nSampleUndoMaxBuffer) << 20;

Modified: trunk/OpenMPT/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h	2012-09-29 22:06:17 UTC (rev 1370)
+++ trunk/OpenMPT/soundlib/Snd_defs.h	2012-10-04 17:16:19 UTC (rev 1371)
@@ -358,6 +358,7 @@
 	PLUGIN_VOLUMEHANDLING_DRYWET,
 	PLUGIN_VOLUMEHANDLING_IGNORE,
 	PLUGIN_VOLUMEHANDLING_CUSTOM,
+	PLUGIN_VOLUMEHANDLING_MAX,
 };
 
 // filtermodes

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