fix check for order max in PresentationInfo::parse (string&)

[ardour.git] / gtk2_ardour / editor_drag.cc

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 251242f057e3eb89961ee15a483632381f636615..16b52b9330e24aa53ad8d2ded42e04354b80c162 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -525,12 +525,12 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit)
        return boost::shared_ptr<Region>();
 }
 
-struct EditorOrderTimeAxisViewSorter {
+struct PresentationInfoTimeAxisViewSorter {
        bool operator() (TimeAxisView* a, TimeAxisView* b) {
                RouteTimeAxisView* ra = dynamic_cast<RouteTimeAxisView*> (a);
                RouteTimeAxisView* rb = dynamic_cast<RouteTimeAxisView*> (b);
                assert (ra && rb);
-               return ra->route()->order_key () < rb->route()->order_key ();
+               return ra->route()->presentation_info () < rb->route()->presentation_info();
        }
 };
 
@@ -546,7 +546,7 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<Re
        */
 
        TrackViewList track_views = _editor->track_views;
-       track_views.sort (EditorOrderTimeAxisViewSorter ());
+       track_views.sort (PresentationInfoTimeAxisViewSorter ());
 
        for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
                _time_axis_views.push_back (*i);
@@ -1397,7 +1397,7 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
                        if ((Config->get_output_auto_connect() & AutoConnectMaster) && _editor->session()->master_out()) {
                                output_chan =  _editor->session()->master_out()->n_inputs().n_audio();
                        }
-                       audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, ARDOUR::Normal, 0, 1, region->name());
+                       audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order, ARDOUR::Normal);
                        RouteTimeAxisView* rtav = _editor->axis_view_from_route (audio_tracks.front());
                        if (rtav) {
                                rtav->set_height (original->current_height());
@@ -1406,7 +1406,7 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
                } else {
                        ChanCount one_midi_port (DataType::MIDI, 1);
                        list<boost::shared_ptr<MidiTrack> > midi_tracks;
-                       midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr<ARDOUR::PluginInfo>(), ARDOUR::Normal, 0, 1, region->name());
+                       midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr<ARDOUR::PluginInfo>(), 0, 1, region->name(), PresentationInfo::max_order, ARDOUR::Normal);
                        RouteTimeAxisView* rtav = _editor->axis_view_from_route (midi_tracks.front());
                        if (rtav) {
                                rtav->set_height (original->current_height());
@@ -3184,9 +3184,12 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
                                                       , beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style());
 
                }
-               /* only snap to bars */
-               _editor->set_snap_to (SnapToBar);
-               _editor->set_snap_mode (SnapNormal);    }
+               /* only snap to bars. leave snap mode alone for audio locked meters.*/
+               if (_real_section->position_lock_style() != AudioTime) {
+                       _editor->set_snap_to (SnapToBar);
+                       _editor->set_snap_mode (SnapNormal);
+               }
+       }
 
        framepos_t pf = adjusted_current_frame (event);
 
@@ -3412,7 +3415,6 @@ TempoMarkerDrag::aborted (bool moved)
 BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i)
        : Drag (e, i)
        , _pulse (0.0)
-       , _beat (0.0)
        , _tempo (0)
        , before_state (0)
 {
@@ -3424,11 +3426,10 @@ void
 BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 {
        Drag::start_grab (event, cursor);
-
        TempoMap& map (_editor->session()->tempo_map());
+       _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame()));
        ostringstream sstr;
 
-       _tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame()));
        sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).beats_per_minute() << "\n";
        sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute();
        show_verbose_cursor_text (sstr.str());
@@ -3441,17 +3442,22 @@ BBTRulerDrag::setup_pointer_frame_offset ()
        TempoMap& map (_editor->session()->tempo_map());
        const double beat_at_frame = map.beat_at_frame (raw_grab_frame());
        const uint32_t divisions = _editor->get_grid_beat_divisions (0);
+       double beat = 0.0;
+
        if (divisions > 0) {
-               _beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * divisions)) / divisions);
+               beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * divisions)) / divisions);
        } else {
                /* while it makes some sense for the user to determine the division to 'grab',
                   grabbing a bar often leads to confusing results wrt the actual tempo section being altered
                   and the result over steep tempo curves. Use sixteenths.
                */
-               _beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * 4)) / 4);
+               beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * 4)) / 4);
        }
-       _pulse = map.pulse_at_beat (_beat);
-       _pointer_frame_offset = raw_grab_frame() - map.frame_at_beat (_beat);
+
+       _pulse = map.pulse_at_beat (beat);
+
+       _pointer_frame_offset = raw_grab_frame() - map.frame_at_pulse (_pulse);
+
 }
 
 void
@@ -3465,7 +3471,13 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move)
                _editor->begin_reversible_command (_("dilate tempo"));
        }
 
-       framepos_t const pf = adjusted_current_frame (event, false);
+       framepos_t pf;
+
+       if (_editor->snap_musical()) {
+               pf = adjusted_current_frame (event, false);
+       } else {
+               pf = adjusted_current_frame (event);
+       }
 
        if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier())) {
                /* adjust previous tempo to match pointer frame */