convert property_foo().set_value(bar) to property_foo() = bar

[ardour.git] / gtk2_ardour / route_ui.cc

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 9feca7e20e8da3a9327148f8c40edb309ebf3c42..68f6622e35d19a672e13753047aef05e110b41ba 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -567,10 +567,9 @@ RouteUI::choose_color()
        Gdk::Color color;
        Gdk::Color current;
 
-       current.set_red ( _color.get_red()  / 65535.0);
-       current.set_green (_color.get_green() / 65535.0);
-       current.set_blue (_color.get_blue() / 65535.0);
-       //current[3] = 1.0;
+       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);
 
@@ -658,7 +657,7 @@ RouteUI::remove_this_route ()
 
        Choice prompter (prompt, choices);
 
-       prompter.chosen.connect (Gtk::Main::quit.slot());
+       prompter.chosen.connect(sigc::ptr_fun(Gtk::Main::quit));
        prompter.show_all ();
 
        Gtk::Main::run ();
@@ -687,26 +686,24 @@ void
 RouteUI::route_rename ()
 {
        ArdourPrompter name_prompter (true);
+       string result;
        name_prompter.set_prompt (_("new name: "));
        name_prompter.set_initial_text (_route.name());
-       name_prompter.done.connect (Gtk::Main::quit.slot());
        name_prompter.show_all ();
 
-       Gtk::Main::run();
-
-       if (name_prompter.status == Gtkmm2ext::Prompter::cancelled) {
-               return;
-       }
-       
-       string result;
-       name_prompter.get_result (result);
+       switch (name_prompter.run ()) {
 
-       if (result.length() == 0) {
-               return;
+       case GTK_RESPONSE_ACCEPT:
+               name_prompter.get_result (result);
+               if (result.length()) {
+                       strip_whitespace_edges (result);
+                       _route.set_name (result, this);
+               }       
+               break;
        }
 
-       strip_whitespace_edges (result);
-       _route.set_name (result, this);
+       return;
+  
 }
 
 void