more SAE + gtkosx changes - try to find jackd in the bundle; hard code SAE session params

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2305 d708f5d6-7413-0410-9779-e7cbd77b26cf

gtk2_ardour/ardour_ui.cc

@@ -2091,6 +2091,21 @@ ARDOUR_UI::new_session (Glib::ustring predetermined_path, bool have_engine)
 					uint32_t mchns;
 					AutoConnectOption iconnect;
 					AutoConnectOption oconnect;
+					uint32_t nphysin;
+					uint32_t nphysout;
+					
+					if (Profile->get_sae()) {
+
+						cchns = 0;
+						mchns = 2;
+						iconnect = AutoConnectPhysical;
+						oconnect = AutoConnectMaster;
+						nphysin = 0; // use all available
+						nphysout = 0; // use all available
+
+					} else {
+
+						/* get settings from advanced section of NSD */
 						
 						if (new_session_dialog->create_control_bus()) {
 							cchns = (uint32_t) new_session_dialog->control_channel_count();
@@ -2120,8 +2135,9 @@ ARDOUR_UI::new_session (Glib::ustring predetermined_path, bool have_engine)
 							oconnect = AutoConnectOption (0);
 						} 
 						
-					uint32_t nphysin = (uint32_t) new_session_dialog->input_limit_count();
+						nphysin = (uint32_t) new_session_dialog->input_limit_count();
-					uint32_t nphysout = (uint32_t) new_session_dialog->output_limit_count();
+						nphysout = (uint32_t) new_session_dialog->output_limit_count();
+					}
 
 					if (build_session (session_path,
 							   session_name,
@@ -2970,6 +2986,7 @@ ARDOUR_UI::setup_profile ()
 
 	if (getenv ("ARDOUR_SAE")) {
 		Profile->set_sae ();
+		Profile->set_single_package ();
 	}
 }
 

gtk2_ardour/engine_dialog.cc

@@ -4,6 +4,7 @@
 
 #include <glibmm.h>
 
+#include <ardour/profile.h>
 #include <jack/jack.h>
 
 #include <gtkmm/stock.h>
@@ -197,24 +198,7 @@ EngineControl::EngineControl ()
 
 	strings.clear ();
 
-	if (Glib::file_test ("/usr/bin/jackd", FILE_TEST_EXISTS)) {
+	find_jack_servers (strings);
-		strings.push_back ("/usr/bin/jackd");
-	}
-	if (Glib::file_test ("/usr/local/bin/jackd", FILE_TEST_EXISTS)) {
-		strings.push_back ("/usr/local/bin/jackd");
-	}
-	if (Glib::file_test ("/opt/bin/jackd", FILE_TEST_EXISTS)) {
-		strings.push_back ("/opt/bin/jackd");
-	}
-	if (Glib::file_test ("/usr/bin/jackdmp", FILE_TEST_EXISTS)) {
-		strings.push_back ("/usr/bin/jackd");
-	}
-	if (Glib::file_test ("/usr/local/bin/jackdmp", FILE_TEST_EXISTS)) {
-		strings.push_back ("/usr/local/bin/jackd");
-	}
-	if (Glib::file_test ("/opt/bin/jackdmp", FILE_TEST_EXISTS)) {
-		strings.push_back ("/opt/bin/jackd");
-	}
 
 	if (strings.empty()) {
 		fatal << _("No JACK server found anywhere on this system. Please install JACK and restart") << endmsg;
@@ -587,3 +571,51 @@ EngineControl::audio_mode_changed ()
 		output_device_combo.set_sensitive (true);
 	}
 }
+
+void
+EngineControl::find_jack_servers (vector<string>& strings)
+{
+#ifdef __APPLE
+	if (Profile->get_single_package()) {
+
+		/* this magic lets us finds the path to the OSX bundle, and then
+		   we infer JACK's location from there
+		*/
+		
+		CFURLRef pluginRef = CFBundleCopyBundleURL(CFBundleGetMainBundle());
+		CFStringRef macPath = CFURLCopyFileSystemPath(pluginRef, 
+							      kCFURLPOSIXPathStyle);
+		std::string path = CFStringGetCStringPtr(macPath, 
+							 CFStringGetSystemEncoding());
+		CFRelease(pluginRef);
+		CFRelease(macPath);
+		
+		path += '/jackd';
+
+		if (Glib::file_test (path, FILE_TEST_EXISTS)) {
+			strings.push_back ();
+		} else {
+			warning << _("JACK appears to be missing from the Ardour bundle") << endmsg;
+		}
+#endif
+
+	if (Glib::file_test ("/usr/bin/jackd", FILE_TEST_EXISTS)) {
+		strings.push_back ("/usr/bin/jackd");
+	}
+	if (Glib::file_test ("/usr/local/bin/jackd", FILE_TEST_EXISTS)) {
+		strings.push_back ("/usr/local/bin/jackd");
+	}
+	if (Glib::file_test ("/opt/bin/jackd", FILE_TEST_EXISTS)) {
+		strings.push_back ("/opt/bin/jackd");
+	}
+	if (Glib::file_test ("/usr/bin/jackdmp", FILE_TEST_EXISTS)) {
+		strings.push_back ("/usr/bin/jackd");
+	}
+	if (Glib::file_test ("/usr/local/bin/jackdmp", FILE_TEST_EXISTS)) {
+		strings.push_back ("/usr/local/bin/jackd");
+	}
+	if (Glib::file_test ("/opt/bin/jackdmp", FILE_TEST_EXISTS)) {
+		strings.push_back ("/opt/bin/jackd");
+	}
+
+}

gtk2_ardour/engine_dialog.h

@@ -94,6 +94,7 @@ class EngineControl : public Gtk::VBox {
 	void redisplay_latency ();
 	uint32_t get_rate();
 	void audio_mode_changed ();
+	void find_jack_servers (std::vector<std::string>&);
 };
 
 #endif /* __gtk2_ardour_engine_dialog_h__ */

libs/ardour/ardour/profile.h

@@ -30,6 +30,7 @@ class RuntimeProfile {
     enum Element {
 	    SmallScreen,
 	    SAE,
+	    SinglePackage,
 	    LastElement
     };
     
@@ -42,6 +43,9 @@ class RuntimeProfile {
     void set_sae () { bits[SAE] = true; }
     bool get_sae () const { return bits[SAE]; }
 
+    void set_single_package () { bits[SinglePackage] = true; }
+    bool get_single_package () const { return bits[SinglePackage]; }
+
   private:
     boost::dynamic_bitset<uint64_t> bits;