projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
region list patch #2 from chris g, slightly reworked by me; sv_se po changes, possibl...
[ardour.git]
/
gtk2_ardour
/
send_ui.cc
diff --git
a/gtk2_ardour/send_ui.cc
b/gtk2_ardour/send_ui.cc
index 9925ff51d4331caf405f79a8ab3cf2d751d445dd..90ff3de717637378aa6e3260020c05a7158aa2e1 100644
(file)
--- a/
gtk2_ardour/send_ui.cc
+++ b/
gtk2_ardour/send_ui.cc
@@
-15,7
+15,6
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <ardour/send.h>
*/
#include <ardour/send.h>
@@
-33,8
+32,8
@@
using namespace PBD;
SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
: _send (s),
_session (se),
SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
: _send (s),
_session (se),
- gpm (s, se),
- panners (s, se)
+ gpm (s
->io()
, se),
+ panners (s
->io()
, se)
{
hbox.pack_start (gpm, true, true);
set_name ("SendUIFrame");
{
hbox.pack_start (gpm, true, true);
set_name ("SendUIFrame");
@@
-45,7
+44,7
@@
SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
vbox.pack_start (hbox, false, false, false);
vbox.pack_start (panners, false,false);
vbox.pack_start (hbox, false, false, false);
vbox.pack_start (panners, false,false);
- io =
new IOSelector (se, s, false
);
+ io =
manage (new IOSelector (se, s->io(), false)
);
pack_start (vbox, false, false);
pack_start (vbox, false, false);
@@
-55,8
+54,8
@@
SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
_send->set_metering (true);
_send->set_metering (true);
- _send->
out
put_changed.connect (mem_fun (*this, &SendUI::ins_changed));
- _send->output_changed.connect (mem_fun (*this, &SendUI::outs_changed));
+ _send->
io()->in
put_changed.connect (mem_fun (*this, &SendUI::ins_changed));
+ _send->
io()->
output_changed.connect (mem_fun (*this, &SendUI::outs_changed));
panners.set_width (Wide);
panners.setup_pan ();
panners.set_width (Wide);
panners.setup_pan ();
@@
-71,7
+70,7
@@
SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
SendUI::~SendUI ()
{
_send->set_metering (false);
SendUI::~SendUI ()
{
_send->set_metering (false);
-
+
/* XXX not clear that we need to do this */
screen_update_connection.disconnect();
/* XXX not clear that we need to do this */
screen_update_connection.disconnect();
@@
-97,14
+96,6
@@
SendUI::outs_changed (IOChange change, void* ignored)
}
}
}
}
-void
-SendUI::send_going_away (Redirect *ignored)
-{
- ENSURE_GUI_THREAD (bind (mem_fun (*this, &SendUI::send_going_away), ignored));
-
- delete this;
-}
-
void
SendUI::update ()
{
void
SendUI::update ()
{
@@
-113,7
+104,7
@@
SendUI::update ()
void
SendUI::fast_update ()
{
void
SendUI::fast_update ()
{
- if (
_session.
meter_falloff() > 0.0f) {
+ if (
Config->get_
meter_falloff() > 0.0f) {
gpm.update_meters ();
}
}
gpm.update_meters ();
}
}
@@
-130,8
+121,8
@@
SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
add (vpacker);
set_name ("SendUIWindow");
add (vpacker);
set_name ("SendUIWindow");
-
- s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
+
+
going_away_connection =
s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
signal_delete_event().connect (bind (ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
@@
-143,10
+134,10
@@
SendUIWindow::~SendUIWindow ()
}
void
}
void
-SendUIWindow::send_going_away (
Redirect *ignored
)
+SendUIWindow::send_going_away ()
{
{
- ENSURE_GUI_THREAD
(bind (mem_fun (*this, &SendUIWindow::send_going_away), ignored
));
-
-
delete this
;
+ ENSURE_GUI_THREAD
(mem_fun (*this, &SendUIWindow::send_going_away
));
+ delete_when_idle (this);
+
going_away_connection.disconnect ()
;
}
}