Merged with trunk R1283.

NOTE: Compiles, but broken (crash on adding MIDI track).


git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 116 insertions, 40 deletions

diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc
index f2ee2a5b8f..fac6ede6f3 100644
--- a/gtk2_ardour/redirect_box.cc
+++ b/gtk2_ardour/redirect_box.cc
@@ -19,6 +19,7 @@
 */
 
 #include <cmath>
+#include <iostream>
 
 #include <sigc++/bind.h>
 
@@ -136,11 +137,12 @@ RedirectBox::RedirectBox (Placement pcmnt, Session& sess, boost::shared_ptr<Rout
 	pack_start (redirect_eventbox, true, true);
 
 	_route->redirects_changed.connect (mem_fun(*this, &RedirectBox::redisplay_redirects));
+	_route->GoingAway.connect (mem_fun (*this, &RedirectBox::route_going_away));
 
 	redirect_eventbox.signal_enter_notify_event().connect (bind (sigc::ptr_fun (RedirectBox::enter_box), this));
 
 	redirect_display.signal_button_press_event().connect (mem_fun(*this, &RedirectBox::redirect_button_press_event), false);
-	redirect_display.signal_button_release_event().connect (mem_fun(*this, &RedirectBox::redirect_button_press_event));
+	redirect_display.signal_button_release_event().connect (mem_fun(*this, &RedirectBox::redirect_button_release_event));
 
 	/* start off as a passthru strip. we'll correct this, if necessary,
 	   in update_diskstream_display().
@@ -156,6 +158,13 @@ RedirectBox::~RedirectBox ()
 }
 
 void
+RedirectBox::route_going_away ()
+{
+	/* don't keep updating display as redirects are deleted */
+	no_redirect_redisplay = true;
+}
+
+void
 RedirectBox::object_drop (string type, uint32_t cnt, const boost::shared_ptr<Redirect>* ptr)
 {
 	if (type != "redirects" || cnt == 0 || !ptr) {
@@ -282,13 +291,8 @@ RedirectBox::redirect_button_press_event (GdkEventButton *ev)
 		}
 		
 	}
-	
-	if (redirect && Keyboard::is_delete_event (ev)) {
-		
-		Glib::signal_idle().connect (bind (mem_fun(*this, &RedirectBox::idle_delete_redirect), redirect));
-		ret = true;
-		
-	} else if (redirect && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS && ev->state == 0))) {
+
+	if (redirect && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS && ev->state == 0))) {
 		
 		if (_session.engine().connected()) {
 			/* XXX giving an error message here is hard, because we may be in the midst of a button press */
@@ -296,23 +300,50 @@ RedirectBox::redirect_button_press_event (GdkEventButton *ev)
 		}
 		ret = true;
 		
+	} else if (redirect && ev->button == 1 && selected) {
+
+		// this is purely informational but necessary
+		RedirectSelected (redirect); // emit
+	}
+	
+	return ret;
+}
+
+bool
+RedirectBox::redirect_button_release_event (GdkEventButton *ev)
+{
+	TreeIter iter;
+	TreeModel::Path path;
+	TreeViewColumn* column;
+	int cellx;
+	int celly;
+	boost::shared_ptr<Redirect> redirect;
+	int ret = false;
+
+
+	if (redirect_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
+		if ((iter = model->get_iter (path))) {
+			redirect = (*iter)[columns.redirect];
+		}
+	}
+
+	if (redirect && Keyboard::is_delete_event (ev)) {
+		
+		Glib::signal_idle().connect (bind (mem_fun(*this, &RedirectBox::idle_delete_redirect), boost::weak_ptr<Redirect>(redirect)));
+		ret = true;
+		
 	} else if (Keyboard::is_context_menu_event (ev)) {
 
 		show_redirect_menu(ev->time);
 		ret = true;
 
-	} else if (redirect && ev->button == 2 && ev->state == 0) {
+	} else if (redirect && ev->button == 2 && ev->state == GDK_BUTTON2_MASK) {
 		
 		redirect->set_active (!redirect->active(), this);
 		ret = true;
 
 	} 
-	else if (redirect && ev->button == 1 && selected) {
 
-		// this is purely informational but necessary
-		RedirectSelected (redirect); // emit
-	}
-	
 	return ret;
 }
 
@@ -362,7 +393,7 @@ RedirectBox::insert_plugin_chosen (boost::shared_ptr<Plugin> plugin)
 
 		boost::shared_ptr<Redirect> redirect (new PluginInsert (_session, plugin, _placement));
 		
-		redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active));
+		redirect->active_changed.connect (bind (mem_fun (*this, &RedirectBox::show_redirect_active_r), boost::weak_ptr<Redirect>(redirect)));
 
 		uint32_t err_streams;
 
@@ -440,7 +471,7 @@ void
 RedirectBox::choose_insert ()
 {
 	boost::shared_ptr<Redirect> redirect (new PortInsert (_session, _placement));
-	redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active));
+	redirect->active_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_active_r), boost::weak_ptr<Redirect>(redirect)));
 	_route->add_redirect (redirect, this);
 }
 
@@ -457,15 +488,24 @@ RedirectBox::choose_send ()
 	IOSelectorWindow *ios = new IOSelectorWindow (_session, send, false, true);
 	
 	ios->show_all ();
-	ios->selector().Finished.connect (bind (mem_fun(*this, &RedirectBox::send_io_finished), boost::static_pointer_cast<Redirect>(send), ios));
+
+	boost::shared_ptr<Redirect> r = boost::static_pointer_cast<Redirect>(send);
+
+	ios->selector().Finished.connect (bind (mem_fun(*this, &RedirectBox::send_io_finished), boost::weak_ptr<Redirect>(r), ios));
 }
 
 void
-RedirectBox::send_io_finished (IOSelector::Result r, boost::shared_ptr<Redirect> redirect, IOSelectorWindow* ios)
+RedirectBox::send_io_finished (IOSelector::Result r, boost::weak_ptr<Redirect> weak_redirect, IOSelectorWindow* ios)
 {
+	boost::shared_ptr<Redirect> redirect (weak_redirect.lock());
+
+	if (!redirect) {
+		return;
+	}
+
 	switch (r) {
 	case IOSelector::Cancelled:
-		// delete redirect; XXX SHAREDPTR HOW TO DESTROY THE REDIRECT ? do we even need to think about it?
+		// redirect will go away when all shared_ptrs to it vanish
 		break;
 
 	case IOSelector::Accepted:
@@ -484,7 +524,7 @@ RedirectBox::redisplay_redirects (void *src)
 	if (no_redirect_redisplay) {
 		return;
 	}
-
+	
 	ignore_delete = true;
 	model->clear ();
 	ignore_delete = false;
@@ -515,16 +555,22 @@ RedirectBox::add_redirect_to_display (boost::shared_ptr<Redirect> redirect)
 	Gtk::TreeModel::Row row = *(model->append());
 	row[columns.text] = redirect_name (redirect);
 	row[columns.redirect] = redirect;
-	
-	show_redirect_active (redirect.get(), this);
 
-	redirect_active_connections.push_back (redirect->active_changed.connect (mem_fun(*this, &RedirectBox::show_redirect_active)));
-	redirect_name_connections.push_back (redirect->name_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_name), redirect)));
+	show_redirect_active (redirect);
+
+	redirect_active_connections.push_back (redirect->active_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_active_r), boost::weak_ptr<Redirect>(redirect))));
+	redirect_name_connections.push_back (redirect->name_changed.connect (bind (mem_fun(*this, &RedirectBox::show_redirect_name), boost::weak_ptr<Redirect>(redirect))));
 }
 
 string
-RedirectBox::redirect_name (boost::shared_ptr<Redirect> redirect)
+RedirectBox::redirect_name (boost::weak_ptr<Redirect> weak_redirect)
 {
+	boost::shared_ptr<Redirect> redirect (weak_redirect.lock());
+
+	if (!redirect) {
+		return string();
+	}
+
 	boost::shared_ptr<Send> send;
 	string name_display;
 
@@ -586,16 +632,28 @@ RedirectBox::build_redirect_tooltip (EventBox& box, string start)
 }
 
 void
-RedirectBox::show_redirect_name (void* src, boost::shared_ptr<Redirect> redirect)
+RedirectBox::show_redirect_name (void* src, boost::weak_ptr<Redirect> redirect)
 {
 	ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_name), src, redirect));
-	show_redirect_active (redirect.get(), src);
+	show_redirect_active (redirect);
 }
 
 void
-RedirectBox::show_redirect_active (Redirect* redirect, void *src)
+RedirectBox::show_redirect_active_r (Redirect* r, void *src, boost::weak_ptr<Redirect> weak_redirect)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_active), redirect, src));
+	show_redirect_active (weak_redirect);
+}
+
+void
+RedirectBox::show_redirect_active (boost::weak_ptr<Redirect> weak_redirect)
+{
+	ENSURE_GUI_THREAD(bind (mem_fun(*this, &RedirectBox::show_redirect_active), weak_redirect));
+	
+	boost::shared_ptr<Redirect> redirect (weak_redirect.lock());
+	
+	if (!redirect) {
+		return;
+	}
 
 	Gtk::TreeModel::Children children = model->children();
 	Gtk::TreeModel::Children::iterator iter = children.begin();
@@ -604,7 +662,7 @@ RedirectBox::show_redirect_active (Redirect* redirect, void *src)
 
 		boost::shared_ptr<Redirect> r = (*iter)[columns.redirect];
 
-		if (r.get() == redirect) {
+		if (r == redirect) {
 			(*iter)[columns.text] = redirect_name (r);
 			
 			if (redirect->active()) {
@@ -699,6 +757,7 @@ RedirectBox::cut_redirects ()
 	
 	_rr_selection.set (to_be_removed);
 
+	no_redirect_redisplay = true;
 	for (vector<boost::shared_ptr<Redirect> >::iterator i = to_be_removed.begin(); i != to_be_removed.end(); ++i) {
 		
 		void* gui = (*i)->get_gui ();
@@ -713,6 +772,8 @@ RedirectBox::cut_redirects ()
 		}
 
 	}
+	no_redirect_redisplay = false;
+	redisplay_redirects (this);
 }
 
 void
@@ -735,12 +796,22 @@ RedirectBox::copy_redirects ()
 }
 
 gint
-RedirectBox::idle_delete_redirect (boost::shared_ptr<Redirect> redirect)
+RedirectBox::idle_delete_redirect (boost::weak_ptr<Redirect> weak_redirect)
 {
+	boost::shared_ptr<Redirect> redirect (weak_redirect.lock());
+
+	if (!redirect) {
+		return false;
+	}
+
 	/* NOT copied to _mixer.selection() */
 
+	no_redirect_redisplay = true;
 	_route->remove_redirect (redirect, this);
-	return FALSE;
+	no_redirect_redisplay = false;
+	redisplay_redirects (this);
+
+	return false;
 }
 
 void
@@ -765,7 +836,6 @@ RedirectBox::rename_redirect (boost::shared_ptr<Redirect> redirect)
 	}
 
 	return;
-  
 }
 
 void
@@ -784,9 +854,12 @@ RedirectBox::cut_redirect (boost::shared_ptr<Redirect> redirect)
 		static_cast<Gtk::Widget*>(gui)->hide ();
 	}
 	
+	no_redirect_redisplay = true;
 	if (_route->remove_redirect (redirect, this)) {
 		_rr_selection.remove (redirect);
 	}
+	no_redirect_redisplay = false;
+	redisplay_redirects (this);
 }
 
 void
@@ -847,8 +920,9 @@ RedirectBox::get_selected_redirects (vector<boost::shared_ptr<Redirect> >& redir
 {
     vector<Gtk::TreeModel::Path> pathlist = redirect_display.get_selection()->get_selected_rows();
  
-	for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter)
-		redirects.push_back ((*(model->get_iter(*iter)))[columns.redirect]);
+    for (vector<Gtk::TreeModel::Path>::iterator iter = pathlist.begin(); iter != pathlist.end(); ++iter) {
+	    redirects.push_back ((*(model->get_iter(*iter)))[columns.redirect]);
+    }
 }
 
 void
@@ -980,7 +1054,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect)
 					plugin_insert->set_gui (plugin_ui);
 					
 					// change window title when route name is changed
-					_route->name_changed.connect (bind (mem_fun(*this, &RedirectBox::route_name_changed), plugin_ui, plugin_insert));
+					_route->name_changed.connect (bind (mem_fun(*this, &RedirectBox::route_name_changed), plugin_ui, boost::weak_ptr<PluginInsert> (plugin_insert)));
 					
 				
 				} else {
@@ -1240,11 +1314,13 @@ RedirectBox::rb_edit ()
 }
 
 void
-RedirectBox::route_name_changed (void* src, PluginUIWindow* plugin_ui, boost::shared_ptr<PluginInsert> pi)
+RedirectBox::route_name_changed (void* src, PluginUIWindow* plugin_ui, boost::weak_ptr<PluginInsert> wpi)
 {
-	ENSURE_GUI_THREAD(bind (mem_fun (*this, &RedirectBox::route_name_changed), src, plugin_ui, pi));
-	
-	plugin_ui->set_title (generate_redirect_title (pi));
+	ENSURE_GUI_THREAD(bind (mem_fun (*this, &RedirectBox::route_name_changed), src, plugin_ui, wpi));
+	boost::shared_ptr<PluginInsert> pi (wpi.lock());
+	if (pi) {
+		plugin_ui->set_title (generate_redirect_title (pi));
+	}
 }
 
 string