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 0869490c0c3c278a7dfe70185ad958f9110c3c55..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>
@@
-28,12
+27,13
@@
#include "gui_thread.h"
using namespace ARDOUR;
#include "gui_thread.h"
using namespace ARDOUR;
+using namespace PBD;
-SendUI::SendUI (
Send&
s, Session& se)
+SendUI::SendUI (
boost::shared_ptr<Send>
s, Session& se)
: _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");
@@
-44,7
+44,7
@@
SendUI::SendUI (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);
@@
-52,10
+52,10
@@
SendUI::SendUI (Send& s, Session& se)
show_all ();
show_all ();
- _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 ();
@@
-63,14
+63,14
@@
SendUI::SendUI (Send& s, Session& se)
gpm.setup_meters ();
gpm.set_fader_name ("SendUIFrame");
gpm.setup_meters ();
gpm.set_fader_name ("SendUIFrame");
- screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &SendUI::update));
+
//
screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &SendUI::update));
fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &SendUI::fast_update));
}
SendUI::~SendUI ()
{
fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &SendUI::fast_update));
}
SendUI::~SendUI ()
{
- _send
.
set_metering (false);
-
+ _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();
@@
-96,29
+96,20
@@
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 ()
{
- gpm.update_meters ();
}
void
SendUI::fast_update ()
{
}
void
SendUI::fast_update ()
{
- if (
_session.
meter_falloff() > 0.0f) {
- gpm.update_meters
_falloff
();
+ if (
Config->get_
meter_falloff() > 0.0f) {
+ gpm.update_meters ();
}
}
}
}
-SendUIWindow::SendUIWindow (
Send&
s, Session& ss)
+SendUIWindow::SendUIWindow (
boost::shared_ptr<Send>
s, Session& ss)
{
ui = new SendUI (s, ss);
{
ui = new SendUI (s, ss);
@@
-130,8
+121,8
@@
SendUIWindow::SendUIWindow (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 ()
;
}
}