projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix warning.
[ardour.git]
/
gtk2_ardour
/
return_ui.cc
diff --git
a/gtk2_ardour/return_ui.cc
b/gtk2_ardour/return_ui.cc
index c4a447255364f1cd142c3022c3b40ec308552122..62762dee44b1d94575fd8590b5db0c3c3a75a373 100644
(file)
--- a/
gtk2_ardour/return_ui.cc
+++ b/
gtk2_ardour/return_ui.cc
@@
-34,10
+34,9
@@
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
-ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& se)
- : _return (r)
- , _session (se)
- , _gpm (se, 250)
+ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* session)
+ :_return (r)
+ , _gpm (session, 250)
{
_gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp());
{
_gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp());
@@
-49,7
+48,7
@@
ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& s
_vbox.pack_start (_hbox, false, false, false);
_vbox.pack_start (_hbox, false, false, false);
- io = manage (new IOSelector (parent,
&se
, r->output()));
+ io = manage (new IOSelector (parent,
session
, r->output()));
pack_start (_vbox, false, false);
pack_start (_vbox, false, false);
@@
-58,7
+57,7
@@
ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& s
show_all ();
_return->set_metering (true);
show_all ();
_return->set_metering (true);
- _return->input()->changed.connect (
sigc::mem_fun (*this, &ReturnUI::ins_changed
));
+ _return->input()->changed.connect (
input_change_connection, invalidator (*this), ui_bind (&ReturnUI::ins_changed, this, _1, _2), gui_context(
));
_gpm.setup_meters ();
_gpm.set_fader_name ("ReturnUIFrame");
_gpm.setup_meters ();
_gpm.set_fader_name ("ReturnUIFrame");
@@
-99,10
+98,10
@@
ReturnUI::fast_update ()
}
}
}
}
-ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return>
s, Session& s
s)
- : ArdourDialog (string(
"Ardour: return ") + s
->name())
+ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return>
r, ARDOUR::Session*
s)
+ : ArdourDialog (string(
_("Return ")) + r
->name())
{
{
- ui = new ReturnUI (this,
s, s
s);
+ ui = new ReturnUI (this,
r,
s);
hpacker.pack_start (*ui, true, true);
hpacker.pack_start (*ui, true, true);
@@
-111,7
+110,7
@@
ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss)
set_name ("ReturnUIWindow");
set_name ("ReturnUIWindow");
-
going_away_connection = s->GoingAway.connect (sigc::mem_fun (*this, &ReturnUIWindow::return_going_away
));
+
r->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&ReturnUIWindow::return_going_away, this), gui_context(
));
signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
}
signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
}
@@
-124,7
+123,7
@@
void
ReturnUIWindow::return_going_away ()
{
ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
ReturnUIWindow::return_going_away ()
{
ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
+ going_away_connection.disconnect ();
delete_when_idle (this);
delete_when_idle (this);
- going_away_connection.disconnect ();
}
}