Vkeybd: use ArdourWidgets for all GUI elements

[ardour.git] / gtk2_ardour / return_ui.cc

diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc
index fe1593a4aa941dd51c130e407387c969a52f088d..533744918b20b43d873e00146fba69e4cd35a838 100644 (file)
--- a/gtk2_ardour/return_ui.cc
+++ b/gtk2_ardour/return_ui.cc
@@ -1,34 +1,36 @@
 /*
-    Copyright (C) 2002 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2009-2010 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2009-2012 David Robillard <d@drobilla.net>
+ * Copyright (C) 2009-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2013-2014 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <gtkmm2ext/doi.h>
 
-#include "ardour/amp.h"
 #include "ardour/io.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 "ardour_ui.h"
 #include "gui_thread.h"
+#include "timers.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -38,17 +40,17 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
        :_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 ("ReturnUIFrame");
+       set_name (X_("ReturnUIFrame"));
 
        _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);
 
@@ -57,13 +59,13 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* s
        show_all ();
 
        _return->set_metering (true);
-       _return->input()->changed.connect (input_change_connection, boost::bind (&ReturnUI::ins_changed, this, _1, _2));
+       _return->input()->changed.connect (input_change_connection, invalidator (*this), boost::bind (&ReturnUI::ins_changed, this, _1, _2), gui_context());
 
        _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 = 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 ()
@@ -77,10 +79,10 @@ ReturnUI::~ReturnUI ()
 }
 
 void
-ReturnUI::ins_changed (IOChange change, void* ignored)
+ReturnUI::ins_changed (IOChange change, void* /*ignored*/)
 {
        ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored)
-       if (change & ConfigurationChanged) {
+       if (change.type & IOChange::ConfigurationChanged) {
                _gpm.setup_meters ();
        }
 }
@@ -99,31 +101,19 @@ ReturnUI::fast_update ()
 }
 
 ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s)
-       : ArdourDialog (string("Ardour: return ") + r->name())
+       : ArdourWindow (string(_("Return ")) + r->name())
 {
        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");
 
-       r->GoingAway.connect (going_away_connection, boost::bind (&ReturnUIWindow::return_going_away, this));
-       signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this)));
 }
 
 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);
-}
-