projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix insane formatting (how did this even happen? copy paste from an email diff or...
[ardour.git]
/
gtk2_ardour
/
send_ui.cc
diff --git
a/gtk2_ardour/send_ui.cc
b/gtk2_ardour/send_ui.cc
index 8faa3158481c1bd6b9921d272a320689392d6ad5..3fb6e8af47571a102f17c897a08cd2fce282c4ff 100644
(file)
--- a/
gtk2_ardour/send_ui.cc
+++ b/
gtk2_ardour/send_ui.cc
@@
-17,9
+17,11
@@
*/
*/
-#include <ardour/send.h>
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/doi.h>
+#include <ardour/io.h>
+#include <ardour/send.h>
+
#include "utils.h"
#include "send_ui.h"
#include "io_selector.h"
#include "utils.h"
#include "send_ui.h"
#include "io_selector.h"
@@
-30,11
+32,14
@@
using namespace ARDOUR;
using namespace PBD;
SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
using namespace PBD;
SendUI::SendUI (boost::shared_ptr<Send> s, Session& se)
- : _send (s)
,
- _session (se),
- gpm (s, se),
-
panners (s,
se)
+ : _send (s)
+ , _session (se)
+ , gpm (se)
+
, panners (
se)
{
{
+ panners.set_io (s->io());
+ gpm.set_io (s->io());
+
hbox.pack_start (gpm, true, true);
set_name ("SendUIFrame");
hbox.pack_start (gpm, true, true);
set_name ("SendUIFrame");
@@
-44,7
+49,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(), true)
);
pack_start (vbox, false, false);
pack_start (vbox, false, false);
@@
-54,8
+59,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 ();
@@
-70,7
+75,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();
@@
-110,22
+115,20
@@
SendUI::fast_update ()
}
SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
}
SendUIWindow::SendUIWindow (boost::shared_ptr<Send> s, Session& ss)
+ : ArdourDialog (string("Ardour: send ") + s->name())
{
ui = new SendUI (s, ss);
{
ui = new SendUI (s, ss);
- vpacker.set_border_width (5);
-
hpacker.pack_start (*ui, true, true);
hpacker.pack_start (*ui, true, true);
- vpacker.pack_start (hpacker);
+ get_vbox()->set_border_width (5);
+ get_vbox()->pack_start (hpacker);
- add (vpacker);
set_name ("SendUIWindow");
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)));
-
}
SendUIWindow::~SendUIWindow ()
}
SendUIWindow::~SendUIWindow ()
@@
-138,5
+141,6
@@
SendUIWindow::send_going_away ()
{
ENSURE_GUI_THREAD (mem_fun (*this, &SendUIWindow::send_going_away));
delete_when_idle (this);
{
ENSURE_GUI_THREAD (mem_fun (*this, &SendUIWindow::send_going_away));
delete_when_idle (this);
+ going_away_connection.disconnect ();
}
}