ProcessorWindowProxy::processor_going_away takes care of deletion
This commit is contained in:
parent
1146d58d21
commit
35aed0efab
@ -176,8 +176,6 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD
|
|||||||
ok_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
|
ok_but->signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept));
|
||||||
|
|
||||||
signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
|
signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false);
|
||||||
|
|
||||||
pi->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
@ -187,15 +185,6 @@ PortInsertWindow::wm_delete (GdkEventAny* /*event*/)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
PortInsertWindow::plugin_going_away ()
|
|
||||||
{
|
|
||||||
ENSURE_GUI_THREAD (*this, &PortInsertWindow::plugin_going_away)
|
|
||||||
|
|
||||||
going_away_connection.disconnect ();
|
|
||||||
delete_when_idle (this);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
PortInsertWindow::on_map ()
|
PortInsertWindow::on_map ()
|
||||||
{
|
{
|
||||||
|
@ -67,7 +67,6 @@ class PortInsertWindow : public ArdourDialog
|
|||||||
void cancel ();
|
void cancel ();
|
||||||
void accept ();
|
void accept ();
|
||||||
|
|
||||||
void plugin_going_away ();
|
|
||||||
PBD::ScopedConnection going_away_connection;
|
PBD::ScopedConnection going_away_connection;
|
||||||
|
|
||||||
bool wm_delete (GdkEventAny*);
|
bool wm_delete (GdkEventAny*);
|
||||||
|
@ -110,19 +110,9 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
|
|||||||
|
|
||||||
set_name ("ReturnUIWindow");
|
set_name ("ReturnUIWindow");
|
||||||
|
|
||||||
r->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ReturnUIWindow::~ReturnUIWindow ()
|
ReturnUIWindow::~ReturnUIWindow ()
|
||||||
{
|
{
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
ReturnUIWindow::return_going_away ()
|
|
||||||
{
|
|
||||||
ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
|
|
||||||
going_away_connection.disconnect ();
|
|
||||||
delete_when_idle (this);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -68,7 +68,6 @@ class ReturnUIWindow : public ArdourWindow
|
|||||||
private:
|
private:
|
||||||
Gtk::HBox hpacker;
|
Gtk::HBox hpacker;
|
||||||
|
|
||||||
void return_going_away ();
|
|
||||||
PBD::ScopedConnection going_away_connection;
|
PBD::ScopedConnection going_away_connection;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -133,19 +133,9 @@ SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session* session)
|
|||||||
ui->show ();
|
ui->show ();
|
||||||
hpacker.show ();
|
hpacker.show ();
|
||||||
|
|
||||||
s->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&SendUIWindow::send_going_away, this), gui_context());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
SendUIWindow::~SendUIWindow ()
|
SendUIWindow::~SendUIWindow ()
|
||||||
{
|
{
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
SendUIWindow::send_going_away ()
|
|
||||||
{
|
|
||||||
ENSURE_GUI_THREAD (*this, &SendUIWindow::send_going_away)
|
|
||||||
going_away_connection.disconnect ();
|
|
||||||
delete_when_idle (this);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@ -69,7 +69,6 @@ class SendUIWindow : public ArdourWindow
|
|||||||
private:
|
private:
|
||||||
Gtk::HBox hpacker;
|
Gtk::HBox hpacker;
|
||||||
|
|
||||||
void send_going_away ();
|
|
||||||
PBD::ScopedConnection going_away_connection;
|
PBD::ScopedConnection going_away_connection;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user