projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove internal edit mode and add "content" tool.
[ardour.git]
/
gtk2_ardour
/
return_ui.cc
diff --git
a/gtk2_ardour/return_ui.cc
b/gtk2_ardour/return_ui.cc
index 03b6d6044d853c1f00a6152df3829976b503bb66..16c4720577579e037514aab841e0e608a0b9dacc 100644
(file)
--- a/
gtk2_ardour/return_ui.cc
+++ b/
gtk2_ardour/return_ui.cc
@@
-19,37
+19,36
@@
#include <gtkmm2ext/doi.h>
#include <gtkmm2ext/doi.h>
-#include "ardour/amp.h"
#include "ardour/io.h"
#include "ardour/io.h"
-#include "ardour/return.h"
#include "ardour/rc_configuration.h"
#include "ardour/rc_configuration.h"
+#include "ardour/return.h"
-#include "utils.h"
#include "return_ui.h"
#include "io_selector.h"
#include "ardour_ui.h"
#include "gui_thread.h"
#include "return_ui.h"
#include "io_selector.h"
#include "ardour_ui.h"
#include "gui_thread.h"
+#include "i18n.h"
+
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace std;
using namespace ARDOUR;
using namespace PBD;
-ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& se)
- : _return (r)
- , _session (se)
- , _gpm (se)
+ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* session)
+ :_return (r)
+ , _gpm (session, 250)
{
_gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp());
_hbox.pack_start (_gpm, true, true);
{
_gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp());
_hbox.pack_start (_gpm, true, true);
- set_name (
"ReturnUIFrame"
);
+ set_name (
X_("ReturnUIFrame")
);
_vbox.set_spacing (5);
_vbox.set_border_width (5);
_vbox.pack_start (_hbox, false, false, false);
_vbox.set_spacing (5);
_vbox.set_border_width (5);
_vbox.pack_start (_hbox, false, false, false);
- io =
manage (new IOSelector (parent, se
, r->output()));
+ io =
Gtk::manage (new IOSelector (parent, session
, r->output()));
pack_start (_vbox, false, false);
pack_start (_vbox, false, false);
@@
-58,13
+57,13
@@
ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& s
show_all ();
_return->set_metering (true);
show_all ();
_return->set_metering (true);
- _return->input()->changed.connect (
mem_fun (*this, &ReturnUI::ins_changed
));
+ _return->input()->changed.connect (
input_change_connection, invalidator (*this), boost::bind (&ReturnUI::ins_changed, this, _1, _2), gui_context(
));
_gpm.setup_meters ();
_gpm.setup_meters ();
- _gpm.set_fader_name (
"ReturnUIFrame"
);
+ _gpm.set_fader_name (
X_("ReturnUIFader")
);
- // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &ReturnUI::update));
- fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &ReturnUI::fast_update));
+ // 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));
}
ReturnUI::~ReturnUI ()
}
ReturnUI::~ReturnUI ()
@@
-78,10
+77,10
@@
ReturnUI::~ReturnUI ()
}
void
}
void
-ReturnUI::ins_changed (IOChange change, void*
ignored
)
+ReturnUI::ins_changed (IOChange change, void*
/*ignored*/
)
{
{
- ENSURE_GUI_THREAD
(bind (mem_fun (*this, &ReturnUI::ins_changed), change, ignored));
- if (change
&
ConfigurationChanged) {
+ ENSURE_GUI_THREAD
(*this, &ReturnUI::ins_changed, change, ignored)
+ if (change
.type & IOChange::
ConfigurationChanged) {
_gpm.setup_meters ();
}
}
_gpm.setup_meters ();
}
}
@@
-99,32
+98,20
@@
ReturnUI::fast_update ()
}
}
}
}
-ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return>
s, Session& s
s)
- : Ardour
Dialog (string("Ardour: return ") + s
->name())
+ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return>
r, ARDOUR::Session*
s)
+ : Ardour
Window (string(_("Return ")) + r
->name())
{
{
- ui = new ReturnUI (this,
s, s
s);
+ ui = new ReturnUI (this,
r,
s);
hpacker.pack_start (*ui, true, true);
hpacker.pack_start (*ui, true, true);
- get_vbox()->set_border_width (5);
- get_vbox()->pack_start (hpacker);
+ add (hpacker);
set_name ("ReturnUIWindow");
set_name ("ReturnUIWindow");
- going_away_connection = s->GoingAway.connect (mem_fun (*this, &ReturnUIWindow::return_going_away));
- signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
}
ReturnUIWindow::~ReturnUIWindow ()
{
delete ui;
}
}
ReturnUIWindow::~ReturnUIWindow ()
{
delete ui;
}
-
-void
-ReturnUIWindow::return_going_away ()
-{
- ENSURE_GUI_THREAD (mem_fun (*this, &ReturnUIWindow::return_going_away));
- delete_when_idle (this);
- going_away_connection.disconnect ();
-}
-