summaryrefslogtreecommitdiff
path: root/muse2/muse/sync.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
committerFlorian Jung <flo@windfisch.org>2012-07-01 16:42:16 +0000
commit9c4664d162c537ba4dd4fd8220971c0fb727103a (patch)
tree37a28b7cd4e4d8984ad4934a4884cd7b4da0505c /muse2/muse/sync.h
parente87fedf1be804f7ec774071d844b1f163be30b96 (diff)
final merge
Diffstat (limited to 'muse2/muse/sync.h')
-rw-r--r--muse2/muse/sync.h7
1 files changed, 6 insertions, 1 deletions
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