r205@gandalf: fugalh | 2006-07-26 18:11:47 -0600

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index b46574a0cc3967cc147c4d90bfb1ca582b9449a4..84aeb9c73b9e7130484a9c4dbe31e7c0eb541bbd 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -34,13 +34,14 @@
 
 #include <ardour/route.h>
 #include <ardour/audio_track.h>
-#include <ardour/diskstream.h>
+#include <ardour/audio_diskstream.h>
 
 #include "i18n.h"
 using namespace sigc;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace ARDOUR;
+using namespace PBD;
 
 
 RouteUI::RouteUI (ARDOUR::Route& rt, ARDOUR::Session& sess, const char* m_name,
@@ -433,7 +434,13 @@ RouteUI::refresh_remote_control_menu ()
 
        limit += 4; /* leave some breathing room */
        
-       for (uint32_t i = 0; i < limit; ++i) {
+       rc_items.push_back (RadioMenuElem (rc_group, _("None")));
+       if (_route.remote_control_id() == 0) {
+               rc_active = dynamic_cast<CheckMenuItem*> (&rc_items.back());
+               rc_active->set_active ();
+       }
+               
+       for (uint32_t i = 1; 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());
@@ -563,8 +570,10 @@ void
 RouteUI::reversibly_apply_route_boolean (string name, void (Route::*func)(bool, void *), bool yn, void *arg)
 {
        _session.begin_reversible_command (name);
-       _session.add_undo (bind (mem_fun (_route, func), !yn, (void *) arg));
-       _session.add_redo (bind (mem_fun (_route, func), yn, (void *) arg));
+        XMLNode &before = _route.get_state();
+        bind(mem_fun(_route, func), yn, arg)();
+        XMLNode &after = _route.get_state();
+        _session.add_command (MementoCommand<Route>(_route, before, after));
        _session.commit_reversible_command ();
 }
 
@@ -572,8 +581,10 @@ void
 RouteUI::reversibly_apply_audio_track_boolean (string name, void (AudioTrack::*func)(bool, void *), bool yn, void *arg)
 {
        _session.begin_reversible_command (name);
-       _session.add_undo (bind (mem_fun (*audio_track(), func), !yn, (void *) arg));
-       _session.add_redo (bind (mem_fun (*audio_track(), func), yn, (void *) arg));
+        XMLNode &before = audio_track()->get_state();
+       bind (mem_fun (*audio_track(), func), yn, arg)();
+        XMLNode &after = audio_track()->get_state();
+       _session.add_command (MementoCommand<AudioTrack>(*audio_track(), before, after));
        _session.commit_reversible_command ();
 }
 
@@ -727,9 +738,10 @@ RouteUI::route_rename ()
 {
        ArdourPrompter name_prompter (true);
        string result;
-       name_prompter.set_prompt (_("new name: "));
+       name_prompter.set_prompt (_("New Name: "));
        name_prompter.set_initial_text (_route.name());
        name_prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
+       name_prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
        name_prompter.show_all ();
 
        switch (name_prompter.run ()) {
@@ -750,7 +762,7 @@ void
 RouteUI::name_changed (void *src)
 {
        ENSURE_GUI_THREAD(bind (mem_fun (*this, &RouteUI::name_changed), src));
-       
+
        name_label.set_text (_route.name());
 }
 
@@ -785,6 +797,11 @@ RouteUI::toggle_polarity ()
                
                if ((x = polarity_menu_item->get_active()) != _route.phase_invert()) {
                        _route.set_phase_invert (x, this);
+                       if (x) {
+                               name_label.set_text (X_("Ø ") + name_label.get_text());
+                       } else {
+                               name_label.set_text (_route.name());
+                       }
                }
        }
 }
@@ -866,7 +883,7 @@ RouteUI::is_audio_track () const
        return dynamic_cast<AudioTrack*>(&_route) != 0;
 }
 
-DiskStream*
+AudioDiskstream*
 RouteUI::get_diskstream () const
 {
        AudioTrack *at;
@@ -907,4 +924,3 @@ RouteUI::map_frozen ()
                }
        }
 }
-