From 9c4664d162c537ba4dd4fd8220971c0fb727103a Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Sun, 1 Jul 2012 16:42:16 +0000 Subject: final merge --- muse2/muse/sync.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'muse2/muse/sync.h') diff --git a/muse2/muse/sync.h b/muse2/muse/sync.h index 41ad34ad..09ea06e9 100644 --- a/muse2/muse/sync.h +++ b/muse2/muse/sync.h @@ -32,9 +32,11 @@ namespace MusECore { class Xml; - class MidiSyncInfo { + public: + enum SyncRecFilterPresetType { NONE=0, TINY, SMALL, MEDIUM, LARGE, LARGE_WITH_PRE_DETECT, TYPE_END }; + private: int _port; @@ -151,6 +153,9 @@ extern int volatile curMidiSyncInPort; extern MusECore::BValue useJackTransport; extern bool volatile jackTransportMaster; extern unsigned int syncSendFirstClockDelay; // In milliseconds. +extern unsigned int volatile lastExtMidiSyncTick; +extern MusECore::MidiSyncInfo::SyncRecFilterPresetType syncRecFilterPreset; +extern double syncRecTempoValQuant; } // namespace MusEGlobal -- cgit v1.2.3