smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

GUI: use new MidiPort::set_tracer API

Browse source
This commit is contained in:
Robin Gareus 2023-06-03 22:26:08 +02:00
parent 7e567468b2
commit 36056597ce
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/midi_tracer.cc
View file

@ -240,7 +240,7 @@ MidiTracer::port_changed ()
if (0 == tracer_port->connect (pn)) { if (0 == tracer_port->connect (pn)) {
_midi_parser = std::shared_ptr<MIDI::Parser> (new MIDI::Parser); _midi_parser = std::shared_ptr<MIDI::Parser> (new MIDI::Parser);
_midi_parser->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4)); _midi_parser->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4));
//tracer_port->set_trace (_midi_parser); tracer_port->set_trace (_midi_parser);
} else { } else {
std::cerr << "CANNOT TRACE PORT " << pn << "\n"; std::cerr << "CANNOT TRACE PORT " << pn << "\n";
} }
@ -275,7 +275,7 @@ MidiTracer::port_changed ()
} else { } else {
_midi_parser = std::shared_ptr<MIDI::Parser> (new MIDI::Parser); _midi_parser = std::shared_ptr<MIDI::Parser> (new MIDI::Parser);
_midi_parser->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4)); _midi_parser->any.connect_same_thread (_parser_connection, boost::bind (&MidiTracer::tracer, this, _1, _2, _3, _4));
//mp->set_trace (_midi_parser); mp->set_trace (_midi_parser);
traced_port = mp; traced_port = mp;
} }
} }
@ -291,10 +291,10 @@ MidiTracer::disconnect ()
_parser_connection.disconnect (); _parser_connection.disconnect ();
tracer_port->disconnect_all (); tracer_port->disconnect_all ();
//tracer_port->set_trace (std::weak_ptr<MIDI::Parser>()); tracer_port->set_trace (std::weak_ptr<MIDI::Parser>());
if (traced_port) { if (traced_port) {
//traced_port->set_trace (std::weak_ptr<MIDI::Parser>()); traced_port->set_trace (std::weak_ptr<MIDI::Parser>());
traced_port.reset (); traced_port.reset ();
} }
_midi_parser.reset (); _midi_parser.reset ();

2
gtk2_ardour/tempo_dialog.cc
View file

@ -292,7 +292,7 @@ TempoDialog::init (const Temporal::BBT_Time& when, double bpm, double end_bpm, d
assert (_midi_tap_port); assert (_midi_tap_port);
_midi_tap_parser = std::shared_ptr<MIDI::Parser> (new MIDI::Parser); _midi_tap_parser = std::shared_ptr<MIDI::Parser> (new MIDI::Parser);
_midi_tap_parser->any.connect_same_thread (_parser_connection, boost::bind (&TempoDialog::midi_event, this, _2, _3, _4)); _midi_tap_parser->any.connect_same_thread (_parser_connection, boost::bind (&TempoDialog::midi_event, this, _2, _3, _4));
//_midi_tap_port->set_trace (_midi_tap_parser); _midi_tap_port->set_trace (_midi_tap_parser);
_midi_tap_signal.connect (_xthread_connection, invalidator (*this), boost::bind (&TempoDialog::tap_tempo, this, _1), gui_context ()); _midi_tap_signal.connect (_xthread_connection, invalidator (*this), boost::bind (&TempoDialog::tap_tempo, this, _1), gui_context ());
/* init state */ /* init state */