diff options
author | John Emmas <johne53@tiscali.co.uk> | 2013-09-18 10:16:40 +0100 |
---|---|---|
committer | John Emmas <johne53@tiscali.co.uk> | 2013-09-18 10:16:40 +0100 |
commit | e5c426ed4188fe81930b81132d8ecc75bafd7004 (patch) | |
tree | 9191b010cc9fd5b1d9f7b26894c74ef85d6054ba /libs | |
parent | dc3288565b532ae3a36c40a8d373b6b587195a62 (diff) | |
parent | 302b08c0592a6b7c40dec8c04f52c346e14b17af (diff) |
Merge branch 'windows' of git.ardour.org:ardour/ardour into windows
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/audio_backend.h | 5 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 11 | ||||
-rw-r--r-- | libs/ardour/audioengine.cc | 25 | ||||
-rw-r--r-- | libs/ardour/session.cc | 148 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 53 | ||||
-rw-r--r-- | libs/backends/jack/jack_audiobackend.cc | 82 | ||||
-rw-r--r-- | libs/backends/jack/jack_audiobackend.h | 1 | ||||
-rw-r--r-- | libs/backends/jack/jack_connection.cc | 15 | ||||
-rw-r--r-- | libs/backends/jack/jack_connection.h | 5 | ||||
-rw-r--r-- | libs/gtkmm2ext/keyboard.cc | 8 | ||||
-rw-r--r-- | libs/surfaces/wscript | 9 |
11 files changed, 227 insertions, 135 deletions
diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h index 4d57f0b43d..9052acd530 100644 --- a/libs/ardour/ardour/audio_backend.h +++ b/libs/ardour/ardour/audio_backend.h @@ -223,6 +223,11 @@ class AudioBackend : public PortEngine { virtual uint32_t systemic_input_latency () const = 0; virtual uint32_t systemic_output_latency () const = 0; + /** override this if this implementation returns true from + * requires_driver_selection() + */ + virtual std::string driver_name() const { return std::string(); } + /** Return the name of a control application for the * selected/in-use device. If no such application exists, * or if no device has been selected or is in-use, diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index d0cd3fa06e..3fa9fbcb28 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -1071,7 +1071,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi boost::scoped_ptr<SessionDirectory> _session_dir; void hookup_io (); - int when_engine_running (); void graph_reordered (); /** current snapshot name, without the .ardour suffix */ @@ -1137,8 +1136,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void auto_loop_changed (Location *); void auto_loop_declick_range (Location *, framepos_t &, framepos_t &); + int ensure_engine (uint32_t desired_sample_rate); void pre_engine_init (std::string path); int post_engine_init (); + int immediately_post_engine (); void remove_empty_sounds (); void setup_midi_control (); @@ -1521,13 +1522,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi float opt ); - /* number of hardware ports we're using, - based on max (requested,available) - */ - - ChanCount n_physical_outputs; - ChanCount n_physical_inputs; - int find_all_sources (std::string path, std::set<std::string>& result); int find_all_sources_across_snapshots (std::set<std::string>& result, bool exclude_this_snapshot); @@ -1624,7 +1618,6 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void setup_ltc (); void setup_click (); void setup_bundles (); - int ensure_engine (uint32_t desired_sample_rate); }; } // namespace ARDOUR diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index ebebac5774..05fc469c77 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -1037,12 +1037,22 @@ AudioEngine::start_latency_detection () delete _mtdm; _mtdm = 0; + /* find the ports we will connect to */ + + PortEngine::PortHandle* out = pe.get_port_by_name (_latency_output_name); + PortEngine::PortHandle* in = pe.get_port_by_name (_latency_input_name); + + if (!out || !in) { + return; + } + /* create the ports we will use to read/write data */ if ((_latency_output_port = pe.register_port ("latency_out", DataType::AUDIO, IsOutput)) == 0) { return; } if (pe.connect (_latency_output_port, _latency_output_name)) { + pe.unregister_port (_latency_output_port); return; } @@ -1058,9 +1068,9 @@ AudioEngine::start_latency_detection () LatencyRange lr; _latency_signal_latency = 0; - lr = pe.get_latency_range (_latency_input_port, false); + lr = pe.get_latency_range (in, false); _latency_signal_latency = lr.max; - lr = pe.get_latency_range (_latency_output_port, true); + lr = pe.get_latency_range (out, true); _latency_signal_latency += lr.max; /* all created and connected, lets go */ @@ -1076,9 +1086,14 @@ AudioEngine::stop_latency_detection () { _measuring_latency = false; - port_engine().unregister_port (_latency_output_port); - port_engine().unregister_port (_latency_input_port); - + if (_latency_output_port) { + port_engine().unregister_port (_latency_output_port); + _latency_output_port = 0; + } + if (_latency_input_port) { + port_engine().unregister_port (_latency_input_port); + _latency_input_port = 0; + } if (_started_for_latency) { stop (); } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 4be42c769a..2a081086d4 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -258,17 +258,26 @@ Session::Session (AudioEngine &eng, , _suspend_timecode_transmission (0) , _speakers (new Speakers) , ignore_route_processor_changes (false) + , _midi_ports (0) + , _mmc (0) { uint32_t sr = 0; pre_engine_init (fullpath); if (_is_new) { + if (ensure_engine (sr)) { + destroy (); + throw failed_constructor (); + } + if (create (mix_template, bus_profile)) { destroy (); throw failed_constructor (); } + } else { + if (load_state (_current_snapshot_name)) { throw failed_constructor (); } @@ -284,11 +293,11 @@ Session::Session (AudioEngine &eng, sr = atoi (prop->value()); } } - } - if (ensure_engine (sr)) { - destroy (); - throw failed_constructor (); + if (ensure_engine (sr)) { + destroy (); + throw failed_constructor (); + } } if (post_engine_init ()) { @@ -361,6 +370,50 @@ Session::ensure_engine (uint32_t desired_sample_rate) return -1; } + return immediately_post_engine (); + +} + +int +Session::immediately_post_engine () +{ + /* Do various initializations that should take place directly after we + * know that the engine is running, but before we either create a + * session or set state for an existing one. + */ + + if (how_many_dsp_threads () > 1) { + /* For now, only create the graph if we are using >1 DSP threads, as + it is a bit slower than the old code with 1 thread. + */ + _process_graph.reset (new Graph (*this)); + } + + /* every time we reconnect, recompute worst case output latencies */ + + _engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this)); + + if (synced_to_jack()) { + _engine.transport_stop (); + } + + if (config.get_jack_time_master()) { + _engine.transport_locate (_transport_frame); + } + + try { + BootMessage (_("Set up LTC")); + setup_ltc (); + BootMessage (_("Set up Click")); + setup_click (); + BootMessage (_("Set up standard connections")); + setup_bundles (); + } + + catch (failed_constructor& err) { + return -1; + } + return 0; } @@ -474,9 +527,9 @@ Session::destroy () /* not strictly necessary, but doing it here allows the shared_ptr debugging to work */ playlists.reset (); - delete _mmc; - delete _midi_ports; - delete _locations; + delete _mmc; _mmc = 0; + delete _midi_ports; _midi_ports = 0; + delete _locations; _locations = 0; DEBUG_TRACE (DEBUG::Destruction, "Session::destroy() done\n"); @@ -683,81 +736,6 @@ Session::setup_bundles () } -int -Session::when_engine_running () -{ - /* every time we reconnect, recompute worst case output latencies */ - - _engine.Running.connect_same_thread (*this, boost::bind (&Session::initialize_latencies, this)); - - if (synced_to_jack()) { - _engine.transport_stop (); - } - - if (config.get_jack_time_master()) { - _engine.transport_locate (_transport_frame); - } - - - try { - BootMessage (_("Set up LTC")); - setup_ltc (); - BootMessage (_("Set up Click")); - setup_click (); - BootMessage (_("Set up standard connections")); - setup_bundles (); - } - - catch (failed_constructor& err) { - return -1; - } - - BootMessage (_("Setup signal flow and plugins")); - - /* Reset all panners */ - - Delivery::reset_panners (); - - /* this will cause the CPM to instantiate any protocols that are in use - * (or mandatory), which will pass it this Session, and then call - * set_state() on each instantiated protocol to match stored state. - */ - - ControlProtocolManager::instance().set_session (this); - - /* This must be done after the ControlProtocolManager set_session above, - as it will set states for ports which the ControlProtocolManager creates. - */ - - // XXX set state of MIDI::Port's - // MidiPortManager::instance()->set_port_states (Config->midi_port_states ()); - - /* And this must be done after the MIDI::Manager::set_port_states as - * it will try to make connections whose details are loaded by set_port_states. - */ - - hookup_io (); - - /* Let control protocols know that we are now all connected, so they - * could start talking to surfaces if they want to. - */ - - ControlProtocolManager::instance().midi_connectivity_established (); - - if (_is_new && !no_auto_connect()) { - Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock()); - auto_connect_master_bus (); - } - - _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty)); - - /* update latencies */ - - initialize_latencies (); - - return 0; -} - void Session::auto_connect_master_bus () { @@ -917,14 +895,14 @@ Session::add_monitor_section () /* Monitor bus is audio only */ - uint32_t mod = n_physical_outputs.get (DataType::AUDIO); - uint32_t limit = _monitor_out->n_outputs().get (DataType::AUDIO); vector<string> outputs[DataType::num_types]; for (uint32_t i = 0; i < DataType::num_types; ++i) { _engine.get_physical_outputs (DataType (DataType::Symbol (i)), outputs[i]); } - + + uint32_t mod = outputs[DataType::AUDIO].size(); + uint32_t limit = _monitor_out->n_outputs().get (DataType::AUDIO); if (mod != 0) { diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 2d91bdd4c2..1a605d2fd5 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -211,16 +211,6 @@ Session::post_engine_init () set_block_size (_engine.samples_per_cycle()); set_frame_rate (_engine.sample_rate()); - if (how_many_dsp_threads () > 1) { - /* For now, only create the graph if we are using >1 DSP threads, as - it is a bit slower than the old code with 1 thread. - */ - _process_graph.reset (new Graph (*this)); - } - - n_physical_outputs = _engine.n_physical_outputs (); - n_physical_inputs = _engine.n_physical_inputs (); - BootMessage (_("Using configuration")); _midi_ports = new MidiPortManager; @@ -281,8 +271,47 @@ Session::post_engine_init () Config->map_parameters (ff); config.map_parameters (ft); - when_engine_running (); - + /* Reset all panners */ + + Delivery::reset_panners (); + + /* this will cause the CPM to instantiate any protocols that are in use + * (or mandatory), which will pass it this Session, and then call + * set_state() on each instantiated protocol to match stored state. + */ + + ControlProtocolManager::instance().set_session (this); + + /* This must be done after the ControlProtocolManager set_session above, + as it will set states for ports which the ControlProtocolManager creates. + */ + + // XXX set state of MIDI::Port's + // MidiPortManager::instance()->set_port_states (Config->midi_port_states ()); + + /* And this must be done after the MIDI::Manager::set_port_states as + * it will try to make connections whose details are loaded by set_port_states. + */ + + hookup_io (); + + /* Let control protocols know that we are now all connected, so they + * could start talking to surfaces if they want to. + */ + + ControlProtocolManager::instance().midi_connectivity_established (); + + if (_is_new && !no_auto_connect()) { + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock()); + auto_connect_master_bus (); + } + + _state_of_the_state = StateOfTheState (_state_of_the_state & ~(CannotSave|Dirty)); + + /* update latencies */ + + initialize_latencies (); + _locations->changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this)); _locations->added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1)); diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index b3dbdcae71..1e7cb9d8d5 100644 --- a/libs/backends/jack/jack_audiobackend.cc +++ b/libs/backends/jack/jack_audiobackend.cc @@ -57,8 +57,8 @@ JACKAudioBackend::JACKAudioBackend (AudioEngine& e, boost::shared_ptr<JackConnec , _target_buffer_size (1024) , _target_sample_format (FormatFloat) , _target_interleaved (false) - , _target_input_channels (-1) - , _target_output_channels (-1) + , _target_input_channels (0) + , _target_output_channels (0) , _target_systemic_input_latency (0) , _target_systemic_output_latency (0) , _current_sample_rate (0) @@ -292,7 +292,10 @@ int JACKAudioBackend::set_input_channels (uint32_t cnt) { if (available()) { - return -1; + if (cnt != 0) { + /* can't set a real value for this while JACK runs */ + return -1; + } } _target_input_channels = cnt; @@ -304,7 +307,10 @@ int JACKAudioBackend::set_output_channels (uint32_t cnt) { if (available()) { - return -1; + if (cnt != 0) { + /* can't set a real value for this while JACK runs */ + return -1; + } } _target_output_channels = cnt; @@ -316,6 +322,7 @@ int JACKAudioBackend::set_systemic_input_latency (uint32_t l) { if (available()) { + /* can't do this while JACK runs */ return -1; } @@ -328,6 +335,7 @@ int JACKAudioBackend::set_systemic_output_latency (uint32_t l) { if (available()) { + /* can't do this while JACK runs */ return -1; } @@ -341,18 +349,34 @@ JACKAudioBackend::set_systemic_output_latency (uint32_t l) std::string JACKAudioBackend::device_name () const { - if (available()) { - return "???"; + if (!_jack_connection->in_control()) { + return "???"; // JACK has no way (as of fall 2013) to return + // the device name } return _target_device; } +std::string +JACKAudioBackend::driver_name() const +{ + if (!_jack_connection->in_control()) { + return "???"; // JACK has no way (as of fall 2013) to return + // the driver name + } + + return _target_driver; +} + float JACKAudioBackend::sample_rate () const { - if (available()) { - return _current_sample_rate; + if (!_jack_connection->in_control()) { + if (available()) { + return _current_sample_rate; + } else { + return 0; + } } return _target_sample_rate; } @@ -360,8 +384,12 @@ JACKAudioBackend::sample_rate () const uint32_t JACKAudioBackend::buffer_size () const { - if (available()) { - return _current_buffer_size; + if (!_jack_connection->in_control()) { + if (available()) { + return _current_buffer_size; + } else { + return 0; + } } return _target_buffer_size; } @@ -381,19 +409,37 @@ JACKAudioBackend::interleaved () const uint32_t JACKAudioBackend::input_channels () const { - if (available()) { - return n_physical (JackPortIsInput).n_audio(); - } - return _target_input_channels; + if (!_jack_connection->in_control()) { + if (available()) { + return n_physical (JackPortIsInput).n_audio(); + } else { + return 0; + } + } else { + if (available()) { + return n_physical (JackPortIsInput).n_audio(); + } else { + return _target_input_channels; + } + } } uint32_t JACKAudioBackend::output_channels () const { - if (available()) { - return n_physical (JackPortIsOutput).n_audio(); - } - return _target_output_channels; + if (!_jack_connection->in_control()) { + if (available()) { + return n_physical (JackPortIsOutput).n_audio(); + } else { + return 0; + } + } else { + if (available()) { + return n_physical (JackPortIsOutput).n_audio(); + } else { + return _target_output_channels; + } + } } uint32_t diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h index 655c939c51..9ab545f3ee 100644 --- a/libs/backends/jack/jack_audiobackend.h +++ b/libs/backends/jack/jack_audiobackend.h @@ -85,6 +85,7 @@ class JACKAudioBackend : public AudioBackend { uint32_t output_channels () const; uint32_t systemic_input_latency () const; uint32_t systemic_output_latency () const; + std::string driver_name() const; std::string control_app_name () const; void launch_control_app (); diff --git a/libs/backends/jack/jack_connection.cc b/libs/backends/jack/jack_connection.cc index 00b6feb5e1..d5d25c747f 100644 --- a/libs/backends/jack/jack_connection.cc +++ b/libs/backends/jack/jack_connection.cc @@ -16,6 +16,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <iostream> #include <boost/scoped_ptr.hpp> #include <jack/session.h> @@ -53,6 +54,7 @@ JackConnection::JackConnection (const std::string& arg1, const std::string& arg2 , _client_name (arg1) , session_uuid (arg2) { + _in_control = !server_running(); } JackConnection::~JackConnection () @@ -104,6 +106,19 @@ JackConnection::open () global_epa->restore (); } + /* check to see if the server is already running so that we know if we + * are starting it. + */ + + jack_client_t* c = jack_client_open ("ardourprobe", JackNoStartServer, &status); + + if (status == 0) { + _in_control = false; + jack_client_close (c); + } else { + _in_control = true; + } + /* ensure that PATH or equivalent includes likely locations of the JACK * server, in case the user's default does not. */ diff --git a/libs/backends/jack/jack_connection.h b/libs/backends/jack/jack_connection.h index cd45f3b9ba..229d9697d9 100644 --- a/libs/backends/jack/jack_connection.h +++ b/libs/backends/jack/jack_connection.h @@ -27,12 +27,15 @@ class JackConnection { void halted_callback (); void halted_info_callback (jack_status_t, const char*); - static bool server_running(); + bool in_control() const { return _in_control; } + static bool server_running(); + private: jack_client_t* volatile _jack; std::string _client_name; std::string session_uuid; + bool _in_control; }; } // namespace diff --git a/libs/gtkmm2ext/keyboard.cc b/libs/gtkmm2ext/keyboard.cc index 5087f61a23..2bfb5fa58b 100644 --- a/libs/gtkmm2ext/keyboard.cc +++ b/libs/gtkmm2ext/keyboard.cc @@ -233,8 +233,9 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) DEBUG_TRACE ( DEBUG::Keyboard, string_compose ( - "Snoop widget %1 key %2 type %3 state %4 magic %5\n", - widget, event->keyval, event->type, event->state, _some_magic_widget_has_focus + "Snoop widget %1 name: [%6] key %2 type %3 state %4 magic %5\n", + widget, event->keyval, event->type, event->state, _some_magic_widget_has_focus, + gtk_widget_get_name (widget) ) ); @@ -324,6 +325,8 @@ Keyboard::snooper (GtkWidget *widget, GdkEventKey *event) } } + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("snooper returns %1\n", ret)); + return ret; } @@ -346,6 +349,7 @@ bool Keyboard::enter_window (GdkEventCrossing *, Gtk::Window* win) { current_window = win; + DEBUG_TRACE (DEBUG::Keyboard, string_compose ("Entering window, title = %1\n", win->get_title())); return false; } diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 335d14ee87..29edc427b2 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -55,9 +55,12 @@ def configure(conf): if conf.is_defined('HAVE_CWIID_H'): conf.check_cc (header_name='bluetooth/bluetooth.h', define_name='HAVE_BLUETOOTH_H',mandatory=False) if conf.is_defined('HAVE_BLUETOOTH_H'): - autowaf.check_pkg(conf, 'cwiid', uselib_store='CWIID', atleast_version='0.6.00') - conf.define ('BUILD_WIIMOTE', 1) - sub_config_and_use(conf, 'wiimote') + autowaf.check_pkg(conf, 'cwiid', uselib_store='CWIID', atleast_version='0.6.00',mandatory=False) + if conf.is_defined ('HAVE_CWIID'): + conf.define ('BUILD_WIIMOTE', 1) + sub_config_and_use(conf, 'wiimote') + else: + print('You have the cwiid headers needed to compile wiimote support BUT you are missing the pkg-config file for cwiid') else: print('You are missing the libbluetooth headers needed to compile wiimote support') else: |