*/
#include <cmath>
+#include <iostream>
#include <sigc++/bind.h>
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().
{
}
+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 (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 */
}
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;
}
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;
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);
}
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:
if (no_redirect_redisplay) {
return;
}
-
+
ignore_delete = true;
model->clear ();
ignore_delete = false;
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;
}
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();
boost::shared_ptr<Redirect> r = (*iter)[columns.redirect];
- if (r.get() == redirect) {
+ if (r == redirect) {
(*iter)[columns.text] = redirect_name (r);
if (redirect->active()) {
_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 ();
}
}
+ no_redirect_redisplay = false;
+ redisplay_redirects (this);
}
void
}
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
}
return;
-
}
void
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
{
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
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 {
/* new stuff */
ActionManager::register_action (popup_act_grp, X_("newplugin"), _("New Plugin ..."), sigc::ptr_fun (RedirectBox::rb_choose_plugin));
- ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"), sigc::ptr_fun (RedirectBox::rb_choose_insert));
- ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."), sigc::ptr_fun (RedirectBox::rb_choose_send));
+
+ act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"), sigc::ptr_fun (RedirectBox::rb_choose_insert));
+ ActionManager::jack_sensitive_actions.push_back (act);
+ act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New Send ..."), sigc::ptr_fun (RedirectBox::rb_choose_send));
+ ActionManager::jack_sensitive_actions.push_back (act);
+
ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear"), sigc::ptr_fun (RedirectBox::rb_clear));
/* standard editing stuff */
ActionManager::plugin_selection_sensitive_actions.push_back(act);
ActionManager::add_action_group (popup_act_grp);
+
+
}
void
}
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
return string_compose(_("ardour: %1: %2 (by %3)"), _route->name(), pi->name(), maker);
}
+
projects / ardour.git / blobdiff