From 2c69990e7485e0799de6013e7b49a16ef58b54b6 Mon Sep 17 00:00:00 2001 From: nstbayless Date: Sat, 18 Mar 2023 02:10:38 -0700 Subject: [PATCH] JSON export now includes note mapping for dpcm key --- Source/Clipboard.h | 2 +- Source/FamiTrackerDocIOJson.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Clipboard.h b/Source/Clipboard.h index 4897a0f9..980c37c2 100644 --- a/Source/Clipboard.h +++ b/Source/Clipboard.h @@ -58,6 +58,7 @@ class CMemoryLock { }; bool CopyToClipboard(CWnd *parent, CLIPFORMAT ClipboardID, const CBinarySerializableInterface &ser); +bool ReadGlobalMemory(CBinarySerializableInterface& ser, HGLOBAL hMem); template std::optional RestoreFromClipboard(CWnd *parent, CLIPFORMAT ClipboardID) { @@ -77,7 +78,6 @@ std::optional RestoreFromClipboard(CWnd *parent, CLIPFORMAT ClipboardID) { return std::nullopt; } -bool ReadGlobalMemory(CBinarySerializableInterface &ser, HGLOBAL hMem); DROPEFFECT DragDropTransfer(const CBinarySerializableInterface &ser, CLIPFORMAT clipboardID, DWORD effects); } // namespace CClipboard diff --git a/Source/FamiTrackerDocIOJson.cpp b/Source/FamiTrackerDocIOJson.cpp index c8d9aea3..f09de2d8 100644 --- a/Source/FamiTrackerDocIOJson.cpp +++ b/Source/FamiTrackerDocIOJson.cpp @@ -412,6 +412,7 @@ void to_json(json &j, const CInstrument2A03 &inst) { {"pitch", inst.GetSamplePitch(n) & 0x0Fu}, {"loop", inst.GetSampleLoop(n)}, {"delta", inst.GetSampleDeltaValue(n)}, + {"note", n}, }); }