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

[<re...@us...>]

Revision: 191
          http://svn.sourceforge.net/modplug/?rev=191&view=rev
Author:   rewbs
Date:     2007-07-11 13:36:02 -0700 (Wed, 11 Jul 2007)

Log Message:
-----------
. <rewbs> Fix pattern search, which could search for the wrong param. Also enable typing of desired param value rather than only selecting from listbox. (http://lpchip.com/modplug/viewtopic.php?t=1799)
. <rewbs> Delay-load winhttp.dll and don't die if it can't be found, e.g. on win98. (http://lpchip.com/modplug/viewtopic.php?t=1778)
. <rewbs> Fix a couple of pixels on D# in the pattern editor small font bitmap. (http://lpchip.com/modplug/viewtopic.php?t=1781)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Moddoc.h
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/dlg_misc.cpp
    trunk/OpenMPT/mptrack/dlg_misc.h
    trunk/OpenMPT/mptrack/mptrack.rc
    trunk/OpenMPT/mptrack/mptrack.vcproj
    trunk/OpenMPT/mptrack/res/view_pat.bmp

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2007-07-11 20:36:02 UTC (rev 191)
@@ -2236,7 +2236,17 @@
 	return gFXInfo[ndx].dwEffect;
 }
 
+UINT CModDoc::GetEffectMaskFromIndex(UINT ndx)
+//-------------------------------------------------------
+{
+	if (ndx >= MAX_FXINFO) {
+		return 0;
+	}
 
+	return gFXInfo[ndx].dwParamValue;
+
+}
+
 BOOL CModDoc::GetEffectInfo(UINT ndx, LPSTR s, BOOL bXX, DWORD *prangeMin, DWORD *prangeMax)
 //------------------------------------------------------------------------------------------
 {

Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/Moddoc.h	2007-07-11 20:36:02 UTC (rev 191)
@@ -125,6 +125,7 @@
 	BOOL GetEffectInfo(UINT ndx, LPSTR s, BOOL bXX=FALSE, DWORD *prangeMin=NULL, DWORD *prangeMax=NULL);
 	LONG GetIndexFromEffect(UINT command, UINT param);
 	UINT GetEffectFromIndex(UINT ndx, int &refParam);
+	UINT GetEffectMaskFromIndex(UINT ndx);
 	BOOL GetEffectNameEx(LPSTR pszName, UINT ndx, UINT param);
 	BOOL IsExtendedEffect(UINT ndx) const;
 	UINT MapValueToPos(UINT ndx, UINT param);

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2007-07-11 20:36:02 UTC (rev 191)
@@ -787,7 +787,13 @@
 	m_bInitialized = TRUE;
 
 	if (CMainFrame::gnCheckForUpdates) {
-		UpdateCheck();
+		try {
+			UpdateCheck();
+		} catch (...) {
+			// Could not do update check. Don't compain - do nothing.
+			// Assuming winhttp.dll is set as delay-load in the project settings,
+			// we will end up here if the dll cannot be foung (e.g. on win98).
+		}
 	}
 
 	// Open settings if this is the previous execution was with an earlier version.

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2007-07-11 20:36:02 UTC (rev 191)
@@ -2189,7 +2189,7 @@
 			CString processMethod = (m_pEffect->flags & effFlagsCanReplacing) ? "processReplacing" : "process";
 			CVstPluginManager::ReportPlugException("The plugin %s threw an exception in %s. It has automatically been set to \"Bypass\".", m_pMixStruct->Info.szName, processMethod);
 			ClearVSTEvents();
-			SetEvent(processCalled);
+//			SetEvent(processCalled);
 		}
 
 		//mix outputs of multi-output VSTs:

Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp	2007-07-11 20:36:02 UTC (rev 191)
@@ -753,17 +753,21 @@
 		m_nVol = combo->GetItemData(combo->GetCurSel());
 	}
 	// Effect
-	m_nParam = 0;
-	if (((combo = (CComboBox *)GetDlgItem(IDC_COMBO5)) != NULL) && (m_pModDoc))
-	{
-		int n = -1;
-		m_nCommand = m_pModDoc->GetEffectFromIndex(combo->GetItemData(combo->GetCurSel()), n);
-		if (n >= 0) m_nParam = n;
+	int effectIndex = -1;
+	if (((combo = (CComboBox *)GetDlgItem(IDC_COMBO5)) != NULL) && (m_pModDoc)) {
+		int n = -1; // unused parameter adjustment
+		effectIndex = combo->GetItemData(combo->GetCurSel());
+		m_nCommand = m_pModDoc->GetEffectFromIndex(effectIndex, n);
 	}
 	// Param
-	if ((combo = (CComboBox *)GetDlgItem(IDC_COMBO6)) != NULL)
-	{
-		m_nParam |= combo->GetItemData(combo->GetCurSel());
+	m_nParam = 0;
+	if ((combo = (CComboBox *)GetDlgItem(IDC_COMBO6)) != NULL) {
+		m_nParam = combo->GetItemData(combo->GetCurSel());
+
+		// Apply parameter value mask if required (e.g. SDx has mask D0).
+		if (effectIndex > -1) {
+			m_nParam |= m_pModDoc->GetEffectMaskFromIndex(effectIndex);
+		}
 	}
 	// Min/Max channels
 	if (!m_bReplace)

Modified: trunk/OpenMPT/mptrack/dlg_misc.h
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.h	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/dlg_misc.h	2007-07-11 20:36:02 UTC (rev 191)
@@ -257,6 +257,7 @@
 };
 
 
+
 //=======================================
 class CEditCommand: public CPropertySheet
 //=======================================

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2007-07-11 20:36:02 UTC (rev 191)
@@ -1133,10 +1133,10 @@
     CONTROL         "",IDC_TABCTRL1,"SysTabControl32",0x0,0,0,412,14
 END
 
-IDD_EDIT_FIND DIALOG  0, 0, 182, 145
+IDD_EDIT_FIND DIALOGEX 0, 0, 182, 145
 STYLE DS_SETFONT | WS_CHILD | WS_CAPTION
 CAPTION "Find"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     GROUPBOX        "Search for:",IDC_STATIC,4,4,174,107
     CONTROL         "Note",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -1161,8 +1161,8 @@
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "Effect Data",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,117,78,52,10
-    COMBOBOX        IDC_COMBO6,117,92,48,68,CBS_DROPDOWNLIST | WS_VSCROLL | 
-                    WS_TABSTOP
+    COMBOBOX        IDC_COMBO6,117,92,48,68,CBS_DROPDOWNLIST | CBS_SORT | 
+                    WS_VSCROLL | WS_TABSTOP
     CONTROL         "Find in current pattern",IDC_RADIO1,"Button",
                     BS_AUTORADIOBUTTON,6,117,88,10
     CONTROL         "Find in the whole song",IDC_RADIO2,"Button",
@@ -1264,7 +1264,6 @@
 CAPTION "Effect"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    LTEXT           "Value:",IDC_TEXT1,103,3,115,8
     COMBOBOX        IDC_COMBO1,0,15,102,83,CBS_DROPDOWNLIST | CBS_SORT | 
                     WS_VSCROLL | WS_TABSTOP
     CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | 
@@ -1276,6 +1275,7 @@
     CONTROL         "",IDC_SLIDER2,"msctls_trackbar32",TBS_BOTH | 
                     TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,134,0,43,12
     LTEXT           "Effect Type:",IDC_STATIC,54,1,19,8,NOT WS_VISIBLE
+    LTEXT           "Value:",IDC_TEXT1,103,3,23,8
 END
 
 IDD_SAMPLE_AMPLIFY DIALOGEX 0, 0, 175, 66

Modified: trunk/OpenMPT/mptrack/mptrack.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.vcproj	2007-06-17 18:42:09 UTC (rev 190)
+++ trunk/OpenMPT/mptrack/mptrack.vcproj	2007-07-11 20:36:02 UTC (rev 191)
@@ -51,6 +51,7 @@
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="..\xsoundlib\Debug"
+				DelayLoadDLLs="winhttp.dll"
 				GenerateDebugInformation="TRUE"
 				AssemblyDebug="1"
 				ProgramDatabaseFile=".\Debug/mptrack.pdb"
@@ -95,7 +96,9 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHsc"
-				InlineFunctionExpansion="1"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
 				OptimizeForWindowsApplication="TRUE"
 				AdditionalIncludeDirectories="..\unlha,..\unzip,..\unrar,..\soundlib,..\include,..\xsoundlib"
 				PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,ENABLE_MMX,ENABLE_EQ,MODPLUG_TRACKER,NO_PACKING,HAVE_DOT_NET,ENABLE_AMD,ENABLE_SSE,ENABLE_AMDNOW"
@@ -868,9 +871,6 @@
 				RelativePath=".\res\moddoc.ico">
 			</File>
 			<File
-				RelativePath=".\res\modplthingmorecontrast.bmp">
-			</File>
-			<File
 				RelativePath=".\res\MPTRACK.bmp">
 			</File>
 			<File
@@ -895,9 +895,6 @@
 				RelativePath=".\Res\smptoolb.bmp">
 			</File>
 			<File
-				RelativePath=".\Res\splash.bmp">
-			</File>
-			<File
 				RelativePath=".\res\splashno.bmp">
 			</File>
 			<File
@@ -992,6 +989,9 @@
 				RelativePath=".\mod2wave.h">
 			</File>
 			<File
+				RelativePath="..\soundlib\modcommand.h">
+			</File>
+			<File
 				RelativePath=".\moddoc.h">
 			</File>
 			<File

Modified: trunk/OpenMPT/mptrack/res/view_pat.bmp
===================================================================
(Binary files differ)


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