Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index beebd8505fdddead735e423d6912b9a3af0ea65e..f2990751708dac5471d7ecd6c7b7429c396fda06 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -1391,8 +1391,12 @@ Editor::temporal_zoom (framecnt_t fpp)
        // Imposing an arbitrary limit to zoom out as too much zoom out produces 
        // segfaults for lack of memory. If somebody decides this is not high enough I
        // believe it can be raisen to higher values but some limit must be in place.
+       //
+       // This constant represents 1 day @ 48kHz on a 1600 pixel wide display
+       // all of which is used for the editor track displays. The whole day
+       // would be 4147200000 samples, so 2592000 samples per pixel.
 
-       nfpp = min (fpp, (framecnt_t) 8589934592);
+       nfpp = min (fpp, (framecnt_t) 2592000);
        nfpp = max ((framecnt_t) 1, fpp);
 
        new_page_size = (framepos_t) floor (_visible_canvas_width * nfpp);
@@ -2100,7 +2104,7 @@ Editor::transition_to_rolling (bool fwd)
 
        if (_session->config.get_external_sync()) {
                switch (Config->get_sync_source()) {
-               case JACK:
+               case Engine:
                        break;
                default:
                        /* transport controlled by the master */
@@ -3473,7 +3477,7 @@ Editor::freeze_route ()
        
        /* wait for just a little while, because the above call is asynchronous */
 
-       ::usleep (250000);
+       Glib::usleep (250000);
 
        if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) {
                return;
@@ -4704,7 +4708,7 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv
        vector<Evoral::Sequence<Evoral::MusicalTime>::Notes> v;
        v.push_back (selected);
 
-       framepos_t pos_frames = mrv.midi_region()->position();
+       framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
        double     pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
 
        return op (mrv.midi_region()->model(), pos_beats, v);
@@ -5520,7 +5524,7 @@ Editor::split_region ()
 
 struct EditorOrderRouteSorter {
     bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
-           return a->order_key (EditorSort) < b->order_key (EditorSort);
+           return a->order_key () < b->order_key ();
     }
 };
 
@@ -6948,7 +6952,7 @@ Editor::uncombine_regions ()
 void
 Editor::toggle_midi_input_active (bool flip_others)
 {
-       bool onoff;
+       bool onoff = false;
        boost::shared_ptr<RouteList> rl (new RouteList);
 
        for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {