projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Mixbus action fc83d044f8 & 65bda27d4 rebase ordering
[ardour.git]
/
gtk2_ardour
/
return_ui.cc
diff --git
a/gtk2_ardour/return_ui.cc
b/gtk2_ardour/return_ui.cc
index 775f283947d5f7711f4d2e9576a24e25c15ba631..a6b27f7af7eef67a509e97bbd814ec071e80f37c 100644
(file)
--- a/
gtk2_ardour/return_ui.cc
+++ b/
gtk2_ardour/return_ui.cc
@@
-23,13
+23,12
@@
#include "ardour/rc_configuration.h"
#include "ardour/return.h"
#include "ardour/rc_configuration.h"
#include "ardour/return.h"
-#include "utils.h"
#include "return_ui.h"
#include "io_selector.h"
#include "return_ui.h"
#include "io_selector.h"
-#include "ardour_ui.h"
#include "gui_thread.h"
#include "gui_thread.h"
+#include "timers.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-39,7
+38,7
@@
ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
:_return (r)
, _gpm (session, 250)
{
:_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()
, r->gain_control()
);
_hbox.pack_start (_gpm, true, true);
set_name (X_("ReturnUIFrame"));
_hbox.pack_start (_gpm, true, true);
set_name (X_("ReturnUIFrame"));
@@
-63,8
+62,8
@@
ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
_gpm.setup_meters ();
_gpm.set_fader_name (X_("ReturnUIFader"));
_gpm.setup_meters ();
_gpm.set_fader_name (X_("ReturnUIFader"));
- // screen_update_connection =
ARDOUR_UI::instance()->RapidScreenUpdate.
connect (sigc::mem_fun (*this, &ReturnUI::update));
- fast_screen_update_connection =
ARDOUR_UI::instance()->SuperRapidScreenUpdate.
connect (sigc::mem_fun (*this, &ReturnUI::fast_update));
+ // screen_update_connection =
Timers::rapid_
connect (sigc::mem_fun (*this, &ReturnUI::update));
+ fast_screen_update_connection =
Timers::super_rapid_
connect (sigc::mem_fun (*this, &ReturnUI::fast_update));
}
ReturnUI::~ReturnUI ()
}
ReturnUI::~ReturnUI ()
@@
-110,19
+109,9
@@
ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
set_name ("ReturnUIWindow");
set_name ("ReturnUIWindow");
- r->DropReferences.connect (going_away_connection, invalidator (*this), boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
}
ReturnUIWindow::~ReturnUIWindow ()
{
delete ui;
}
}
ReturnUIWindow::~ReturnUIWindow ()
{
delete ui;
}
-
-void
-ReturnUIWindow::return_going_away ()
-{
- ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away)
- going_away_connection.disconnect ();
- delete_when_idle (this);
-}
-