diff options
Diffstat (limited to 'gtk2_ardour/audio_time_axis.cc')
-rw-r--r-- | gtk2_ardour/audio_time_axis.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc index 675136b860..e59c43fc84 100644 --- a/gtk2_ardour/audio_time_axis.cc +++ b/gtk2_ardour/audio_time_axis.cc @@ -45,7 +45,6 @@ #include "ardour_ui.h" #include "audio_time_axis.h" #include "automation_line.h" -#include "canvas_impl.h" #include "enums.h" #include "gui_thread.h" #include "automation_time_axis.h" @@ -54,7 +53,6 @@ #include "prompter.h" #include "public_editor.h" #include "audio_region_view.h" -#include "simplerect.h" #include "audio_streamview.h" #include "utils.h" @@ -66,7 +64,7 @@ using namespace PBD; using namespace Gtk; using namespace Editing; -AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, Canvas& canvas) +AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas) : AxisView(sess) , RouteTimeAxisView(ed, sess, canvas) { @@ -399,7 +397,7 @@ AudioTimeAxisView::build_automation_action_menu (bool for_selection) MenuList& automation_items = automation_action_menu->items (); automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &AudioTimeAxisView::update_gain_track_visibility))); - gain_automation_item = dynamic_cast<CheckMenuItem*> (&automation_items.back ()); + gain_automation_item = dynamic_cast<Gtk::CheckMenuItem*> (&automation_items.back ()); gain_automation_item->set_active ((!for_selection || _editor.get_selection().tracks.size() == 1) && (gain_track && string_is_affirmative (gain_track->gui_property ("visible")))); @@ -407,12 +405,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; } } |