[OMPT-svn-commit] OpenMPT r21857 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Fri Oct 18 23:55:25 2024
New Revision: 21857
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21857

Log:
Merged revision(s) 21856 from trunk/OpenMPT:
[Mod] Pattern tab: Rename "Render to Wave" context menu item to "Stream Export".
[Imp] Pattern tab: There is now a short for stream export (https://bugs.openmpt.org/view.php?id=1831)
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/CommandSet.cpp
   branches/OpenMPT-1.31/mptrack/CommandSet.h
   branches/OpenMPT-1.31/mptrack/Ctrl_seq.cpp

Modified: branches/OpenMPT-1.31/mptrack/CommandSet.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Fri Oct 18 23:54:00 2024	(r21856)
+++ branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Fri Oct 18 23:55:25 2024	(r21857)
@@ -1374,6 +1374,7 @@
 	{2098, kcGotoVolumeColumn, _T("Go to volume effect column")},
 	{2099, kcGotoCommandColumn, _T("Go to effect command column")},
 	{2100, kcGotoParamColumn, _T("Go to effect parameter column")},
+	{2102, kcOrderlistStreamExport, _T("Stream Export")},
 };
 
 // Get command descriptions etc.. loaded up.

Modified: branches/OpenMPT-1.31/mptrack/CommandSet.h
==============================================================================
--- branches/OpenMPT-1.31/mptrack/CommandSet.h	Fri Oct 18 23:54:00 2024	(r21856)
+++ branches/OpenMPT-1.31/mptrack/CommandSet.h	Fri Oct 18 23:55:25 2024	(r21857)
@@ -1031,7 +1031,8 @@
 	kcOrderlistLockPlayback = kcStartOrderlistLock,
 	kcOrderlistUnlockPlayback,
 	kcEndOrderlistLock = kcOrderlistUnlockPlayback,
-	kcEndOrderlistCommands = kcEndOrderlistLock,
+	kcOrderlistStreamExport,
+	kcEndOrderlistCommands = kcOrderlistStreamExport,
 
 	kcStartChnSettingsCommands,
 	kcChnSettingsPrev = kcStartChnSettingsCommands,

Modified: branches/OpenMPT-1.31/mptrack/Ctrl_seq.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Ctrl_seq.cpp	Fri Oct 18 23:54:00 2024	(r21856)
+++ branches/OpenMPT-1.31/mptrack/Ctrl_seq.cpp	Fri Oct 18 23:55:25 2024	(r21857)
@@ -560,6 +560,9 @@
 		OnMergePatterns(); return wParam;
 	case kcNewPattern:
 		OnCreateNewPattern(); return wParam;
+
+	case kcOrderlistStreamExport:
+		OnRenderOrder(); return wParam;
 	}
 
 	return kcNull;
@@ -1150,7 +1153,7 @@
 	AppendMenu(hMenu, (sndFile.m_lockOrderStart == ORDERINDEX_INVALID ? (MF_STRING | MF_GRAYED) : MF_STRING), ID_ORDERLIST_UNLOCKPLAYBACK, ih->GetKeyTextFromCommand(kcOrderlistUnlockPlayback, _T("&Unlock Playback")));
 
 	AppendMenu(hMenu, MF_SEPARATOR, NULL, _T(""));
-	AppendMenu(hMenu, MF_STRING | greyed, ID_ORDERLIST_RENDER, _T("Render to &Wave"));
+	AppendMenu(hMenu, MF_STRING | greyed, ID_ORDERLIST_RENDER, ih->GetKeyTextFromCommand(kcOrderlistStreamExport, _T("Stream E&xport")));
 
 	ClientToScreen(&pt);
 	::TrackPopupMenu(hMenu, TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, m_hWnd, NULL);