diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-16 17:26:50 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-16 17:26:50 -0500 |
commit | 2e27e21d3a09889311e18a8efe11abcaa6d9c8b3 (patch) | |
tree | 709fb3509cf1005686117ec68e2465150727d3da | |
parent | 934e827420de65504450d25f25f79a2b6df5060f (diff) | |
parent | 10933e200369ecceb2c8b3a52be41b930955d269 (diff) |
Merge branch 'master' into cairocanvas
-rw-r--r-- | libs/ardour/ardour/auditioner.h | 1 | ||||
-rw-r--r-- | libs/ardour/auditioner.cc | 74 | ||||
-rw-r--r-- | libs/ardour/route.cc | 1 | ||||
-rw-r--r-- | libs/ardour/session.cc | 14 | ||||
-rw-r--r-- | libs/ardour/session_process.cc | 2 | ||||
-rw-r--r-- | midi_maps/m-audio_oxygen25.map | 10 |
6 files changed, 82 insertions, 20 deletions
diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 0b04ab711d..030bb162dd 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -40,6 +40,7 @@ class LIBARDOUR_API Auditioner : public AudioTrack ~Auditioner (); int init (); + int connect (); void audition_region (boost::shared_ptr<Region>); diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index 9f7dd85b52..73670798d8 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -54,13 +54,31 @@ Auditioner::init () if (Track::init ()) { return -1; } + + if (connect ()) { + return -1; + } + + _output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2)); + + return 0; +} + +Auditioner::~Auditioner () +{ +} +int +Auditioner::connect () +{ string left = Config->get_auditioner_output_left(); string right = Config->get_auditioner_output_right(); vector<string> outputs; _session.engine().get_physical_outputs (DataType::AUDIO, outputs); + via_monitor = false; + if (left.empty() || left == "default") { if (_session.monitor_out()) { left = _session.monitor_out()->input()->audio (0)->name(); @@ -83,31 +101,49 @@ Auditioner::init () } } + _output->disconnect (this); + if (left.empty() && right.empty()) { - warning << _("no outputs available for auditioner - manual connection required") << endmsg; + if (_output->n_ports().n_audio() == 0) { + /* ports not set up, so must be during startup */ + warning << _("no outputs available for auditioner - manual connection required") << endmsg; + } } else { - _main_outs->defer_pan_reset (); - - if (left.length()) { - _output->add_port (left, this, DataType::AUDIO); - } - - if (right.length()) { - _output->add_port (right, this, DataType::AUDIO); - } - - _main_outs->allow_pan_reset (); - _main_outs->reset_panner (); - } + if (_output->n_ports().n_audio() == 0) { - _output->changed.connect_same_thread (*this, boost::bind (&Auditioner::output_changed, this, _1, _2)); + /* create (and connect) new ports */ - return 0; -} + _main_outs->defer_pan_reset (); + + if (left.length()) { + _output->add_port (left, this, DataType::AUDIO); + } + + if (right.length()) { + _output->add_port (right, this, DataType::AUDIO); + } + + _main_outs->allow_pan_reset (); + _main_outs->reset_panner (); -Auditioner::~Auditioner () -{ + } else { + + /* reconnect existing ports */ + + boost::shared_ptr<Port> oleft (_output->nth (0)); + boost::shared_ptr<Port> oright (_output->nth (1)); + if (oleft) { + oleft->connect (left); + } + if (oright) { + oright->connect (right); + } + } + + } + + return 0; } AudioPlaylist& diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 6279dbacf6..7eb50c7695 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -544,6 +544,7 @@ Route::monitor_run (framepos_t start_frame, framepos_t end_frame, pframes_t nfra { assert (is_monitor()); BufferSet& bufs (_session.get_route_buffers (n_process_buffers())); + fill_buffers_with_input (bufs, _input, nframes); passthru (bufs, start_frame, end_frame, nframes, declick); } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index b880883e09..d93d689459 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -805,6 +805,12 @@ Session::remove_monitor_section () /* force reversion to Solo-In-Place */ Config->set_solo_control_is_listen_control (false); + /* if we are auditioning, cancel it ... this is a workaround + to a problem (auditioning does not execute the process graph, + which is needed to remove routes when using >1 core for processing) + */ + cancel_audition (); + { /* Hold process lock while doing this so that we don't hear bits and * pieces of audio as we work on each route. @@ -835,6 +841,10 @@ Session::remove_monitor_section () remove_route (_monitor_out); auto_connect_master_bus (); + + if (auditioner) { + auditioner->connect (); + } } void @@ -979,6 +989,10 @@ Session::add_monitor_section () (*x)->enable_monitor_send (); } } + + if (auditioner) { + auditioner->connect (); + } } void diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc index 6d8c0f9f70..6bfb250aec 100644 --- a/libs/ardour/session_process.cc +++ b/libs/ardour/session_process.cc @@ -875,7 +875,7 @@ Session::process_audition (pframes_t nframes) /* if using a monitor section, run it because otherwise we don't hear anything */ - if (auditioner->needs_monitor()) { + if (_monitor_out && auditioner->needs_monitor()) { _monitor_out->monitor_run (_transport_frame, _transport_frame + nframes, nframes, false); } diff --git a/midi_maps/m-audio_oxygen25.map b/midi_maps/m-audio_oxygen25.map new file mode 100644 index 0000000000..f3d545dca5 --- /dev/null +++ b/midi_maps/m-audio_oxygen25.map @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ArdourMIDIBindings version="1.0.0" name="M-Audio Oxygen25 (factory default)"> + <Binding msg="bf 71 7f" function="loop-toggle"/> + <Binding msg="bf 72 7f" function="transport-start"/> + <Binding msg="bf 73 7f" function="transport-end"/> + <Binding msg="bf 74 7f" function="transport-stop"/> + <Binding msg="bf 75 7f" function="transport-roll"/> + <Binding msg="bf 76 7f" action="Transport/record-roll"/> +</ArdourMIDIBindings> + |