various sundry OS X fixes, changes

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

6 files changed, 21 insertions, 17 deletions

diff --git a/gtk2_ardour/ardour-sae-de.bindings.in b/gtk2_ardour/ardour-sae-de.bindings.in
index 7feaed247b..68f9b13b0b 100644
--- a/gtk2_ardour/ardour-sae-de.bindings.in
+++ b/gtk2_ardour/ardour-sae-de.bindings.in
@@ -335,6 +335,8 @@
 (gtk_accel_path "<Actions>/Editor/goto-mark-9" "KP_9")
 (gtk_accel_path "<Actions>/Transport/ToggleClick" "5")
 (gtk_accel_path "<Actions>/Transport/ToggleAutoReturn" "4")
+(gtk_accel_path "<Actions>/Editor/set-tempo-from-region" "9")
+(gtk_accel_path "<Actions>/Editor/set-tempo-from-edit-range" "0")
 (gtk_accel_path "<Actions>/Transport/focus-on-clock" "KP_Divide")
 (gtk_accel_path "<Actions>/Editor/set-loop-from-edit-range" "bracketright")
 (gtk_accel_path "<Actions>/Editor/set-punch-from-edit-range" "bracketleft")
diff --git a/gtk2_ardour/ardour-sae.menus b/gtk2_ardour/ardour-sae.menus
index e3efc7a849..d9c4f1798f 100644
--- a/gtk2_ardour/ardour-sae.menus
+++ b/gtk2_ardour/ardour-sae.menus
@@ -133,6 +133,9 @@
 			<menuitem action='cycle-edit-point'/>
 			<menuitem action='cycle-edit-point-with-marker'/>
 			<menuitem action='toggle-edit-mode'/>
+			<separator/>
+			<menuitem action='boost-region-gain'/>
+			<menuitem action='cut-region-gain'/>
 	 	</menu>
         </menu>         
 	<menu name='Regions' action='Regions'>
@@ -164,6 +167,8 @@
 		   <menuitem action='trim-region-to-punch'/>
                    <separator/>       
 		   <menuitem action='pitch-shift-region'/>
+		   <menuitem action='set-tempo-from-region'/>
+		   <menuitem action='set-tempo-from-edit-range'/>
 	</menu>
         <menu name='View' action = 'View'>
 	       <menuitem action='ToggleMaximalEditor'/>
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 875dcb18f8..93d69cc626 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -600,8 +600,6 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 	win.show_all ();
 	win.set_position (Gtk::WIN_POS_CENTER);
 
-	hide_splash ();
-
 	/* we just don't care about the result, but we want to block */
 
 	win.run ();
@@ -2164,6 +2162,7 @@ ARDOUR_UI::end_loading_messages ()
 void
 ARDOUR_UI::loading_message (const std::string& msg)
 {
+	cerr << "say: " << msg << endl;
 	show_splash ();
 	splash->message (msg);
 	flush_pending ();
@@ -2210,14 +2209,9 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
 	new_session_dialog->set_existing_session (existing_session);
 	new_session_dialog->reset_recent();
 
-	/* get this out of the way */
-
-	hide_splash ();
-
 	do {
 		new_session_dialog->set_have_engine (backend_audio_is_running);
 		new_session_dialog->present ();
-		end_loading_messages ();
 		response = new_session_dialog->run ();
 		
 		_session_is_new = false;
@@ -2578,6 +2572,7 @@ ARDOUR_UI::show_splash ()
 	}
 
 	splash->show ();
+	splash->present ();
 	splash->queue_draw ();
 	splash->get_window()->process_updates (true);
 	flush_pending ();
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index c89c196a88..1e3c94c223 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -435,6 +435,8 @@ Editor::track_canvas_drag_data_received (const RefPtr<Gdk::DragContext>& context
 					 const SelectionData& data,
 					 guint info, guint time)
 {
+	cerr << "drop on canvas, target = " << data.get_target() << endl;
+
 	if (data.get_target() == "regions") {
 		drop_regions (context, x, y, data, info, time);
 	} else {
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index 0a587b95fa..1f6ed84660 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -67,9 +67,6 @@ PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
 	bool have_gui = false;
 	non_gtk_gui = false;
 
-	Label* label = manage (new Label());
-	label->set_markup ("<b>THIS IS THE PLUGIN UI</b>");
-
 	if (insert->plugin()->has_editor()) {
 		switch (insert->type()) {
 		case ARDOUR::VST:
@@ -77,10 +74,7 @@ PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
 			break;
 
 		case ARDOUR::AudioUnit:
-			//have_gui = create_audiounit_editor (insert);
-			have_gui = true;
-			get_vbox()->pack_start (*label, false, false);
-			cerr << "#*#*#*#*#*#*#*#*## PACK " << label << " INTO PLUGIN UI\n";
+			have_gui = create_audiounit_editor (insert);
 			break;
 			
 		case ARDOUR::LADSPA:
@@ -120,7 +114,6 @@ PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
 	signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false);
 	insert->GoingAway.connect (mem_fun(*this, &PluginUIWindow::plugin_going_away));
 
-#if 0
 	gint h = _pluginui->get_preferred_height ();
 	gint w = _pluginui->get_preferred_width ();
 
@@ -134,7 +127,6 @@ PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
 	}
 
 	set_default_size (w, h); 
-#endif
 }
 
 PluginUIWindow::~PluginUIWindow ()
diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc
index 79764b4605..4221785765 100644
--- a/gtk2_ardour/splash.cc
+++ b/gtk2_ardour/splash.cc
@@ -5,6 +5,8 @@
 
 #include "splash.h"
 
+#include "i18n.h"
+
 using namespace Gtk;
 using namespace Glib;
 using namespace std;
@@ -27,12 +29,17 @@ Splash::Splash ()
 	}
 	
 	darea.set_size_request (pixbuf->get_width(), pixbuf->get_height());
-	set_type_hint (Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN);
 	set_keep_above (true);
 	set_position (WIN_POS_CENTER);
 	darea.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK);
 
 	layout = create_pango_layout ("");
+	string str = "<b>";
+	string i18n = _("Ardour loading ...");
+	str += i18n;
+	str += "</b>";
+
+	layout->set_markup (str);
 
 	darea.show ();
 	darea.signal_expose_event().connect (mem_fun (*this, &Splash::expose));
@@ -44,6 +51,7 @@ void
 Splash::on_realize ()
 {
 	Window::on_realize ();
+	get_window()->set_decorations (Gdk::WMDecoration(0));
 	layout->set_font_description (get_style()->get_font());
 }