Merge branch 'miscfix' of https://github.com/mojofunk/ardour

[ardour.git] / gtk2_ardour / editor_ops.cc

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 415614b81166718ccc1858b3b8d4d32018db6f7a..6ada12220a7ba859cae4f9a13935af16f5bf9287 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -2108,7 +2108,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 */
@@ -2383,7 +2383,6 @@ Editor::rename_region ()
        d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
 
        d.set_size_request (300, -1);
-       d.set_position (Gtk::WIN_POS_MOUSE);
 
        entry.set_text (rs.front()->region()->name());
        entry.select_region (0, -1);
@@ -3737,7 +3736,7 @@ Editor::cut_copy (CutCopyOp op)
        /* we only want to cut regions if some are selected */
 
        if (!selection->regions.empty()) {
-               rs = get_regions_from_selection ();
+               rs = selection->regions;
        }
 
        switch (effective_mouse_mode()) {
@@ -5052,7 +5051,6 @@ Editor::toggle_region_lock ()
        _session->commit_reversible_command ();
 }
 
-#ifdef WITH_VIDEOTIMELINE
 void
 Editor::toggle_region_video_lock ()
 {
@@ -5076,8 +5074,6 @@ Editor::toggle_region_video_lock ()
 
        _session->commit_reversible_command ();
 }
-#endif
-
 
 void
 Editor::toggle_region_lock_style ()
@@ -6954,7 +6950,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) {