summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse/ChangeLog3
-rw-r--r--muse/muse/app.cpp2
-rw-r--r--muse/muse/sync.cpp5
3 files changed, 8 insertions, 2 deletions
diff --git a/muse/ChangeLog b/muse/ChangeLog
index 78c0b47b..d1796b87 100644
--- a/muse/ChangeLog
+++ b/muse/ChangeLog
@@ -1,3 +1,6 @@
+26.01.2010
+ * Fixed: Import midi 'replace' broken last fixes. (T356)
+ * Fixed: External midi sync: Wait until first clock after start to start transport, and >= second clock to increment ticks. (T356)
24.01.2010
* Added: Midi sync: Added 'Jack timebase master' checkbox, removed requirement of MusE being tempo map master. (T356)
* Added: While on external sync and Jack timebase master, reports correct MusE BBT info to Jack. (Tempo not correct yet). (T356)
diff --git a/muse/muse/app.cpp b/muse/muse/app.cpp
index b5f75b43..ac06f3de 100644
--- a/muse/muse/app.cpp
+++ b/muse/muse/app.cpp
@@ -1518,7 +1518,7 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll
}
}
//else if (ex == "mid." || ex == "kar.") {
- else if (mex == "mid." || mex == "kar.") {
+ else if (mex == "mid" || mex == "kar") {
setConfigDefaults();
if (!importMidi(name, false))
setUntitledProject();
diff --git a/muse/muse/sync.cpp b/muse/muse/sync.cpp
index 04c3e526..74ab1c41 100644
--- a/muse/muse/sync.cpp
+++ b/muse/muse/sync.cpp
@@ -27,7 +27,7 @@
int volatile curMidiSyncInPort = -1;
// P3.3.26
-bool debugSync = false;
+bool debugSync = true;
int mtcType = 1;
MTC mtcOffset;
@@ -547,6 +547,9 @@ void MidiSeq::mtcInputQuarter(int port, unsigned char c)
{
static int hour, min, sec, frame;
+ // p3.3.28
+ printf("MidiSeq::mtcInputQuarter c:%h\n", c);
+
int valL = c & 0xf;
int valH = valL << 4;