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

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

Revision: 1536
          http://sourceforge.net/p/modplug/code/1536
Author:   saga-games
Date:     2013-02-17 20:55:03 +0000 (Sun, 17 Feb 2013)
Log Message:
-----------
[Imp] VST: If no default preset directory is specified, the plugin's directory is suggested by default.
[Imp] VST: If no preset data is on the clipboard, the paste menu is greyed out.
[Imp] VST: Better preset list creation for plugins that don't support retrieval of indexed program names (such as VOPM).

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
    trunk/OpenMPT/mptrack/View_gen.cpp
    trunk/OpenMPT/mptrack/View_gen.h
    trunk/OpenMPT/mptrack/VstPresets.cpp
    trunk/OpenMPT/mptrack/VstPresets.h
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/Vstplug.h
    trunk/OpenMPT/mptrack/mptrack.rc

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

--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2013-02-17 20:55:03 UTC (rev 1536)
@@ -106,28 +106,10 @@
 void CAbstractVstEditor::OnLoadPreset()
 //-------------------------------------
 {
-	if(!m_pVstPlugin) return;
-
-	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(true, "fxp", "",
-		"VST Plugin Programs and Banks (*.fxp,*.fxb)|*.fxp;*.fxb|"
-		"VST Plugin Programs (*.fxp)|*.fxp|"
-		"VST Plugin Banks (*.fxb)|*.fxb|"
-		"All Files|*.*||",
-		CMainFrame::GetSettings().GetWorkingDirectory(DIR_PLUGINPRESETS));
-	if(files.abort) return;
-
-	CMainFrame::GetSettings().SetWorkingDirectory(files.workingDirectory.c_str(), DIR_PLUGINPRESETS, true);
-
-	const char *retVal = m_pVstPlugin->LoadProgram(files.first_file.c_str());
-	if(retVal == nullptr)
+	if(m_pVstPlugin && m_pVstPlugin->LoadProgram())
 	{
-		if(m_pVstPlugin->GetModDoc() != nullptr)
-			m_pVstPlugin->GetModDoc()->SetModified();
 		UpdatePresetMenu(true);
 		UpdatePresetField();
-	} else
-	{
-		Reporting::Error(retVal, "Plugin Preset");
 	}
 }
 
@@ -135,20 +117,10 @@
 void CAbstractVstEditor::OnSavePreset()
 //-------------------------------------
 {
-	if(!m_pVstPlugin) return;
-
-	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, "fxp", "",
-		"VST Plugin Programs (*.fxp)|*.fxp|"
-		"VST Plugin Banks (*.fxb)|*.fxb||",
-		CMainFrame::GetSettings().GetWorkingDirectory(DIR_PLUGINPRESETS));
-	if(files.abort) return;
-
-	CMainFrame::GetSettings().SetWorkingDirectory(files.workingDirectory.c_str(), DIR_PLUGINPRESETS, true);
-
-	//TODO: exception handling
-	if (!(m_pVstPlugin->SaveProgram(files.first_file.c_str())))
-		Reporting::Error("Error saving preset.");
-
+	if(m_pVstPlugin)
+	{
+		m_pVstPlugin->SaveProgram();
+	}
 }
 
 
@@ -187,7 +159,7 @@
 	if(m_pVstPlugin == nullptr || CMainFrame::GetMainFrame() == nullptr) return;
 
 	BeginWaitCursor();
-	if (CMainFrame::GetMainFrame()->OpenClipboard())
+	if(CMainFrame::GetMainFrame()->OpenClipboard())
 	{
 		HGLOBAL hCpy = ::GetClipboardData(clipboardFormat);
 		const char *p;
@@ -195,7 +167,8 @@
 		if(hCpy != nullptr && (p = static_cast<const char *>(GlobalLock(hCpy))) != nullptr)
 		{
 			FileReader file(p, GlobalSize(hCpy));
-			if(VSTPresets::LoadFile(file, *m_pVstPlugin) == VSTPresets::noError)
+			VSTPresets::ErrorCode error = VSTPresets::LoadFile(file, *m_pVstPlugin);
+			if(error == VSTPresets::noError)
 			{
 				CSoundFile *pSndFile = m_pVstPlugin->m_pSndFile;
 				CModDoc *pModDoc;
@@ -205,7 +178,7 @@
 				}
 			} else
 			{
-				Reporting::Error("Error loading preset from clipboard. Are you sure it is for this plugin?");
+				Reporting::Error(VSTPresets::GetErrorMessage(error));
 			}
 			GlobalUnlock(hCpy);
 		}
@@ -258,7 +231,7 @@
 			m_pMenu->AppendMenu(MF_BYPOSITION|MF_DISABLED, 0, TEXT(""));
 		}
 
-		m_pMenu->ModifyMenu(8, MF_BYPOSITION, 0, m_pVstPlugin->GetFormattedProgramName(m_pVstPlugin->GetCurrentProgram(), true));
+		m_pMenu->ModifyMenu(8, MF_BYPOSITION, 0, m_pVstPlugin->GetFormattedProgramName(m_pVstPlugin->GetCurrentProgram()));
 	}
 	
 	DrawMenuBar();
@@ -434,7 +407,7 @@
 				return false;
 
 			if(!m_pVstPlugin->isInstrument() || pModDoc->GetSoundFile()->GetModSpecifications().instrumentsMax == 0 ||
-				Reporting::Confirm(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), false, false, this) == cnfNo)
+				Reporting::Confirm(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), false, false) == cnfNo)
 			{
 				return false;
 			} else
@@ -457,10 +430,24 @@
 void CAbstractVstEditor::OnMenuSelect(UINT nItemID, UINT nFlags, HMENU)
 //---------------------------------------------------------------------
 {
-	if((nFlags & MF_POPUP) && nItemID == 1)
+	if(!(nFlags & MF_POPUP))
 	{
+		return;
+	}
+	switch(nItemID)
+	{
+	case 0:
+		// Grey out paste menu item.
+		if(CMainFrame::GetMainFrame() && CMainFrame::GetMainFrame()->OpenClipboard())
+		{
+			m_pMenu->EnableMenuItem(ID_EDIT_PASTE, MF_BYCOMMAND | (::GetClipboardData(clipboardFormat) != nullptr ? 0 : MF_GRAYED));
+			CloseClipboard();
+		}
+		break;
+	case 1:
 		// Generate preset menu on click.
 		FillPresetMenu();
+		break;
 	}
 }
 
@@ -506,7 +493,7 @@
 
 	for(VstInt32 p = 0; p < numProgs; p++)
 	{
-		CString programName = m_pVstPlugin->GetFormattedProgramName(p, p == curProg);
+		CString programName = m_pVstPlugin->GetFormattedProgramName(p);
 		UINT splitMenuFlag = 0;
 
 		if(entryInThisMenu++ == PRESETS_PER_GROUP)

Modified: trunk/OpenMPT/mptrack/View_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/View_gen.cpp	2013-02-17 20:55:03 UTC (rev 1536)
@@ -561,6 +561,20 @@
 }
 
 
+CVstPlugin *CViewGlobals::GetCurrentPlugin() const
+//------------------------------------------------
+{
+	CModDoc *pModDoc = GetDocument();
+	CSoundFile *pSndFile = pModDoc ? pModDoc->GetSoundFile() : nullptr;
+	if(pSndFile == nullptr || m_nCurrentPlugin >= MAX_MIXPLUGINS)
+	{
+		return nullptr;
+	}
+
+	return dynamic_cast<CVstPlugin *>(pSndFile->m_MixPlugins[m_nCurrentPlugin].pMixPlugin);
+}
+
+
 void CViewGlobals::OnTabSelchange(NMHDR*, LRESULT* pResult)
 //---------------------------------------------------------
 {
@@ -568,6 +582,7 @@
 	if (pResult) *pResult = 0;
 }
 
+
 void CViewGlobals::OnMute(const CHANNELINDEX chnMod4, const UINT itemID)
 //----------------------------------------------------------------------
 {
@@ -708,7 +723,7 @@
 				CSoundFile *pSndFile = pModDoc->GetSoundFile();
 				SNDMIXPLUGIN &plugin = pSndFile->m_MixPlugins[m_nCurrentPlugin];
 
-				if (plugin.pMixPlugin)
+				if(plugin.pMixPlugin)
 				{	
 					wsprintf(s, "(%d%% wet, %d%% dry)", 100 - n, n);
 					SetDlgItemText(IDC_STATIC8, s);
@@ -729,13 +744,12 @@
 			if ((n >= 0) && (n <= 100) && (m_nCurrentPlugin < MAX_MIXPLUGINS))
 			{
 				CSoundFile *pSndFile = pModDoc->GetSoundFile();
-				SNDMIXPLUGIN &plugin = pSndFile->m_MixPlugins[m_nCurrentPlugin];
+				CVstPlugin *pVstPlugin = GetCurrentPlugin();
 
-				if (plugin.pMixPlugin)
+				if(pVstPlugin != nullptr)
 				{
-					CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(plugin.pMixPlugin);
 					const PlugParamIndex nParams = pVstPlugin->GetNumParameters();
-					if (m_nCurrentParam < nParams)
+					if(m_nCurrentParam < nParams)
 					{
 						FLOAT fValue = 0.01f * n;
 						wsprintf(s, "%d.%02d", n/100, n%100);
@@ -957,20 +971,15 @@
 //---------------------------------
 {
 	int cursel = m_CbnParam.GetItemData(m_CbnParam.GetCurSel());
-	CModDoc *pModDoc = GetDocument();
 	CHAR s[256];
-	CSoundFile *pSndFile;
 	
-	if ((m_nCurrentPlugin >= MAX_MIXPLUGINS) || (!pModDoc)) return;
-	pSndFile = pModDoc->GetSoundFile();
-	SNDMIXPLUGIN &plugin = pSndFile->m_MixPlugins[m_nCurrentPlugin];
+	CVstPlugin *pVstPlugin = GetCurrentPlugin();
 
-	if (plugin.pMixPlugin && cursel != CB_ERR)
+	if(pVstPlugin != nullptr && cursel != CB_ERR)
 	{
-		CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(plugin.pMixPlugin);
 		const PlugParamIndex nParams = pVstPlugin->GetNumParameters();
-		if ((cursel >= 0) && (cursel < nParams)) m_nCurrentParam = cursel;
-		if (m_nCurrentParam < nParams)
+		if(cursel >= 0 && cursel < nParams) m_nCurrentParam = cursel;
+		if(m_nCurrentParam < nParams)
 		{
 			wsprintf(s, "Value: %s", pVstPlugin->GetFormattedParamValue(m_nCurrentParam));
 			SetDlgItemText(IDC_TEXT5, s);
@@ -998,14 +1007,13 @@
 	
 	if ((m_nCurrentPlugin >= MAX_MIXPLUGINS) || (!pModDoc)) return;
 	pSndFile = pModDoc->GetSoundFile();
-	SNDMIXPLUGIN &plugin = pSndFile->m_MixPlugins[m_nCurrentPlugin];
+	CVstPlugin *pVstPlugin = GetCurrentPlugin();
 
-	if (plugin.pMixPlugin)
+	if(pVstPlugin != nullptr)
 	{
-		CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(plugin.pMixPlugin);
 		UINT nParams = pVstPlugin->GetNumPrograms();
-		if ((cursel > 0) && (cursel <= (int)nParams)) m_nCurrentPreset = cursel;
-		if (m_nCurrentPreset > 0 && m_nCurrentPreset <= nParams)
+		if(cursel > 0 && cursel <= (int)nParams) m_nCurrentPreset = cursel;
+		if(m_nCurrentPreset > 0 && m_nCurrentPreset <= nParams)
 		{
 			pVstPlugin->SetCurrentProgram(m_nCurrentPreset - 1);
 			// Update parameter display
@@ -1019,68 +1027,27 @@
 void CViewGlobals::OnLoadParam()
 //------------------------------
 {
-	CModDoc *pModDoc = GetDocument();
-	CSoundFile *pSndFile = pModDoc ? pModDoc->GetSoundFile() : nullptr;
-	if(pSndFile == nullptr)
+	CVstPlugin *pVstPlugin = GetCurrentPlugin();
+	if(pVstPlugin != nullptr && pVstPlugin->LoadProgram())
 	{
-		return;
+		m_nCurrentPreset = 0;
+		m_CbnPreset.SetRedraw(FALSE);
+		m_CbnPreset.ResetContent();
+		m_CbnPreset.SetItemData(m_CbnPreset.AddString(_T("current")), 0);
+		m_CbnPreset.SetRedraw(TRUE);
+		m_CbnPreset.SetCurSel(0);
 	}
-
-	CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(pSndFile->m_MixPlugins[m_nCurrentPlugin].pMixPlugin);
-
-	if(pVstPlugin == nullptr)
-	{
-		return;
-	}
-
-	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(true, "fxp", "",
-		"VST Plugin Programs and Banks (*.fxp,*.fxb)|*.fxp;*.fxb|"
-		"VST Plugin Programs (*.fxp)|*.fxp|"
-		"VST Plugin Banks (*.fxb)|*.fxb|"
-		"All Files|*.*||",
-		CMainFrame::GetSettings().GetDefaultDirectory(DIR_PLUGINPRESETS));
-	if(files.abort) return;
-	
-	const char *retVal = pVstPlugin->LoadProgram(files.first_file.c_str());
-	if(retVal == nullptr)
-	{
-		if(pSndFile->GetModSpecifications().supportsPlugins)
-			pModDoc->SetModified();
-	} else
-	{
-		Reporting::Error(retVal, "Plugin Preset");
-	}
 }
 
 void CViewGlobals::OnSaveParam()
 //------------------------------
 {
-	CModDoc *pModDoc = GetDocument();
-	CSoundFile *pSndFile = pModDoc ? pModDoc->GetSoundFile() : nullptr;
-	if(pSndFile == nullptr)
+	CVstPlugin *pVstPlugin = GetCurrentPlugin();
+	if(pVstPlugin != nullptr)
 	{
-		return;
+		pVstPlugin->SaveProgram();
 	}
-
-	CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(pSndFile->m_MixPlugins[m_nCurrentPlugin].pMixPlugin);
-
-	if(pVstPlugin == nullptr)
-	{
-		return;
-	}
-	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, "fxp", "",
-		"VST Plugin Programs (*.fxp)|*.fxp|"
-		"VST Plugin Banks (*.fxb)|*.fxb||",
-		CMainFrame::GetSettings().GetDefaultDirectory(DIR_PLUGINPRESETS));
-	if(files.abort) return;
-
-	//TODO: exception handling
-	if (!(pVstPlugin->SaveProgram(files.first_file.c_str())))
-		Reporting::Error("Error saving preset.");
-	//end rewbs.fxpPresets
-
 }
-// -! NEW_FEATURE#0002
 
 
 void CViewGlobals::OnSetParameter()
@@ -1091,11 +1058,10 @@
 	
 	if ((m_nCurrentPlugin >= MAX_MIXPLUGINS) || (!pModDoc)) return;
 	pSndFile = pModDoc->GetSoundFile();
-	SNDMIXPLUGIN &plugin = pSndFile->m_MixPlugins[m_nCurrentPlugin];
+	CVstPlugin *pVstPlugin = GetCurrentPlugin();
 
-	if (plugin.pMixPlugin != nullptr)
+	if(pVstPlugin != nullptr)
 	{
-		CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(plugin.pMixPlugin);
 		const PlugParamIndex nParams = pVstPlugin->GetNumParameters();
 		CHAR s[32];
 		GetDlgItemText(IDC_EDIT14, s, sizeof(s));
@@ -1103,7 +1069,7 @@
 		{
 			FLOAT fValue = (FLOAT)atof(s);
 			pVstPlugin->SetParameter(m_nCurrentParam, fValue);
-            OnParamChanged();
+			OnParamChanged();
 			if(pSndFile->GetModSpecifications().supportsPlugins)
 				pModDoc->SetModified();
 		}
@@ -1488,11 +1454,7 @@
 	if(m_CbnParam.GetCount() > 1)
 		return;
 
-	if(GetDocument() ==  nullptr) return;
-	CSoundFile *pSndFile = GetDocument()->GetSoundFile();
-	if(pSndFile == nullptr) return;
-	if (m_nCurrentPlugin >= MAX_MIXPLUGINS) m_nCurrentPlugin = 0;
-	CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(pSndFile->m_MixPlugins[m_nCurrentPlugin].pMixPlugin);
+	CVstPlugin *pVstPlugin = GetCurrentPlugin();
 	if(pVstPlugin == nullptr) return;
 
 	const PlugParamIndex nParams = pVstPlugin->GetNumParameters();
@@ -1518,21 +1480,16 @@
 	if(m_CbnPreset.GetCount() > 1)
 		return;
 
-	if(GetDocument() ==  nullptr) return;
-	CSoundFile *pSndFile = GetDocument()->GetSoundFile();
-	if(pSndFile == nullptr) return;
-	if (m_nCurrentPlugin >= MAX_MIXPLUGINS) m_nCurrentPlugin = 0;
-	CVstPlugin *pVstPlugin = dynamic_cast<CVstPlugin *>(pSndFile->m_MixPlugins[m_nCurrentPlugin].pMixPlugin);
+	CVstPlugin *pVstPlugin = GetCurrentPlugin();
 	if(pVstPlugin == nullptr) return;
 
 	UINT nProg = pVstPlugin->GetNumPrograms();
-	UINT curProg = pVstPlugin->GetCurrentProgram();
 	m_CbnPreset.SetRedraw(FALSE);
 	m_CbnPreset.ResetContent();
 	m_CbnPreset.SetItemData(m_CbnPreset.AddString(_T("current")), 0);
 	for (UINT i = 0; i < nProg; i++)
 	{
-		m_CbnPreset.SetItemData(m_CbnPreset.AddString(pVstPlugin->GetFormattedProgramName(i, i == curProg)), i + 1);
+		m_CbnPreset.SetItemData(m_CbnPreset.AddString(pVstPlugin->GetFormattedProgramName(i)), i + 1);
 	}
 	m_nCurrentPreset = 0;
 	m_CbnPreset.SetRedraw(TRUE);

Modified: trunk/OpenMPT/mptrack/View_gen.h
===================================================================
--- trunk/OpenMPT/mptrack/View_gen.h	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/View_gen.h	2013-02-17 20:55:03 UTC (rev 1536)
@@ -94,6 +94,8 @@
 	void OnEditName(const CHANNELINDEX chnMod4, const UINT itemID);
 	void OnFxChanged(const CHANNELINDEX chnMod4);
 
+	CVstPlugin *GetCurrentPlugin() const;
+
 protected:
 	//{{AFX_MSG(CViewGlobals)
 	afx_msg void OnMute1();

Modified: trunk/OpenMPT/mptrack/VstPresets.cpp
===================================================================
--- trunk/OpenMPT/mptrack/VstPresets.cpp	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/VstPresets.cpp	2013-02-17 20:55:03 UTC (rev 1536)
@@ -243,4 +243,23 @@
 	WriteBE(u.i, f);
 }
 
+
+// Translate error code to string. Returns nullptr if there was no error.
+const char *VSTPresets::GetErrorMessage(ErrorCode code)
+//-----------------------------------------------------
+{
+	switch(code)
+	{
+	case VSTPresets::invalidFile:
+		return "This does not appear to be a valid preset file.";
+	case VSTPresets::wrongPlugin:
+		return "This file appears to be for a different plugin.";
+	case VSTPresets::outdatedPlugin:
+		return "This file is for a newer version of this plugin.";
+	case VSTPresets::wrongParameters:
+		return "The number of parameters in this file is incompatible with the current plugin.";
+	}
+	return nullptr;
+}
+
 #endif // NO_VST

Modified: trunk/OpenMPT/mptrack/VstPresets.h
===================================================================
--- trunk/OpenMPT/mptrack/VstPresets.h	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/VstPresets.h	2013-02-17 20:55:03 UTC (rev 1536)
@@ -27,6 +27,7 @@
 #ifndef NO_VST
 	static ErrorCode LoadFile(FileReader &file, CVstPlugin &plugin);
 	static bool SaveFile(std::ostream &, CVstPlugin &plugin, bool bank);
+	static const char *GetErrorMessage(ErrorCode code);
 
 protected:
 	static void SaveProgram(std::ostream &f, CVstPlugin &plugin);
@@ -43,5 +44,6 @@
 #else
 	static ErrorCode LoadFile(FileReader &, CVstPlugin &) { return invalidFile; }
 	static bool SaveFile(std::ostream &, CVstPlugin &, bool) { return false; }
+	static const char *GetErrorMessage(ErrorCode);
 #endif // NO_VST
 };

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2013-02-17 20:55:03 UTC (rev 1536)
@@ -1653,47 +1653,95 @@
 }
 
 
-bool CVstPlugin::SaveProgram(const char *filename)
-//------------------------------------------------
+bool CVstPlugin::SaveProgram()
+//----------------------------
 {
-	char ext[_MAX_EXT];
-	_splitpath(filename, nullptr, nullptr, nullptr, ext);
+	std::string defaultDir = CMainFrame::GetSettings().GetWorkingDirectory(DIR_PLUGINPRESETS);
+	bool useDefaultDir = !defaultDir.empty();
+	if(!useDefaultDir)
+	{
+		defaultDir = m_pFactory->szDllPath;
+		defaultDir = defaultDir.substr(0, defaultDir.find_last_of("\\/"));
+	}
 
+	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, "fxp", "",
+		"VST Plugin Programs (*.fxp)|*.fxp|"
+		"VST Plugin Banks (*.fxb)|*.fxb||",
+		defaultDir);
+	if(files.abort) return false;
+
+	if(useDefaultDir)
+	{
+		CMainFrame::GetSettings().SetWorkingDirectory(files.workingDirectory.c_str(), DIR_PLUGINPRESETS, true);
+	}
+	
+	bool bank = !_strnicmp(files.first_file.substr(files.first_file.length() - 3).c_str(), "fxb", 3);
+
 	std::fstream f;
-	f.open(filename, std::ios::out | std::ios::trunc | std::ios::binary);
-	return f.good() && VSTPresets::SaveFile(f, *this, !_strnicmp(ext, ".fxb", 4));
+	f.open(files.first_file, std::ios::out | std::ios::trunc | std::ios::binary);
+	if(f.good() && VSTPresets::SaveFile(f, *this, bank))
+	{
+		return true;
+	} else
+	{
+		Reporting::Error("Error saving preset.");
+		return false;
+	}
+
 }
 
 
-const char *CVstPlugin::LoadProgram(const char *filename)
-//-------------------------------------------------------
+bool CVstPlugin::LoadProgram()
+//----------------------------
 {
-	CMappedFile f;
-	if(!f.Open(filename))
+	std::string defaultDir = CMainFrame::GetSettings().GetWorkingDirectory(DIR_PLUGINPRESETS);
+	bool useDefaultDir = !defaultDir.empty();
+	if(!useDefaultDir)
 	{
-		return "Can't open file.";
+		defaultDir = m_pFactory->szDllPath;
+		defaultDir = defaultDir.substr(0, defaultDir.find_last_of("\\/"));
 	}
-	size_t len = f.GetLength();
-	const char *data = reinterpret_cast<const char *>(f.Lock(len));
-	FileReader file(data, len);
 
-	VSTPresets::ErrorCode error = VSTPresets::LoadFile(file, *this);
-	f.Close();
+	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(true, "fxp", "",
+		"VST Plugin Programs and Banks (*.fxp,*.fxb)|*.fxp;*.fxb|"
+		"VST Plugin Programs (*.fxp)|*.fxp|"
+		"VST Plugin Banks (*.fxb)|*.fxb|"
+		"All Files|*.*||",
+		defaultDir);
+	if(files.abort) return false;
 
-	switch(error)
+	if(useDefaultDir)
 	{
-	case VSTPresets::noError:
-	default:
-		return nullptr;
-	case VSTPresets::invalidFile:
-		return "This does not appear to be a valid preset file.";
-	case VSTPresets::wrongPlugin:
-		return "This file appears to be for a different plugin.";
-	case VSTPresets::outdatedPlugin:
-		return "This file is for a newer version of this plugin.";
-	case VSTPresets::wrongParameters:
-		return "The number of parameters in this file is incompatible with the current plugin.";
+		CMainFrame::GetSettings().SetWorkingDirectory(files.workingDirectory.c_str(), DIR_PLUGINPRESETS, true);
 	}
+
+	CMappedFile f;
+	const char *errorStr = nullptr;
+	if(f.Open(files.first_file.c_str()))
+	{
+		size_t len = f.GetLength();
+		const char *data = reinterpret_cast<const char *>(f.Lock(len));
+		FileReader file(data, len);
+
+		errorStr = VSTPresets::GetErrorMessage(VSTPresets::LoadFile(file, *this));
+		f.Close();
+	} else
+	{
+		errorStr = "Can't open file.";
+	}
+
+	if(errorStr == nullptr)
+	{
+		if(GetModDoc() != nullptr && GetSoundFile() != nullptr && GetSoundFile()->GetModSpecifications().supportsPlugins)
+		{
+			GetModDoc()->SetModified();
+		}
+		return true;
+	} else
+	{
+		Reporting::Error(errorStr);
+		return false;
+	}
 }
 
 
@@ -1742,18 +1790,24 @@
 }
 
 
-CString CVstPlugin::GetFormattedProgramName(VstInt32 index, bool allowFallback)
-//-----------------------------------------------------------------------------
+CString CVstPlugin::GetFormattedProgramName(VstInt32 index)
+//---------------------------------------------------------
 {
 	char rawname[max(kVstMaxProgNameLen + 1, 256)];	// kVstMaxProgNameLen is 24...
 	if(!GetProgramNameIndexed(index, -1, rawname))
 	{
 		// Fallback: Try to get current program name.
 		strcpy(rawname, "");
-		if(allowFallback)
+		VstInt32 curProg = GetCurrentProgram();
+		if(index != curProg)
 		{
-			Dispatch(effGetProgramName, 0, 0, rawname, 0);
+			SetCurrentProgram(index);
 		}
+		Dispatch(effGetProgramName, 0, 0, rawname, 0);
+		if(index != curProg)
+		{
+			SetCurrentProgram(curProg);
+		}
 	}
 	StringFixer::SetNullTerminator(rawname);
 

Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/Vstplug.h	2013-02-17 20:55:03 UTC (rev 1536)
@@ -179,9 +179,9 @@
 	PlugParamIndex GetNumParameters();
 	VstInt32 GetCurrentProgram();
 	VstInt32 GetNumProgramCategories();
-	CString GetFormattedProgramName(VstInt32 index, bool allowFallback = false);
-	const char *LoadProgram(const char *filename);
-	bool SaveProgram(const char *filename);
+	CString GetFormattedProgramName(VstInt32 index);
+	bool LoadProgram();
+	bool SaveProgram();
 	VstInt32 GetUID() const;
 	VstInt32 GetVersion() const;
 	// Check if programs should be stored as chunks or parameters
@@ -292,7 +292,7 @@
 	VstInt32 GetNumPrograms() { return 0; }
 	VstInt32 GetCurrentProgram() { return 0; }
 	bool GetProgramNameIndexed(long, long, char*) { return false; }
-	CString GetFormattedProgramName(VstInt32, bool = false) { return ""; }
+	CString GetFormattedProgramName(VstInt32) { return ""; }
 	void SetParameter(PlugParamIndex, PlugParamValue) {}
 	VstInt32 GetUID() const { return 0; }
 	VstInt32 GetVersion() const { return 0; }
@@ -306,8 +306,8 @@
 	CString GetParamDisplay(PlugParamIndex) { return ""; };
 
 	PlugParamValue GetParameter(PlugParamIndex) { return 0; }
-	const char *LoadProgram(const char *) { return false; }
-	bool SaveProgram(const char *) { return false; }
+	bool LoadProgram() { return false; }
+	bool SaveProgram() { return false; }
 	void SetCurrentProgram(UINT) {}
 	void SetSlot(UINT) {}
 	void UpdateMixStructPtr(void*) {}

Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc	2013-02-17 15:07:52 UTC (rev 1535)
+++ trunk/OpenMPT/mptrack/mptrack.rc	2013-02-17 20:55:03 UTC (rev 1536)
@@ -2761,8 +2761,8 @@
         MENUITEM SEPARATOR
         MENUITEM "&Load Preset / Bank...",      ID_PRESET_LOAD
         MENUITEM "&Save Preset / Bank...",      ID_PRESET_SAVE
+        MENUITEM SEPARATOR
         MENUITEM "Create &instrument from plugin", ID_PLUGINTOINSTRUMENT
-        MENUITEM SEPARATOR
         MENUITEM "&Randomize Parameters",       ID_PRESET_RANDOM
     END
     POPUP "&Info"

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

A music tracker software for Windows.

modplug-svn-commit