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

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

Revision: 1376
          http://modplug.svn.sourceforge.net/modplug/?rev=1376&view=rev
Author:   saga-games
Date:     2012-10-24 22:21:42 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
[Fix] Treeview: Fixed mnemonics in context menu.
[Fix] EZDrummer didn't load its samples until playback was started (tx coda). Another plugin that didn't like revision 1230...

Revision Links:
--------------
    http://modplug.svn.sourceforge.net/modplug/?rev=1230&view=rev

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/View_tre.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp

Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp	2012-10-21 15:29:30 UTC (rev 1375)
+++ trunk/OpenMPT/mptrack/View_tre.cpp	2012-10-24 22:21:42 UTC (rev 1376)
@@ -2512,14 +2512,14 @@
 					nDefault = ID_MODTREE_EXECUTE;
 					AppendMenu(hMenu, MF_STRING, nDefault, "&View Sample");
 					AppendMenu(hMenu, MF_STRING, ID_MODTREE_PLAY, "&Play Sample");
-					AppendMenu(hMenu, MF_STRING, ID_MODTREE_REMOVE, "&Delete Sample");
 					AppendMenu(hMenu, MF_STRING, ID_MODTREE_INSERT, "&Insert Sample");
-					AppendMenu(hMenu, MF_STRING, ID_MODTREE_DUPLICATE, "&Duplicate Sample");
+					AppendMenu(hMenu, MF_STRING, ID_MODTREE_DUPLICATE, "D&uplicate Sample");
+					AppendMenu(hMenu, MF_STRING, ID_MODTREE_REMOVE, "&Delete Sample");
 					if ((pModDoc) && (!pModDoc->GetNumInstruments()))
 					{
 						AppendMenu(hMenu, MF_SEPARATOR, NULL, "");
 						AppendMenu(hMenu, (pModDoc->IsSampleMuted((SAMPLEINDEX)modItemID) ? MF_CHECKED : 0) | MF_STRING, ID_MODTREE_MUTE, "&Mute Sample");
-						AppendMenu(hMenu, MF_STRING, ID_MODTREE_SOLO, "&Solo Sample");
+						AppendMenu(hMenu, MF_STRING, ID_MODTREE_SOLO, "S&olo Sample");
 						AppendMenu(hMenu, MF_STRING, ID_MODTREE_UNMUTEALL, "&Unmute all");
 					}
 				}
@@ -2531,9 +2531,9 @@
 					nDefault = ID_MODTREE_EXECUTE;
 					AppendMenu(hMenu, MF_STRING, nDefault, "&View Instrument");
 					AppendMenu(hMenu, MF_STRING, ID_MODTREE_PLAY, "&Play Instrument");
-					AppendMenu(hMenu, MF_STRING, ID_MODTREE_REMOVE, "&Delete Instrument");
 					AppendMenu(hMenu, MF_STRING, ID_MODTREE_INSERT, "&Insert Instrument");
-					AppendMenu(hMenu, MF_STRING, ID_MODTREE_DUPLICATE, "&Duplicate Instrument");
+					AppendMenu(hMenu, MF_STRING, ID_MODTREE_DUPLICATE, "D&uplicate Instrument");
+					AppendMenu(hMenu, MF_STRING, ID_MODTREE_REMOVE, "&Delete Instrument");
 					if ((pModDoc) && (pModDoc->GetNumInstruments()))
 					{
 						AppendMenu(hMenu, MF_SEPARATOR, NULL, "");
@@ -3023,14 +3023,13 @@
 //----------------------------------
 {
 	HTREEITEM hItem = GetSelectedItem();
-	CModDoc *pModDoc;
-
+	
 	const uint64 modItem = GetModItem(hItem);
 	const uint32 modItemType = GetModItemType(modItem);
 	const uint32 modItemID = GetModItemID(modItem);
 
-	pModDoc = GetDocumentFromItem(hItem);
-	CSoundFile *pSndFile = (pModDoc) ? pModDoc->GetSoundFile() : nullptr;
+	CModDoc *pModDoc = GetDocumentFromItem(hItem);
+	CSoundFile *pSndFile = (pModDoc != nullptr) ? pModDoc->GetSoundFile() : nullptr;
 
 	if(pModDoc && pSndFile)
 	{
@@ -3060,11 +3059,11 @@
 			vector<INSTRUMENTINDEX> newOrder = GenerateInsertVector<INSTRUMENTINDEX>(pSndFile->GetNumInstruments(), modItemID, modItemID);
 			if(pModDoc->ReArrangeInstruments(newOrder) != INSTRUMENTINDEX_INVALID)
 			{
-				pModDoc->UpdateAllViews(NULL, HINT_INSNAMES| HINT_INSTRUMENT | HINT_ENVELOPE);
+				pModDoc->UpdateAllViews(NULL, HINT_INSNAMES | HINT_INSTRUMENT | HINT_ENVELOPE);
 				pModDoc->SetModified();
 			} else
 			{
-				Reporting::Error("Maximum number of samples reached.");
+				Reporting::Error("Maximum number of instruments reached.");
 			}
 		}
 	}
@@ -3075,13 +3074,12 @@
 //-------------------------------
 {
 	HTREEITEM hItem = GetSelectedItem();
-	CModDoc *pModDoc;
 
 	const uint64 modItem = GetModItem(hItem);
 	const uint32 modItemType = GetModItemType(modItem);
 	const uint32 modItemID = GetModItemID(modItem);
 
-	pModDoc = GetDocumentFromItem(hItem);
+	CModDoc *pModDoc = GetDocumentFromItem(hItem);
 	CSoundFile *pSndFile = (pModDoc) ? pModDoc->GetSoundFile() : nullptr;
 
 	if(pModDoc && pSndFile)
@@ -3115,7 +3113,7 @@
 				pModDoc->SetModified();
 			} else
 			{
-				Reporting::Error("Maximum number of samples reached.");
+				Reporting::Error("Maximum number of instruments reached.");
 			}
 		}
 	}

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2012-10-21 15:29:30 UTC (rev 1375)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2012-10-24 22:21:42 UTC (rev 1376)
@@ -1447,9 +1447,12 @@
 
 	// Korg Wavestation GUI won't work until plugin was resumed at least once.
 	// On the other hand, some other plugins (notably Synthedit plugins like Superwave P8 2.3 or Rez 3.0) don't like this
-	// and won't load their stored plugin data instantly, so only do this for the Korg Wavestation...
-	// Tentatively also apply this fix for Korg's M1 plugin, maybe this will fix older versions of said plugin, newer versions don't require the fix.
-	if(GetUID() == CCONST('K', 'L', 'W', 'V') || GetUID() == CCONST('K', 'L', 'M', '1'))
+	// and won't load their stored plugin data instantly, so only do this for the troublesome plugins...
+	// Also apply this fix for Korg's M1 plugin, as this will fixes older versions of said plugin, newer versions don't require the fix.
+	// EZDrummer won't load its samples until playback has started.
+	if(GetUID() == CCONST('K', 'L', 'W', 'V')			// Wavestation
+		|| GetUID() == CCONST('K', 'L', 'M', '1')		// M1
+		|| GetUID() == CCONST('d', 'f', 'h', 'e'))		// EZDrummer
 	{
 		Resume();
 		Suspend();

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