diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-10 20:38:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-10-10 20:38:53 +0000 |
| commit | 2d32c7da360194e33e821badaf2bff89f3ec70a0 (patch) | |
| tree | 377c942ce1aba6119484e705c46164292b4e7662 /gtk2_ardour/route_ui.cc | |
| parent | a495630a43966c2d083baea517523a3f60ae30f3 (diff) | |
more work on actions and general compilability
git-svn-id: svn://localhost/trunk/ardour2@56 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 3ea8345570..9feca7e20e 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -37,8 +37,7 @@ #include <ardour/diskstream.h> #include "i18n.h" -/* there is a string_compose() here.. */ -//using namespace sigc; +using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; @@ -566,14 +565,14 @@ RouteUI::choose_color() { bool picked; Gdk::Color color; - gdouble current[4]; + Gdk::Color current; - current[0] = _color.get_red() / 65535.0; - current[1] = _color.get_green() / 65535.0; - current[2] = _color.get_blue() / 65535.0; - current[3] = 1.0; + 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; - color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, current); + color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, ¤t); if (picked) { set_color (color); @@ -665,7 +664,7 @@ RouteUI::remove_this_route () Gtk::Main::run (); if (prompter.get_choice() == 0) { - Glib::signal_idle().connect (bind (mem_fun (&RouteUI::idle_remove_this_route), this)); + Glib::signal_idle().connect (bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this)); } } |