Merge branch 'ripple-mode-cc' into cairocanvas

[ardour.git] / gtk2_ardour / audio_time_axis.cc

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 138127139009c7f5b1d3047a5a49e1b9336cae08..8c022abdb74e66cc2cd1f1259a61e7767cca1944 100644 (file)
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -60,6 +60,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace PBD;
 using namespace Gtk;
 using namespace Editing;
@@ -83,7 +84,7 @@ AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
        RouteTimeAxisView::set_route (rt);
 
-       _view->apply_color (color (), StreamView::RegionColor);
+       _view->apply_color (gdk_color_to_rgba (color()), StreamView::RegionColor);
 
        // Make sure things are sane...
        assert(!is_track() || is_audio_track());
@@ -405,12 +406,12 @@ AudioTimeAxisView::build_automation_action_menu (bool for_selection)
 
        if (!pan_tracks.empty()) {
                automation_items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &AudioTimeAxisView::update_pan_track_visibility)));
-               pan_automation_item = dynamic_cast<CheckMenuItem*> (&automation_items.back ());
+               pan_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&automation_items.back ());
                pan_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) &&
                                                 (!pan_tracks.empty() && string_is_affirmative (pan_tracks.front()->gui_property ("visible"))));
 
                set<Evoral::Parameter> const & params = _route->pannable()->what_can_be_automated ();
-               for (set<Evoral::Parameter>::iterator p = params.begin(); p != params.end(); ++p) {
+               for (set<Evoral::Parameter>::const_iterator p = params.begin(); p != params.end(); ++p) {
                        _main_automation_menu_map[*p] = pan_automation_item;
                }
        }