a whole slew of changes related to centralizing and rationalizing cursor management.

[ardour.git] / gtk2_ardour / midi_time_axis.cc

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index e04f86aa95679e7f81afd43f61f82540ef22068b..8ced280661ec9f6806acfe53294d38b5abc784db 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -596,7 +596,7 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection)
 
        automation_items.push_back (SeparatorElem());
        automation_items.push_back (CheckMenuElem (_("Fader"), sigc::mem_fun (*this, &MidiTimeAxisView::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"))));
 
@@ -604,12 +604,12 @@ MidiTimeAxisView::build_automation_action_menu (bool for_selection)
 
        if (!pan_tracks.empty()) {
                automation_items.push_back (CheckMenuElem (_("Pan"), sigc::mem_fun (*this, &MidiTimeAxisView::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;
                }
        }
@@ -1521,8 +1521,7 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
 
        real_editor->snap_to (pos, 0);
 
-       boost::shared_ptr<Source> src = _session->create_midi_source_for_session (
-               view()->trackview().track().get(), view()->trackview().track()->name());
+       boost::shared_ptr<Source> src = _session->create_midi_source_by_stealing_name (view()->trackview().track());
        PropertyList plist;
 
        plist.add (ARDOUR::Properties::start, 0);