projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Plugin analysis numerics
[ardour.git]
/
gtk2_ardour
/
midi_tracer.cc
diff --git
a/gtk2_ardour/midi_tracer.cc
b/gtk2_ardour/midi_tracer.cc
index 934dffd11c161d88287dca38eea8460e837655d1..7750d65caf53a436297e2cfd5aaa503eb972530d 100644
(file)
--- a/
gtk2_ardour/midi_tracer.cc
+++ b/
gtk2_ardour/midi_tracer.cc
@@
-34,7
+34,7
@@
#include "midi_tracer.h"
#include "gui_thread.h"
#include "midi_tracer.h"
#include "gui_thread.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace Gtk;
using namespace std;
using namespace Gtk;
using namespace std;
@@
-43,13
+43,12
@@
using namespace Glib;
MidiTracer::MidiTracer ()
: ArdourWindow (_("MIDI Tracer"))
MidiTracer::MidiTracer ()
: ArdourWindow (_("MIDI Tracer"))
- , parser (0)
, line_count_adjustment (200, 1, 2000, 1, 10)
, line_count_spinner (line_count_adjustment)
, line_count_label (_("Line history: "))
, line_count_adjustment (200, 1, 2000, 1, 10)
, line_count_spinner (line_count_adjustment)
, line_count_label (_("Line history: "))
+ , _last_receipt (0)
, autoscroll (true)
, show_hex (true)
, autoscroll (true)
, show_hex (true)
- , collect (true)
, show_delta_time (false)
, _update_queued (0)
, fifo (1024)
, show_delta_time (false)
, _update_queued (0)
, fifo (1024)
@@
-59,12
+58,9
@@
MidiTracer::MidiTracer ()
, collect_button (_("Enabled"))
, delta_time_button (_("Delta times"))
{
, collect_button (_("Enabled"))
, delta_time_button (_("Delta times"))
{
- ARDOUR::AudioEngine::instance()->PortRegisteredOrUnregistered.connect
+ ARDOUR::AudioEngine::instance()->PortRegisteredOrUnregistered.connect
(_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context());
(_manager_connection, invalidator (*this), boost::bind (&MidiTracer::ports_changed, this), gui_context());
- _last_receipt.tv_sec = 0;
- _last_receipt.tv_usec = 0;
-
VBox* vbox = manage (new VBox);
vbox->set_spacing (4);
VBox* vbox = manage (new VBox);
vbox->set_spacing (4);
@@
-123,7
+119,6
@@
MidiTracer::MidiTracer ()
port_changed ();
}
port_changed ();
}
-
MidiTracer::~MidiTracer()
{
}
MidiTracer::~MidiTracer()
{
}
@@
-133,7
+128,7
@@
MidiTracer::ports_changed ()
{
string const c = _port_combo.get_active_text ();
_port_combo.clear ();
{
string const c = _port_combo.get_active_text ();
_port_combo.clear ();
-
+
ARDOUR::PortManager::PortList pl;
ARDOUR::AudioEngine::instance()->get_ports (ARDOUR::DataType::MIDI, pl);
ARDOUR::PortManager::PortList pl;
ARDOUR::AudioEngine::instance()->get_ports (ARDOUR::DataType::MIDI, pl);
@@
-180,11
+175,13
@@
MidiTracer::port_changed ()
boost::shared_ptr<ARDOUR::MidiPort> mp = boost::dynamic_pointer_cast<ARDOUR::MidiPort> (p);
if (mp) {
boost::shared_ptr<ARDOUR::MidiPort> mp = boost::dynamic_pointer_cast<ARDOUR::MidiPort> (p);
if (mp) {
- mp->self_parser().any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3));
+ my_parser.any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4));
+ mp->set_trace (&my_parser);
+ traced_port = mp;
}
}
-
+
} else {
} else {
- async->parser()->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3));
+ async->parser()->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3
, _4
));
}
}
}
}
@@
-192,37
+189,35
@@
void
MidiTracer::disconnect ()
{
_parser_connection.disconnect ();
MidiTracer::disconnect ()
{
_parser_connection.disconnect ();
+
+ if (traced_port) {
+ traced_port->set_trace (0);
+ traced_port.reset ();
+ }
}
void
}
void
-MidiTracer::tracer (Parser&, byte* msg, size_t len)
+MidiTracer::tracer (Parser&, byte* msg, size_t len
, samplecnt_t now
)
{
stringstream ss;
{
stringstream ss;
- struct timeval tv;
char* buf;
char* buf;
- struct tm now;
size_t bufsize;
size_t s;
size_t bufsize;
size_t s;
-
gettimeofday (&tv, 0)
;
+
std::cerr << "tracer msg " << len << " bytes, first = " << hex << (int) msg[0] << dec << std::endl
;
buf = (char *) buffer_pool.alloc ();
bufsize = buffer_size;
buf = (char *) buffer_pool.alloc ();
bufsize = buffer_size;
- if (_last_receipt.tv_sec != 0 && show_delta_time) {
- struct timeval delta;
- timersub (&tv, &_last_receipt, &delta);
- s = snprintf (buf, bufsize, "+%02" PRId64 ":%06" PRId64, (int64_t) delta.tv_sec, (int64_t) delta.tv_usec);
+ if (_last_receipt != 0 && show_delta_time) {
+ s = snprintf (buf, bufsize, "+%12ld", now - _last_receipt);
bufsize -= s;
} else {
bufsize -= s;
} else {
- localtime_r (&tv.tv_sec, &now);
- s = strftime (buf, bufsize, "%H:%M:%S", &now);
- bufsize -= s;
- s += snprintf (&buf[s], bufsize, ".%06" PRId64, (int64_t) tv.tv_usec);
+ s = snprintf (buf, bufsize, "%12ld", now);
bufsize -= s;
}
bufsize -= s;
}
- _last_receipt =
tv
;
+ _last_receipt =
now
;
switch ((eventType) msg[0]&0xf0) {
case off:
switch ((eventType) msg[0]&0xf0) {
case off:
@@
-275,9
+270,9
@@
MidiTracer::tracer (Parser&, byte* msg, size_t len)
case MIDI::pitchbend:
if (show_hex) {
case MIDI::pitchbend:
if (show_hex) {
- s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x
\n", "Pitch Bend", (msg[0]&0xf)+1, (int) msg[1
]);
+ s += snprintf (&buf[s], bufsize, "%16s chn %2d %02x
%02x\n", "Pitch Bend", (msg[0]&0xf)+1, (int) msg[1], (int) msg[2
]);
} else {
} else {
- s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d
\n", "Pitch Bend", (msg[0]&0xf)+1, (int) msg[1
]);
+ s += snprintf (&buf[s], bufsize, "%16s chn %2d %-3d
%-3d\n", "Pitch Bend", (msg[0]&0xf)+1, (int) msg[1], (int) msg[2
]);
}
break;
}
break;
@@
-337,9
+332,9
@@
MidiTracer::tracer (Parser&, byte* msg, size_t len)
} else if (len == 10 && msg[0] == 0xf0 && msg[1] == 0x7f && msg[9] == 0xf7) {
} else if (len == 10 && msg[0] == 0xf0 && msg[1] == 0x7f && msg[9] == 0xf7) {
- /* MTC full
fram
e */
+ /* MTC full
sampl
e */
s += snprintf (
s += snprintf (
- &buf[s], bufsize, " MTC full
fram
e to %02d:%02d:%02d:%02d\n", msg[5] & 0x1f, msg[6], msg[7], msg[8]
+ &buf[s], bufsize, " MTC full
sampl
e to %02d:%02d:%02d:%02d\n", msg[5] & 0x1f, msg[6], msg[7], msg[8]
);
} else if (len == 3 && msg[0] == MIDI::position) {
);
} else if (len == 3 && msg[0] == MIDI::position) {
@@
-405,6
+400,8
@@
MidiTracer::tracer (Parser&, byte* msg, size_t len)
// If you want to append more to the line, uncomment this first
// bufsize -= s;
// If you want to append more to the line, uncomment this first
// bufsize -= s;
+ assert(s <= buffer_size); // clang dead-assignment
+
fifo.write (&buf, 1);
if (g_atomic_int_get (const_cast<gint*> (&_update_queued)) == 0) {
fifo.write (&buf, 1);
if (g_atomic_int_get (const_cast<gint*> (&_update_queued)) == 0) {