ardour/livetrax
13
0
Fork 0
Code

fixup some issues with the miditracer

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6625 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-02-02 17:47:05 +00:00
parent 18087e555d
commit faa2b3a3ad
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View File

@ -2198,8 +2198,8 @@ Editor::set_state (const XMLNode& node, int /*version*/)
int x, y, xoff, yoff;
Gdk::Geometry g;
// return 0;
return 0;
if ((prop = node.property ("id")) != 0) {
_id = prop->value ();
}

11
gtk2_ardour/midi_tracer.cc
View File

@ -105,7 +105,7 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len)
s = strftime (buf, bufsize, "%H:%M:%S", &now);
bufsize -= s;
s = snprintf (&buf[s], bufsize, ".%-9" PRId64, (int64_t) tv.tv_usec);
s += snprintf (&buf[s], bufsize, ".%-9" PRId64, (int64_t) tv.tv_usec);
bufsize -= s;
switch ((eventType) msg[0]&0xf0) {
@ -190,18 +190,19 @@ MidiTracer::tracer (Parser&, byte* msg, size_t len)
s += snprintf (&buf[s], bufsize, "%16s %02x\n", "Sysex", (int) msg[1]);
break;
}
bufsize -= s;
} else {
s += snprintf (&buf[s], bufsize, " %16s (%d) = [", "Sysex", (int) len);
s += snprintf (&buf[s], bufsize, "%16s (%d) = [", "Sysex", (int) len);
bufsize -= s;
for (unsigned int i = 0; i < len && s < sizeof (buf)-3; ++i) {
for (unsigned int i = 0; i < len && bufsize > 3; ++i) {
if (i > 0) {
s += snprintf (&buf[s], bufsize, " %02x", msg[i]);
} else {
s += snprintf (&buf[s], bufsize, "%02x", msg[i]);
}
bufsize = sizeof (buf) - s;
bufsize -= s;
}
s += snprintf (&buf[s], bufsize, "]\n");
}