a) fix special button press handling for solo+mute buttons

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 68f6622e35d19a672e13753047aef05e110b41ba..8ed4bcd1c8cd537e8203781ad684131c6b98347d 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -54,6 +54,7 @@ RouteUI::RouteUI (ARDOUR::Route& rt, ARDOUR::Session& sess, const char* m_name,
        xml_node = 0;
        mute_menu = 0;
        solo_menu = 0;
+       remote_control_menu = 0;
        ignore_toggle = false;
        wait_for_release = false;
        route_active_menu_item = 0;
@@ -75,8 +76,7 @@ RouteUI::RouteUI (ARDOUR::Route& rt, ARDOUR::Session& sess, const char* m_name,
 
                get_diskstream()->record_enable_changed.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed));
 
-               _session.RecordEnabled.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
-               _session.RecordDisabled.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
+               _session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
 
                rec_enable_button = manage (new BindableToggleButton (& at->midi_rec_enable_control(), r_name ));
                rec_enable_button->set_bind_button_state (2, GDK_CONTROL_MASK);
@@ -157,7 +157,7 @@ RouteUI::mute_press(GdkEventButton* ev)
 
        }
 
-       return stop_signal (*mute_button, "button-press-event");
+       return true;
 }
 
 gint
@@ -169,10 +169,9 @@ RouteUI::mute_release(GdkEventButton* ev)
                        // undo the last op
                        // because the press was the last undoable thing we did
                        _session.undo (1U);
-                       stop_signal (*mute_button, "button-release-event");
                }
        }
-       return TRUE;
+       return true;
 }
 
 gint
@@ -250,24 +249,23 @@ RouteUI::solo_press(GdkEventButton* ev)
                }
        }
 
-       return stop_signal (*solo_button, "button-press-event");
+       return true;
 }
 
 gint
 RouteUI::solo_release(GdkEventButton* ev)
 {
-       if(!ignore_toggle){
-               if (wait_for_release){
+       if (!ignore_toggle) {
+               if (wait_for_release) {
                        wait_for_release = false;
                        // undo the last op
                        // because the press was the last undoable thing we did
 
                        _session.undo (1U);
-
-                       stop_signal (*solo_button, "button-release-event");
                }
        }
-       return TRUE;
+
+       return true;
 }
 
 gint
@@ -409,6 +407,58 @@ RouteUI::update_rec_display ()
        }
 }
 
+void
+RouteUI::build_remote_control_menu ()
+{
+       remote_control_menu = manage (new Menu);
+       refresh_remote_control_menu ();
+}
+
+void
+RouteUI::refresh_remote_control_menu ()
+{
+       using namespace Menu_Helpers;
+
+       RadioMenuItem::Group rc_group;
+       CheckMenuItem* rc_active;
+       uint32_t limit = _session.ntracks();
+       char buf[32];
+
+       MenuList& rc_items = remote_control_menu->items();
+       rc_items.clear ();
+
+       /* note that this menu list starts at zero, not 1, because zero
+          is a valid, if useless, ID.
+       */
+
+       limit += 4; /* leave some breathing room */
+       
+       for (uint32_t i = 0; i < limit; ++i) {
+               snprintf (buf, sizeof (buf), "%u", i);
+               rc_items.push_back (RadioMenuElem (rc_group, buf));
+               rc_active = dynamic_cast<RadioMenuItem*>(&rc_items.back());
+               if (_route.remote_control_id() == i) {
+                       rc_active = dynamic_cast<CheckMenuItem*> (&rc_items.back());
+                       rc_active->set_active ();
+               }
+               rc_active->signal_activate().connect (bind (mem_fun (*this, &RouteUI::set_remote_control_id), i, rc_active));
+       }
+}
+
+void
+RouteUI::set_remote_control_id (uint32_t id, CheckMenuItem* item)
+{
+       /* this is called when the radio menu item is toggled, and so 
+          is actually invoked twice per menu selection. we only
+          care about the invocation for the item that was being
+          marked active.
+       */
+
+       if (item->get_active()) {
+               _route.set_remote_control_id (id);
+       }
+}
+
 void
 RouteUI::build_solo_menu (void)
 {
@@ -565,13 +615,8 @@ RouteUI::choose_color()
 {
        bool picked;
        Gdk::Color color;
-       Gdk::Color current;
 
-       current.set_red ( _color.get_red()  / 65535);
-       current.set_green (_color.get_green() / 65535);
-       current.set_blue (_color.get_blue() / 65535);
-
-       color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, &current);
+       color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, &_color);
 
        if (picked) {
                set_color (color);
@@ -581,7 +626,7 @@ RouteUI::choose_color()
 }
 
 void
-RouteUI::set_color (Gdk::Color c)
+RouteUI::set_color (const Gdk::Color & c)
 {
        char buf[64];
        
@@ -607,7 +652,7 @@ RouteUI::ensure_xml_node ()
 }
 
 XMLNode*
-RouteUI::get_child_xml_node (string childname)
+RouteUI::get_child_xml_node (const string & childname)
 {
        XMLNode* child;
 
@@ -657,13 +702,8 @@ RouteUI::remove_this_route ()
 
        Choice prompter (prompt, choices);
 
-       prompter.chosen.connect(sigc::ptr_fun(Gtk::Main::quit));
-       prompter.show_all ();
-
-       Gtk::Main::run ();
-
-       if (prompter.get_choice() == 0) {
-         Glib::signal_idle().connect (bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this));
+       if (prompter.run () == 0) {
+               Glib::signal_idle().connect (bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this));
        }
 }
 
@@ -693,10 +733,9 @@ RouteUI::route_rename ()
 
        switch (name_prompter.run ()) {
 
-       case GTK_RESPONSE_ACCEPT:
-               name_prompter.get_result (result);
-               if (result.length()) {
-                       strip_whitespace_edges (result);
+       case Gtk::RESPONSE_ACCEPT:
+        name_prompter.get_result (result);
+        if (result.length()) {
                        _route.set_name (result, this);
                }       
                break;
@@ -846,3 +885,4 @@ RouteUI::map_frozen ()
                }
        }
 }
+