X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_midi.cc;h=d8859e07c03ca0106201fd258acb946ebaad0b30;hb=4ceac6311669d58390be0ebcc35401c25c148dde;hp=34d9b470f554eb821891adac6cc047fcf1348f88;hpb=498dfebcca3b97cdd7b83444040042fe06626241;p=ardour.git diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index 34d9b470f5..d8859e07c0 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -28,18 +28,21 @@ #include +#include + #include "midi++/mmc.h" #include "midi++/port.h" #include "midi++/manager.h" #include "pbd/error.h" -#include #include "pbd/pthread_utils.h" #include "ardour/configuration.h" +#include "ardour/debug.h" #include "ardour/audioengine.h" #include "ardour/session.h" #include "ardour/audio_track.h" #include "ardour/midi_track.h" +#include "ardour/midi_ui.h" #include "ardour/audio_diskstream.h" #include "ardour/slave.h" #include "ardour/cycles.h" @@ -51,6 +54,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; using namespace MIDI; +using namespace Glib; MachineControl::CommandSignature MMC_CommandSignature; MachineControl::ResponseSignature MMC_ResponseSignature; @@ -141,13 +145,10 @@ Session::set_mtc_port (string port_tag) ms->rebind (*port); } - cerr << "!!SPT to " << port_tag << endl; - Config->set_mtc_port_name (port_tag); out: MTC_PortChanged(); /* EMIT SIGNAL */ - change_midi_ports (); set_dirty(); return 0; } @@ -207,45 +208,31 @@ Session::set_mmc_port (string port_tag) mmc->set_send_device_id (old_send_device_id); } - mmc->Play.connect - (mem_fun (*this, &Session::mmc_deferred_play)); - mmc->DeferredPlay.connect - (mem_fun (*this, &Session::mmc_deferred_play)); - mmc->Stop.connect - (mem_fun (*this, &Session::mmc_stop)); - mmc->FastForward.connect - (mem_fun (*this, &Session::mmc_fast_forward)); - mmc->Rewind.connect - (mem_fun (*this, &Session::mmc_rewind)); - mmc->Pause.connect - (mem_fun (*this, &Session::mmc_pause)); - mmc->RecordPause.connect - (mem_fun (*this, &Session::mmc_record_pause)); - mmc->RecordStrobe.connect - (mem_fun (*this, &Session::mmc_record_strobe)); - mmc->RecordExit.connect - (mem_fun (*this, &Session::mmc_record_exit)); - mmc->Locate.connect - (mem_fun (*this, &Session::mmc_locate)); - mmc->Step.connect - (mem_fun (*this, &Session::mmc_step)); - mmc->Shuttle.connect - (mem_fun (*this, &Session::mmc_shuttle)); - mmc->TrackRecordStatusChange.connect - (mem_fun (*this, &Session::mmc_record_enable)); + mmc->Play.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1)); + mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1)); + mmc->Stop.connect_same_thread (*this, boost::bind (&Session::mmc_stop, this, _1)); + mmc->FastForward.connect_same_thread (*this, boost::bind (&Session::mmc_fast_forward, this, _1)); + mmc->Rewind.connect_same_thread (*this, boost::bind (&Session::mmc_rewind, this, _1)); + mmc->Pause.connect_same_thread (*this, boost::bind (&Session::mmc_pause, this, _1)); + mmc->RecordPause.connect_same_thread (*this, boost::bind (&Session::mmc_record_pause, this, _1)); + mmc->RecordStrobe.connect_same_thread (*this, boost::bind (&Session::mmc_record_strobe, this, _1)); + mmc->RecordExit.connect_same_thread (*this, boost::bind (&Session::mmc_record_exit, this, _1)); + mmc->Locate.connect_same_thread (*this, boost::bind (&Session::mmc_locate, this, _1, _2)); + mmc->Step.connect_same_thread (*this, boost::bind (&Session::mmc_step, this, _1, _2)); + mmc->Shuttle.connect_same_thread (*this, boost::bind (&Session::mmc_shuttle, this, _1, _2, _3)); + mmc->TrackRecordStatusChange.connect_same_thread (*this, boost::bind (&Session::mmc_record_enable, this, _1, _2, _3)); /* also handle MIDI SPP because its so common */ - _mmc_port->input()->start.connect (mem_fun (*this, &Session::spp_start)); - _mmc_port->input()->contineu.connect (mem_fun (*this, &Session::spp_continue)); - _mmc_port->input()->stop.connect (mem_fun (*this, &Session::spp_stop)); + _mmc_port->input()->start.connect_same_thread (*this, boost::bind (&Session::spp_start, this, _1, _2)); + _mmc_port->input()->contineu.connect_same_thread (*this, boost::bind (&Session::spp_continue, this, _1, _2)); + _mmc_port->input()->stop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this, _1, _2)); Config->set_mmc_port_name (port_tag); out: MMC_PortChanged(); /* EMIT SIGNAL */ - change_midi_ports (); set_dirty(); return 0; } @@ -279,7 +266,6 @@ Session::set_midi_port (string /*port_tag*/) out: #endif MIDI_PortChanged(); /* EMIT SIGNAL */ - change_midi_ports (); set_dirty(); return 0; } @@ -321,7 +307,6 @@ Session::set_midi_clock_port (string port_tag) out: MIDIClock_PortChanged(); /* EMIT SIGNAL */ - change_midi_ports (); set_dirty(); return 0; } @@ -496,7 +481,7 @@ Session::setup_midi_control () void Session::spp_start (Parser &, nframes_t /*timestamp*/) { - if (Config->get_mmc_control() && (config.get_external_sync() && config.get_sync_source() != MTC)) { + if (Config->get_mmc_control() && (!config.get_external_sync() || config.get_sync_source() != JACK)) { request_transport_speed (1.0); } } @@ -514,34 +499,11 @@ Session::spp_stop (Parser&, nframes_t /*timestamp*/) request_stop (); } } -/* -void -Session::midi_clock_start (Parser& ignored, nframes_t timestamp) -{ - if (config.get_external_sync() && (config.get_sync_source() == MIDIClock)) { - request_transport_speed (1.0); - } -} - -void -Session::midi_clock_continue (Parser& parser, nframes_t timestamp) -{ - midi_clock_start (parser, 0); -} - -void -Session::midi_clock_stop (Parser& ignored, nframes_t timestamp) -{ - if (config.get_external_sync() && (config.get_slave_source() == MIDIClock)) { - request_stop (); - } -} -*/ void Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/) { - if (Config->get_mmc_control() && (config.get_external_sync() && (config.get_sync_source() != MTC))) { + if (Config->get_mmc_control() && (!config.get_external_sync() || (config.get_sync_source() != JACK))) { request_transport_speed (1.0); } } @@ -664,8 +626,12 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps) last_mmc_step = now; if (!step_queued) { - midi_timeouts.push_back (mem_fun (*this, &Session::mmc_step_timeout)); - step_queued = true; + if (midi_control_ui) { + RefPtr tsrc = TimeoutSource::create (100); + tsrc->connect (sigc::mem_fun (*this, &Session::mmc_step_timeout)); + tsrc->attach (midi_control_ui->main_loop()->get_context()); + step_queued = true; + } } } @@ -765,16 +731,6 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled) } } -void -Session::change_midi_ports () -{ - MIDIRequest* request = new MIDIRequest; - - request->type = MIDIRequest::PortChange; - midi_requests.write (&request, 1); - poke_midi_thread (); -} - /** Send MTC Full Frame message (complete Timecode time) for the start of this cycle. * This resets the MTC code, the next quarter frame message that is sent will be * the first one with the beginning of this cycle as the new start point. @@ -858,8 +814,8 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes) /* Duration of one quarter frame */ nframes_t quarter_frame_duration = ((long) _frames_per_timecode_frame) >> 2; - // cerr << "(MTC) TR: " << _transport_frame << " - SF: " << outbound_mtc_timecode_frame - // << " - NQ: " << next_quarter_frame_to_send << " - FD" << quarter_frame_duration << endl; + DEBUG_TRACE (DEBUG::MTC, string_compose ("TF %1 SF %2 NQ %3 FD %\4n", _transport_frame, outbound_mtc_timecode_frame, + next_quarter_frame_to_send, quarter_frame_duration)); // FIXME: this should always be true //assert((outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration)) @@ -870,7 +826,7 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes) while (_transport_frame + nframes > (outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration))) { - // cerr << "(MTC) Next frame to send: " << next_quarter_frame_to_send << endl; + DEBUG_TRACE (DEBUG::MTC, string_compose ("next frame to send: %1\n", next_quarter_frame_to_send)); switch (next_quarter_frame_to_send) { case 0: @@ -915,13 +871,13 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes) return -1; } - /*cerr << "(MTC) Timecode: " << transmitting_timecode_time.hours - << ":" << transmitting_timecode_time.minutes - << ":" << transmitting_timecode_time.seconds - << ":" << transmitting_timecode_time.frames - << ", qfm = " << next_quarter_frame_to_send - << ", stamp = " << out_stamp - << ", delta = " << _transport_frame + out_stamp - last_time << endl;*/ +#ifndef NDEBUG + DEBUG_STR_DECL(foo) + DEBUG_STR_APPEND(foo,"sending "); + DEBUG_STR_APPEND(foo, transmitting_timecode_time); + DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send, + out_stamp)); +#endif // Increment quarter frame counter next_quarter_frame_to_send++; @@ -1047,257 +1003,17 @@ Session::mmc_step_timeout () int Session::start_midi_thread () { - if (pipe (midi_request_pipe)) { - error << string_compose(_("Cannot create transport request signal pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (fcntl (midi_request_pipe[0], F_SETFL, O_NONBLOCK)) { - error << string_compose(_("UI: cannot set O_NONBLOCK on " "signal read pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (fcntl (midi_request_pipe[1], F_SETFL, O_NONBLOCK)) { - error << string_compose(_("UI: cannot set O_NONBLOCK on " "signal write pipe (%1)"), strerror (errno)) << endmsg; - return -1; - } - - if (pthread_create_and_store ("transport", &midi_thread, 0, _midi_thread_work, this)) { - error << _("Session: could not create transport thread") << endmsg; - return -1; - } - + midi_control_ui = new MidiControlUI (*this); + midi_control_ui->run (); return 0; } void Session::terminate_midi_thread () { - if (midi_thread) { - - MIDIRequest* request = new MIDIRequest; - void* status; - - request->type = MIDIRequest::Quit; - - midi_requests.write (&request, 1); - poke_midi_thread (); - - pthread_join (midi_thread, &status); - } -} - -void -Session::poke_midi_thread () -{ - static char c = 0; - - if (write (midi_request_pipe[1], &c, 1) != 1) { - error << string_compose(_("cannot send signal to midi thread! (%1)"), strerror (errno)) << endmsg; + if (midi_control_ui) { + midi_control_ui->quit (); } } -void * -Session::_midi_thread_work (void* arg) -{ - pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, 0); - pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0); - - ((Session *) arg)->midi_thread_work (); - return 0; -} - -void -Session::midi_thread_work () -{ - MIDIRequest* request; - struct pollfd pfd[4]; - int nfds = 0; - int timeout; - int fds_ready; - struct sched_param rtparam; - int x; - bool restart; - vector ports; - - PBD::notify_gui_about_thread_creation (pthread_self(), X_("MIDI"), 2048); - - memset (&rtparam, 0, sizeof (rtparam)); - rtparam.sched_priority = 9; /* XXX should be relative to audio (JACK) thread */ - - if ((x = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) { - // do we care? not particularly. - } - - /* set up the port vector; 5 is the largest possible size for now */ - - ports.assign (5, (MIDI::Port*) 0); - - while (1) { - - nfds = 0; - - pfd[nfds].fd = midi_request_pipe[0]; - pfd[nfds].events = POLLIN|POLLHUP|POLLERR; - nfds++; - - if (Config->get_mmc_control() && _mmc_port && _mmc_port->selectable() >= 0) { - pfd[nfds].fd = _mmc_port->selectable(); - pfd[nfds].events = POLLIN|POLLHUP|POLLERR; - ports[nfds] = _mmc_port; - //cerr << "MIDI port " << nfds << " = MMC @ " << _mmc_port << endl; - nfds++; - } - - /* if MTC is being handled on a different port from MMC - or we are not handling MMC at all, poll - the relevant port. - */ - - if (_mtc_port && (_mtc_port != _mmc_port || !Config->get_mmc_control()) && _mtc_port->selectable() >= 0) { - pfd[nfds].fd = _mtc_port->selectable(); - pfd[nfds].events = POLLIN|POLLHUP|POLLERR; - ports[nfds] = _mtc_port; - //cerr << "MIDI port " << nfds << " = MTC @ " << _mtc_port << endl; - nfds++; - } - - if (_midi_clock_port && (_midi_clock_port != _mmc_port || !Config->get_mmc_control()) && _midi_clock_port->selectable() >= 0) { - pfd[nfds].fd = _midi_clock_port->selectable(); - pfd[nfds].events = POLLIN|POLLHUP|POLLERR; - ports[nfds] = _midi_clock_port; - nfds++; - } - - /* if we are using MMC control, we obviously have to listen - the relevant port. - */ - - if (_midi_port && (_midi_port != _mmc_port || !Config->get_mmc_control()) && (_midi_port != _mtc_port) && _midi_port->selectable() >= 0) { - pfd[nfds].fd = _midi_port->selectable(); - pfd[nfds].events = POLLIN|POLLHUP|POLLERR; - ports[nfds] = _midi_port; - // cerr << "MIDI port " << nfds << " = MIDI @ " << _midi_port << endl; - nfds++; - } - - if (!midi_timeouts.empty()) { - timeout = 100; /* 10msecs */ - } else { - timeout = -1; /* if there is no data, we don't care */ - } - - again: - // cerr << "MIDI poll on " << nfds << " for " << timeout << endl; - if (poll (pfd, nfds, timeout) < 0) { - if (errno == EINTR) { - /* gdb at work, perhaps */ - goto again; - } - - error << string_compose(_("MIDI thread poll failed (%1)"), strerror (errno)) << endmsg; - - break; - } - // cerr << "MIDI thread wakes at " << get_cycles () << endl; - - fds_ready = 0; - - /* check the transport request pipe */ - - if (pfd[0].revents & ~POLLIN) { - error << _("Error on transport thread request pipe") << endmsg; - break; - } - - if (pfd[0].revents & POLLIN) { - - char foo[16]; - - // cerr << "MIDI request FIFO ready\n"; - fds_ready++; - - /* empty the pipe of all current requests */ - - while (1) { - size_t nread = read (midi_request_pipe[0], &foo, sizeof (foo)); - - if (nread > 0) { - if ((size_t) nread < sizeof (foo)) { - break; - } else { - continue; - } - } else if (nread == 0) { - break; - } else if (errno == EAGAIN) { - break; - } else { - fatal << _("Error reading from transport request pipe") << endmsg; - /*NOTREACHED*/ - } - } - - while (midi_requests.read (&request, 1) == 1) { - - switch (request->type) { - case MIDIRequest::PortChange: - /* restart poll with new ports */ - // cerr << "rebind\n"; - restart = true; - break; - - case MIDIRequest::Quit: - delete request; - pthread_exit_pbd (0); - /*NOTREACHED*/ - break; - - default: - break; - } - - - delete request; - } - - } - - if (restart) { - continue; - } - - /* now read the rest of the ports */ - - for (int p = 1; p < nfds; ++p) { - if ((pfd[p].revents & ~POLLIN)) { - // error << string_compose(_("Transport: error polling MIDI port %1 (revents =%2%3%4"), p, &hex, pfd[p].revents, &dec) << endmsg; - break; - } - - if (pfd[p].revents & POLLIN) { - fds_ready++; - ports[p]->parse (); - } - } - - /* timeout driven */ - - if (fds_ready < 2 && timeout != -1) { - - for (MidiTimeoutList::iterator i = midi_timeouts.begin(); i != midi_timeouts.end(); ) { - - MidiTimeoutList::iterator tmp; - tmp = i; - ++tmp; - - if (!(*i)()) { - midi_timeouts.erase (i); - } - - i = tmp; - } - } - } -}