Merge branch 'master' into cairocanvas

5 files changed, 117 insertions, 110 deletions

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 1d81473f1d..7337e2d1ea 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/session.cc b/libs/ardour/session.cc
index cad869a577..746732f76e 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 e847ba45ce..c33fd91b5d 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -210,16 +210,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;
@@ -280,8 +270,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/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 3a4b562629..d9009bee25 100644
--- a/libs/surfaces/wscript
+++ b/libs/surfaces/wscript
@@ -53,8 +53,11 @@ 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)
+            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)
+            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: