projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix compilation warnings. (gtk2_ardour part)
[ardour.git]
/
gtk2_ardour
/
send_ui.cc
diff --git
a/gtk2_ardour/send_ui.cc
b/gtk2_ardour/send_ui.cc
index 7e3b0e775a932471c2b33087da5021165c546477..7f87f2dea852c3c2b3e4984d2cabe3363d6effa0 100644
(file)
--- a/
gtk2_ardour/send_ui.cc
+++ b/
gtk2_ardour/send_ui.cc
@@
-24,10
+24,9
@@
#include "ardour/send.h"
#include "ardour/rc_configuration.h"
#include "ardour/send.h"
#include "ardour/rc_configuration.h"
-#include "utils.h"
#include "send_ui.h"
#include "io_selector.h"
#include "send_ui.h"
#include "io_selector.h"
-#include "
ardour_ui
.h"
+#include "
timers
.h"
#include "gui_thread.h"
#include "i18n.h"
#include "gui_thread.h"
#include "i18n.h"
@@
-44,7
+43,7
@@
SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
assert (_send);
_panners.set_panner (s->panner_shell(), s->panner());
assert (_send);
_panners.set_panner (s->panner_shell(), s->panner());
- _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp());
+ _gpm.set_controls (boost::shared_ptr<Route>(), s->meter(), s->amp()
, s->gain_control()
);
_hbox.pack_start (_gpm, true, true);
set_name (X_("SendUIFrame"));
_hbox.pack_start (_gpm, true, true);
set_name (X_("SendUIFrame"));
@@
-81,9
+80,9
@@
SendUI::SendUI (Gtk::Window* parent, boost::shared_ptr<Send> s, Session* session
_gpm.setup_meters ();
_gpm.set_fader_name (X_("SendUIFader"));
_gpm.setup_meters ();
_gpm.set_fader_name (X_("SendUIFader"));
- // screen_update_connection =
ARDOUR_UI::instance()->RapidScreenUpdate.
connect (
+ // screen_update_connection =
Timers::rapid_
connect (
// sigc::mem_fun (*this, &SendUI::update));
// sigc::mem_fun (*this, &SendUI::update));
- fast_screen_update_connection =
ARDOUR_UI::instance()->SuperRapidScreenUpdate.
connect (
+ fast_screen_update_connection =
Timers::super_rapid_
connect (
sigc::mem_fun (*this, &SendUI::fast_update));
}
sigc::mem_fun (*this, &SendUI::fast_update));
}