track-color chooser works

git-svn-id: svn://localhost/trunk/ardour2@196 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 8aa960147e0e1b54cbbf95181f5ca691c34475a7..90aaec7eef04c6da56fd3fd8fb661b48dfa69395 100644 (file)
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -564,13 +564,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);
@@ -580,7 +575,7 @@ RouteUI::choose_color()
 }
 
 void
-RouteUI::set_color (Gdk::Color c)
+RouteUI::set_color (const Gdk::Color & c)
 {
        char buf[64];
        

diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 20dd4f6b36987d970521277b1bdc20f4bee2bdb2..786523167da5aef7cfd7856d6c90d14b1c4c5cf3 100644 (file)
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -59,7 +59,7 @@ class RouteUI : public virtual AxisView
        
        ARDOUR::Route& _route;
        
-       void set_color (Gdk::Color c);
+       void set_color (const Gdk::Color & c);
        bool choose_color ();
 
        bool ignore_toggle;

diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc
index 10ca908773b6a07c7383419163b90e5588cacc4e..722b6a15ef11c18c50a3d5fa719eb67d2c10f4fb 100644 (file)
--- a/libs/gtkmm2ext/gtk_ui.cc
+++ b/libs/gtkmm2ext/gtk_ui.cc
@@ -815,7 +815,7 @@ UI::just_hide_it (GdkEventAny *ev, Window *win)
 }
 
 Gdk::Color
-UI::get_color (const string& prompt, bool& picked, Gdk::Color* initial)
+UI::get_color (const string& prompt, bool& picked, const Gdk::Color* initial)
 {
        Gdk::Color color;
 

diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
index 92727577d05df045f04688c3f57e555afe7fa054..1ea451528433a3d4cd1ca16ce615d12a130bb1e6 100644 (file)
--- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
@@ -92,7 +92,7 @@ class UI : public AbstractUI
                Glib::signal_idle().connect (bind (slot (&UI::idle_delete<T>), obj));
        }
 
-       Gdk::Color get_color (const string& prompt, bool& picked, Gdk::Color *initial = 0);
+       Gdk::Color get_color (const string& prompt, bool& picked, const Gdk::Color *initial = 0);
 
        /* starting is sent just before we enter the main loop,
           stopping just after we return from it (at the top level)