smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

fix crash when renaming a track after deleting a plugin that had a visible GUI/editor window

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4747 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-03-07 14:06:19 +00:00
parent bcd217ec8e
commit b669de1e97
2 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
gtk2_ardour/processor_box.cc
View file

@ -156,6 +156,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> r)
connections.push_back (_route->processors_changed.connect (mem_fun(*this, &ProcessorBox::redisplay_processors)));
connections.push_back (_route->GoingAway.connect (mem_fun (*this, &ProcessorBox::route_going_away)));
connections.push_back (_route->NameChanged.connect (mem_fun(*this, &ProcessorBox::route_name_changed)));
redisplay_processors ();
}
@ -1118,9 +1119,6 @@ ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
plugin_insert->set_gui (plugin_ui);
// change window title when route name is changed
_route->NameChanged.connect (bind (mem_fun(*this, &ProcessorBox::route_name_changed), plugin_ui, boost::weak_ptr<PluginInsert> (plugin_insert)));
} else {
plugin_ui = reinterpret_cast<PluginUIWindow *> (plugin_insert->get_gui());
plugin_ui->set_parent (win);
@ -1378,16 +1376,38 @@ ProcessorBox::rb_edit ()
}
void
ProcessorBox::route_name_changed (PluginUIWindow* plugin_ui, boost::weak_ptr<PluginInsert> wpi)
ProcessorBox::route_name_changed ()
{
ENSURE_GUI_THREAD(bind (mem_fun (*this, &ProcessorBox::route_name_changed), plugin_ui, wpi));
ENSURE_GUI_THREAD (mem_fun (*this, &ProcessorBox::route_name_changed));
boost::shared_ptr<PluginInsert> pi (wpi.lock());
boost::shared_ptr<Processor> processor;
boost::shared_ptr<PluginInsert> plugin_insert;
boost::shared_ptr<Send> send;
Gtk::TreeModel::Children children = model->children();
for (Gtk::TreeModel::Children::iterator iter = children.begin(); iter != children.end(); ++iter) {
Gtk::TreeModel::Row row = *iter;
processor= row[columns.processor];
void* gui = processor->get_gui();
if (!gui) {
continue;
}
/* rename editor windows for sends and plugins */
if (pi) {
WindowTitle title (Glib::get_application_name());
title += generate_processor_title (pi);
plugin_ui->set_title (title.get_string());
if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
title += send->name();
static_cast<Window*>(gui)->set_title (title.get_string());
} else if ((plugin_insert = boost::dynamic_pointer_cast<PluginInsert> (processor)) != 0) {
title += generate_processor_title (plugin_insert);
static_cast<Window*>(gui)->set_title (title.get_string());
}
}
}

2
gtk2_ardour/processor_box.h
View file

@ -222,7 +222,7 @@ class ProcessorBox : public Gtk::HBox, public PluginInterestedObject
static void rb_ab_plugins ();
static void rb_edit ();
void route_name_changed (PluginUIWindow* plugin_ui, boost::weak_ptr<ARDOUR::PluginInsert> pi);
void route_name_changed ();
std::string generate_processor_title (boost::shared_ptr<ARDOUR::PluginInsert> pi);
};