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 25546fb92a3ce33990e3504b07bbde8f96f174a5..3fb6e8af47571a102f17c897a08cd2fce282c4ff 100644
(file)
--- a/
gtk2_ardour/send_ui.cc
+++ b/
gtk2_ardour/send_ui.cc
@@
-15,11
+15,12
@@
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 <gtkmm2ext/doi.h>
+
+#include <ardour/io.h>
#include <ardour/send.h>
#include <ardour/send.h>
-#include <gtkmmext/doi.h>
#include "utils.h"
#include "send_ui.h"
#include "utils.h"
#include "send_ui.h"
@@
-28,13
+29,17
@@
#include "gui_thread.h"
using namespace ARDOUR;
#include "gui_thread.h"
using namespace ARDOUR;
+using namespace PBD;
-SendUI::SendUI (
Send&
s, Session& se)
- : _send (s)
,
- _session (se),
- gpm (s, se),
-
panners (s,
se)
+SendUI::SendUI (
boost::shared_ptr<Send>
s, Session& 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 (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);
@@
-52,10
+57,10
@@
SendUI::SendUI (Send& s, Session& se)
show_all ();
show_all ();
- _send
.
set_metering (true);
+ _send
->
set_metering (true);
- _send
.output_changed.connect (slot
(*this, &SendUI::ins_changed));
- _send
.output_changed.connect (slot
(*this, &SendUI::outs_changed));
+ _send
->io()->input_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
+68,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 (slot
(*this, &SendUI::update));
- fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (
slot
(*this, &SendUI::fast_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 ()
{
}
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();
@@
-80,7
+85,7
@@
SendUI::~SendUI ()
void
SendUI::ins_changed (IOChange change, void* ignored)
{
void
SendUI::ins_changed (IOChange change, void* ignored)
{
- ENSURE_GUI_THREAD(bind (
slot
(*this, &SendUI::ins_changed), change, ignored));
+ ENSURE_GUI_THREAD(bind (
mem_fun
(*this, &SendUI::ins_changed), change, ignored));
if (change & ConfigurationChanged) {
panners.setup_pan ();
}
if (change & ConfigurationChanged) {
panners.setup_pan ();
}
@@
-89,52
+94,41
@@
SendUI::ins_changed (IOChange change, void* ignored)
void
SendUI::outs_changed (IOChange change, void* ignored)
{
void
SendUI::outs_changed (IOChange change, void* ignored)
{
- ENSURE_GUI_THREAD(bind (
slot
(*this, &SendUI::outs_changed), change, ignored));
+ ENSURE_GUI_THREAD(bind (
mem_fun
(*this, &SendUI::outs_changed), change, ignored));
if (change & ConfigurationChanged) {
panners.setup_pan ();
gpm.setup_meters ();
}
}
if (change & ConfigurationChanged) {
panners.setup_pan ();
gpm.setup_meters ();
}
}
-void
-SendUI::send_going_away (Redirect *ignored)
-{
- ENSURE_GUI_THREAD (bind (slot (*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)
+ : 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");
+
+ going_away_connection = s->GoingAway.connect (mem_fun (*this, &SendUIWindow::send_going_away));
- s.GoingAway.connect (slot (*this, &SendUIWindow::send_going_away));
-
- delete_event.connect (bind (slot (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 ()
@@
-143,10
+137,10
@@
SendUIWindow::~SendUIWindow ()
}
void
}
void
-SendUIWindow::send_going_away (
Redirect *ignored
)
+SendUIWindow::send_going_away ()
{
{
- ENSURE_GUI_THREAD
(bind (slot (*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 ()
;
}
}