projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use newly factored canvas in gtk2_ardour
[ardour.git]
/
gtk2_ardour
/
return_ui.cc
diff --git
a/gtk2_ardour/return_ui.cc
b/gtk2_ardour/return_ui.cc
index 9e9318543460794f0b863e2252fd07d1704b89b2..9e86abd17128a1425e393cdc9efc38cc2e4c8f73 100644
(file)
--- a/
gtk2_ardour/return_ui.cc
+++ b/
gtk2_ardour/return_ui.cc
@@
-19,10
+19,9
@@
#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 "utils.h"
#include "return_ui.h"
@@
-30,6
+29,8
@@
#include "ardour_ui.h"
#include "gui_thread.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;
@@
-41,14
+42,14
@@
ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
_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, session, r->output()));
+ io =
Gtk::
manage (new IOSelector (parent, session, r->output()));
pack_start (_vbox, false, false);
pack_start (_vbox, false, false);
@@
-57,10
+58,10
@@
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 (input_change_connection,
ui_
bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
+ _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 (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 = 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));
@@
-77,10
+78,10
@@
ReturnUI::~ReturnUI ()
}
void
}
void
-ReturnUI::ins_changed (IOChange change, void*
ignored
)
+ReturnUI::ins_changed (IOChange change, void*
/*ignored*/
)
{
ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored)
{
ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored)
- if (change
&
ConfigurationChanged) {
+ if (change
.type & IOChange::
ConfigurationChanged) {
_gpm.setup_meters ();
}
}
_gpm.setup_meters ();
}
}
@@
-99,31
+100,19
@@
ReturnUI::fast_update ()
}
ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
}
ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
- : Ardour
Dialog (string("Ardour: return "
) + r->name())
+ : Ardour
Window (string(_("Return ")
) + r->name())
{
ui = new ReturnUI (this, r, s);
hpacker.pack_start (*ui, true, true);
{
ui = new ReturnUI (this, r, s);
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");
- r->DropReferences.connect (going_away_connection, boost::bind (&ReturnUIWindow::return_going_away, this), gui_context());
- signal_delete_event().connect (sigc::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 (*this, &ReturnUIWindow::return_going_away)
- going_away_connection.disconnect ();
- delete_when_idle (this);
-}
-