Merge with 2.0-ongoing R2885.
[ardour.git] / gtk2_ardour / editor.cc
index 8b087e70965691ee1812de628a8a4c48cde7cb84..41261b7079b868813b56a7aad44f64f3b627e67a 100644 (file)
@@ -25,6 +25,8 @@
 #include <string>
 #include <algorithm>
 
+#include <boost/none.hpp>
+
 #include <sigc++/bind.h>
 
 #include <pbd/convert.h>
 #include <ardour/audioregion.h>
 #include <ardour/midi_region.h>
 #include <ardour/session_route.h>
+#include <ardour/session_directory.h>
+#include <ardour/session_state_utils.h>
 #include <ardour/tempo.h>
 #include <ardour/utils.h>
+#include <ardour/profile.h>
 
 #include <control_protocol/control_protocol.h>
 
@@ -75,6 +80,7 @@
 #include "crossfade_edit.h"
 #include "canvas_impl.h"
 #include "actions.h"
+#include "sfdb_ui.h"
 #include "gui_thread.h"
 
 #ifdef FFT_ANALYSIS
@@ -104,7 +110,6 @@ const double Editor::timebar_height = 15.0;
 #include "editor_xpms"
 
 static const gchar *_snap_type_strings[] = {
-       N_("None"),
        N_("CD Frames"),
        N_("SMPTE Frames"),
        N_("SMPTE Seconds"),
@@ -119,7 +124,6 @@ static const gchar *_snap_type_strings[] = {
        N_("Beats"),
        N_("Bars"),
        N_("Marks"),
-       N_("Edit Cursor"),
        N_("Region starts"),
        N_("Region ends"),
        N_("Region syncs"),
@@ -128,20 +132,41 @@ static const gchar *_snap_type_strings[] = {
 };
 
 static const gchar *_snap_mode_strings[] = {
-       N_("Normal"),
+       N_("No Grid"),
+       N_("Grid"),
        N_("Magnetic"),
        0
 };
 
+static const gchar *_edit_point_strings[] = {
+       N_("Playhead"),
+       N_("Marker"),
+       N_("Mouse"),
+       0
+};
+
 static const gchar *_zoom_focus_strings[] = {
        N_("Left"),
        N_("Right"),
        N_("Center"),
-       N_("Play"),
-       N_("Edit"),
+       N_("Playhead"),
+       N_("Mouse"),
+       N_("Edit Point"),
        0
 };
 
+#ifdef USE_RUBBERBAND
+static const gchar *_rb_opt_strings[] = {
+       N_("Mushy"),
+       N_("Smooth"),
+       N_("Balanced multitimbral mixture"),
+       N_("Unpitched percussion with stable notes"),
+       N_("Crisp monophonic instrumental"),
+       N_("Unpitched solo percussion"),
+       0
+};
+#endif
+
 /* Soundfile  drag-n-drop */
 
 Gdk::Cursor* Editor::cross_hair_cursor = 0;
@@ -152,9 +177,12 @@ Gdk::Cursor* Editor::zoom_cursor = 0;
 Gdk::Cursor* Editor::time_fx_cursor = 0;
 Gdk::Cursor* Editor::fader_cursor = 0;
 Gdk::Cursor* Editor::speaker_cursor = 0;
-Gdk::Cursor* Editor::note_cursor = 0;
+Gdk::Cursor* Editor::midi_pencil_cursor = 0;
+Gdk::Cursor* Editor::midi_select_cursor = 0;
+Gdk::Cursor* Editor::midi_erase_cursor = 0;
 Gdk::Cursor* Editor::wait_cursor = 0;
 Gdk::Cursor* Editor::timebar_cursor = 0;
+Gdk::Cursor* Editor::transparent_cursor = 0;
 
 void
 show_me_the_size (Requisition* r, const char* what)
@@ -162,20 +190,6 @@ show_me_the_size (Requisition* r, const char* what)
        cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
 }
 
-void 
-check_adjustment (Gtk::Adjustment* adj)
-{
-       cerr << "CHANGE adj  = " 
-            << adj->get_lower () <<  ' '
-            << adj->get_upper () <<  ' '
-            << adj->get_value () <<  ' '
-            << adj->get_step_increment () <<  ' '
-            << adj->get_page_increment () <<  ' '
-            << adj->get_page_size () <<  ' '
-            << endl;
-
-}
-
 Editor::Editor ()
        : 
          /* time display buttons */
@@ -183,14 +197,15 @@ Editor::Editor ()
          minsec_label (_("Mins:Secs")),
          bbt_label (_("Bars:Beats")),
          smpte_label (_("Timecode")),
-         frame_label (_("Frames")),
+         frame_label (_("Samples")),
          tempo_label (_("Tempo")),
          meter_label (_("Meter")),
          mark_label (_("Location Markers")),
          range_mark_label (_("Range Markers")),
          transport_mark_label (_("Loop/Punch Ranges")),
+         cd_mark_label (_("CD Markers")),
 
-         edit_packer (3, 3, false),
+         edit_packer (3, 3, true),
 
          /* the values here don't matter: layout widgets
             reset them as needed.
@@ -204,7 +219,7 @@ Editor::Editor ()
 
          /* tool bar related */
 
-         edit_cursor_clock (X_("editcursor"), false, X_("EditCursorClock"), true),
+         edit_point_clock (X_("editpoint"), false, X_("EditPointClock"), true),
          zoom_range_clock (X_("zoomrange"), false, X_("ZoomRangeClock"), true, true),
          
          toolbar_selection_clock_table (2,3),
@@ -218,7 +233,8 @@ Editor::Editor ()
 
          /* nudge */
 
-         nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, true)
+         nudge_clock (X_("nudge"), false, X_("NudgeClock"), true, true),
+         meters_running(false)
 
 {
        constructed = false;
@@ -229,33 +245,33 @@ Editor::Editor ()
 
        session = 0;
 
-       selection = new Selection;
-       cut_buffer = new Selection;
+       selection = new Selection (this);
+       cut_buffer = new Selection (this);
 
        selection->TimeChanged.connect (mem_fun(*this, &Editor::time_selection_changed));
        selection->TracksChanged.connect (mem_fun(*this, &Editor::track_selection_changed));
        selection->RegionsChanged.connect (mem_fun(*this, &Editor::region_selection_changed));
        selection->PointsChanged.connect (mem_fun(*this, &Editor::point_selection_changed));
+       selection->MarkersChanged.connect (mem_fun(*this, &Editor::marker_selection_changed));
 
        clicked_regionview = 0;
        clicked_axisview = 0;
        clicked_routeview = 0;
        clicked_crossfadeview = 0;
        clicked_control_point = 0;
-       latest_regionview = 0;
        last_update_frame = 0;
        drag_info.item = 0;
        current_mixer_strip = 0;
        current_bbt_points = 0;
-
-       snap_type_strings = I18N (_snap_type_strings);
-       snap_mode_strings = I18N (_snap_mode_strings);
-       zoom_focus_strings = I18N(_zoom_focus_strings);
-
-       snap_type = SnapToFrame;
-       set_snap_to (snap_type);
-       snap_mode = SnapNormal;
-       set_snap_mode (snap_mode);
+       
+       snap_type_strings =  I18N (_snap_type_strings);
+       snap_mode_strings =  I18N (_snap_mode_strings);
+       zoom_focus_strings = I18N (_zoom_focus_strings);
+       edit_point_strings = I18N (_edit_point_strings);
+#ifdef USE_RUBBERBAND
+       rb_opt_strings = I18N (_rb_opt_strings);
+#endif
+       
        snap_threshold = 5.0;
        bbt_beat_subdivision = 4;
        canvas_width = 0;
@@ -263,6 +279,7 @@ Editor::Editor ()
        autoscroll_active = false;
        autoscroll_timeout_tag = -1;
        interthread_progress_window = 0;
+       logo_item = 0;
 
 #ifdef FFT_ANALYSIS
        analysis_window = 0;
@@ -274,13 +291,15 @@ Editor::Editor ()
        _show_waveforms_recording = true;
        first_action_message = 0;
        export_dialog = 0;
+       export_range_markers_dialog = 0;
        show_gain_after_trim = false;
        ignore_route_list_reorder = false;
        no_route_list_redisplay = false;
        verbose_cursor_on = true;
        route_removal = false;
        show_automatic_regions_in_region_list = true;
-       region_list_sort_type = (Editing::RegionListSortType) 0; 
+
+       region_list_sort_type = (Editing::RegionListSortType) 0;
        have_pending_keyboard_selection = false;
        _follow_playhead = true;
        _xfade_visibility = true;
@@ -298,23 +317,34 @@ Editor::Editor ()
        new_transport_marker_menu = 0;
        editor_mixer_strip_width = Wide;
        show_editor_mixer_when_tracks_arrive = false;
+       region_edit_menu_split_multichannel_item = 0;
+       region_edit_menu_split_item = 0;
        temp_location = 0;
        leftmost_frame = 0;
        ignore_mouse_mode_toggle = false;
+       ignore_midi_edit_mode_toggle = false;
        current_stepping_trackview = 0;
        entered_track = 0;
        entered_regionview = 0;
+       entered_marker = 0;
        clear_entered_track = false;
        _new_regionviews_show_envelope = false;
-       current_timestretch = 0;
+       current_timefx = 0;
        in_edit_group_row_change = false;
        last_canvas_frame = 0;
-       edit_cursor = 0;
        playhead_cursor = 0;
        button_release_can_deselect = true;
        canvas_idle_queued = false;
        _dragging_playhead = false;
+       _dragging_edit_point = false;
        _dragging_hscrollbar = false;
+       select_new_marker = false;
+       zoomed_to_region = false;
+
+       scrubbing_direction = 0;
+
+       sfbrowser = 0;
+       ignore_route_order_sync = false;
 
        location_marker_color = ARDOUR_UI::config()->canvasvar_LocationMarker.get();
        location_range_color = ARDOUR_UI::config()->canvasvar_LocationRange.get();
@@ -324,9 +354,13 @@ Editor::Editor ()
 
        range_marker_drag_rect = 0;
        marker_drag_line = 0;
-       
+       tempo_map_change_idle_handler_id = -1;
+       canvas_hroizontally_scrolled_handler_id = -1;
+       set_midi_edit_mode (MidiEditPencil, true);
        set_mouse_mode (MouseObject, true);
 
+       last_visual_state.frames_per_unit = 0;
+
        frames_per_unit = 2048; /* too early to use reset_zoom () */
        reset_hscrollbar_stepping ();
        
@@ -338,8 +372,8 @@ Editor::Editor ()
        initialize_canvas ();
 
        edit_controls_vbox.set_spacing (0);
-       horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled));
-       vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling));
+       horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled), false);
+       vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling), true);
        
        track_canvas.set_hadjustment (horizontal_adjustment);
        track_canvas.set_vadjustment (vertical_adjustment);
@@ -368,8 +402,9 @@ Editor::Editor ()
 
        build_cursors ();
        setup_toolbar ();
+       setup_midi_toolbar ();
 
-       edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed));
+       edit_point_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_point_clock_changed));
        
        ArdourCanvas::Canvas* time_pad = manage(new ArdourCanvas::Canvas());
        ArdourCanvas::SimpleLine* pad_line_1 = manage(new ArdourCanvas::SimpleLine(*time_pad->root(),
@@ -414,6 +449,10 @@ Editor::Editor ()
        mark_label.set_size_request (-1, (int)timebar_height);
        mark_label.set_alignment (1.0, 0.5);
        mark_label.set_padding (5,0);
+       cd_mark_label.set_name ("EditorTimeButton");
+       cd_mark_label.set_size_request (-1, (int)timebar_height);
+       cd_mark_label.set_alignment (1.0, 0.5);
+       cd_mark_label.set_padding (5,0);
        range_mark_label.set_name ("EditorTimeButton");
        range_mark_label.set_size_request (-1, (int)timebar_height);
        range_mark_label.set_alignment (1.0, 0.5);
@@ -486,7 +525,7 @@ Editor::Editor ()
        CellRendererToggle* route_list_visible_cell = dynamic_cast<CellRendererToggle*>(route_list_display.get_column_cell_renderer (0));
        route_list_visible_cell->property_activatable() = true;
        route_list_visible_cell->property_radio() = false;
-       
+
        route_display_model->signal_row_deleted().connect (mem_fun (*this, &Editor::route_list_delete));
        route_display_model->signal_row_changed().connect (mem_fun (*this, &Editor::route_list_change));
 
@@ -575,6 +614,10 @@ Editor::Editor ()
        region_list_display.append_column (_("Regions"), region_list_columns.name);
        region_list_display.set_headers_visible (false);
 
+       CellRendererText* region_name_cell = dynamic_cast<CellRendererText*>(region_list_display.get_column_cell_renderer (0));
+       region_name_cell->property_editable() = true;
+       region_name_cell->signal_edited().connect (mem_fun (*this, &Editor::region_name_edit));
+
        region_list_display.get_selection()->set_select_function (mem_fun (*this, &Editor::region_list_selection_filter));
        
        TreeViewColumn* tv_col = region_list_display.get_column(0);
@@ -651,9 +694,12 @@ Editor::Editor ()
        nlabel = manage (new Label (_("Edit Groups")));
        nlabel->set_angle (-90);
        the_notebook.append_page (*edit_group_display_packer, *nlabel);
-       nlabel = manage (new Label (_("Chunks")));
-       nlabel->set_angle (-90);
-       the_notebook.append_page (named_selection_scroller, *nlabel);
+       
+       if (!Profile->get_sae()) {
+               nlabel = manage (new Label (_("Chunks")));
+               nlabel->set_angle (-90);
+               the_notebook.append_page (named_selection_scroller, *nlabel);
+       }
 
        the_notebook.set_show_tabs (true);
        the_notebook.set_scrollable (true);
@@ -667,7 +713,8 @@ Editor::Editor ()
        
        edit_pane.signal_size_allocate().connect (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
 
-       top_hbox.pack_start (toolbar_frame, true, true);
+       top_hbox.pack_start (toolbar_frame, false, true);
+       top_hbox.pack_start (midi_toolbar_frame, false, true);
 
        HBox *hbox = manage (new HBox);
        hbox->pack_start (edit_pane, true, true);
@@ -680,12 +727,22 @@ Editor::Editor ()
        set_name ("EditorWindow");
        add_accel_group (ActionManager::ui_manager->get_accel_group());
 
+       status_bar_hpacker.show ();
+
+       vpacker.pack_end (status_bar_hpacker, false, false);
        vpacker.pack_end (global_hpacker, true, true);
 
        /* register actions now so that set_state() can find them and set toggles/checks etc */
        
        register_actions ();
-       
+
+       snap_type = SnapToBeat;
+       set_snap_to (snap_type);
+       snap_mode = SnapOff;
+       set_snap_mode (snap_mode);
+       _edit_point = EditAtMouse;
+       set_edit_point_preference (_edit_point);
+
        XMLNode* node = ARDOUR_UI::instance()->editor_settings();
        set_state (*node);
 
@@ -748,6 +805,7 @@ Editor::Editor ()
        ControlProtocol::ScrollTimeline.connect (mem_fun (*this, &Editor::control_scroll));
 
        Config->ParameterChanged.connect (mem_fun (*this, &Editor::parameter_changed));
+       Route::SyncOrderKeys.connect (mem_fun (*this, &Editor::sync_order_keys));
 
        constructed = true;
        instant_save ();
@@ -842,15 +900,6 @@ Editor::show_window ()
        present ();
 }
 
-void
-Editor::tie_vertical_scrolling ()
-{
-       double y1 = vertical_adjustment.get_value();
-       controls_layout.get_vadjustment()->set_value (y1);
-       playhead_cursor->set_y_axis(y1);
-       edit_cursor->set_y_axis(y1);
-}
-
 void
 Editor::instant_save ()
 {
@@ -866,13 +915,25 @@ Editor::instant_save ()
 }
 
 void
-Editor::edit_cursor_clock_changed()
+Editor::edit_point_clock_changed()
 {
-       if (edit_cursor->current_frame != edit_cursor_clock.current_time()) {
-               edit_cursor->set_position (edit_cursor_clock.current_time());
+       if (_dragging_edit_point) {
+               return;
+       }
+
+       if (selection->markers.empty()) {
+               return;
+       }
+
+       bool ignored;
+       Location* loc = find_location_from_marker (selection->markers.front(), ignored);
+
+       if (!loc) {
+               return;
        }
-}
 
+       loc->move_to (edit_point_clock.current_time());
+}
 
 void
 Editor::zoom_adjustment_changed ()
@@ -904,40 +965,65 @@ Editor::control_scroll (float fraction)
        }
 
        double step = fraction * current_page_frames();
-       nframes_t target;
 
-       if ((fraction < 0.0f) && (session->transport_frame() < (nframes_t) fabs(step))) {
-               target = 0;
-       } else if ((fraction > 0.0f) && (max_frames - session->transport_frame() < step)) {
-               target = (max_frames - (current_page_frames()*2)); // allow room for slop in where the PH is on the screen
+       /*
+               _control_scroll_target is an optional<T>
+       
+               it acts like a pointer to an nframes_t, with
+               a operator conversion to boolean to check
+               that it has a value could possibly use
+               playhead_cursor->current_frame to store the
+               value and a boolean in the class to know
+               when it's out of date
+       */
+
+       if (!_control_scroll_target) {
+               _control_scroll_target = session->transport_frame();
+               _dragging_playhead = true;
+       }
+
+       if ((fraction < 0.0f) && (*_control_scroll_target < (nframes_t) fabs(step))) {
+               *_control_scroll_target = 0;
+       } else if ((fraction > 0.0f) && (max_frames - *_control_scroll_target < step)) {
+               *_control_scroll_target = max_frames - (current_page_frames()*2); // allow room for slop in where the PH is on the screen
        } else {
-               target = (session->transport_frame() + (nframes_t) floor ((fraction * current_page_frames())));
+               *_control_scroll_target += (nframes_t) floor (step);
        }
 
        /* move visuals, we'll catch up with it later */
 
-       playhead_cursor->set_position (target);
-
-       if (target > (current_page_frames() / 2)) {
+       playhead_cursor->set_position (*_control_scroll_target);
+       UpdateAllTransportClocks (*_control_scroll_target);
+       
+       if (*_control_scroll_target > (current_page_frames() / 2)) {
                /* try to center PH in window */
-               reset_x_origin (target - (current_page_frames()/2));
+               reset_x_origin (*_control_scroll_target - (current_page_frames()/2));
        } else {
                reset_x_origin (0);
        }
 
-       /* cancel the existing */
+       /*
+               Now we do a timeout to actually bring the session to the right place
+               according to the playhead. This is to avoid reading disk buffers on every
+               call to control_scroll, which is driven by ScrollTimeline and therefore
+               probably by a control surface wheel which can generate lots of events.
+       */
+       /* cancel the existing timeout */
 
        control_scroll_connection.disconnect ();
 
-       /* add the next one */
+       /* add the next timeout */
 
-       control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), target), 50);
+       control_scroll_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::deferred_control_scroll), *_control_scroll_target), 250);
 }
 
 bool
 Editor::deferred_control_scroll (nframes_t target)
 {
-       session->request_locate (target);
+       session->request_locate (*_control_scroll_target, session->transport_rolling());
+       // reset for next stream
+       _control_scroll_target = boost::none;
+       _dragging_playhead = false;
        return false;
 }
 
@@ -1098,7 +1184,7 @@ Editor::connect_to_session (Session *t)
 
        edit_groups_changed ();
 
-       edit_cursor_clock.set_session (session);
+       edit_point_clock.set_session (session);
        zoom_range_clock.set_session (session);
        _playlist_selector->set_session (session);
        nudge_clock.set_session (session);
@@ -1145,6 +1231,10 @@ Editor::connect_to_session (Session *t)
        session->locations()->StateChanged.connect (mem_fun(*this, &Editor::refresh_location_display_s));
        session->locations()->end_location()->changed.connect (mem_fun(*this, &Editor::end_location_changed));
 
+       if (sfbrowser) {
+               sfbrowser->set_session (session);
+       }
+
        handle_new_duration ();
 
        redisplay_regions ();
@@ -1190,6 +1280,8 @@ Editor::connect_to_session (Session *t)
        /* register for undo history */
 
        session->register_with_memento_command_factory(_id, this);
+
+               start_updating ();
 }
 
 void
@@ -1225,6 +1317,22 @@ Editor::build_cursors ()
                speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
        }
        
+       { 
+               RefPtr<Bitmap> bits;
+               char pix[4] = { 0, 0, 0, 0 };
+               bits = Bitmap::create (pix, 2, 2);
+               Gdk::Color c;
+               transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
+       }
+
+       { 
+               RefPtr<Bitmap> bits;
+               char pix[4] = { 0, 0, 0, 0 };
+               bits = Bitmap::create (pix, 2, 2);
+               Gdk::Color c;
+               transparent_cursor = new Gdk::Cursor (bits, bits, c, c, 0, 0);
+       }
+
        grabber_cursor = new Gdk::Cursor (HAND2);
        cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
        trimmer_cursor =  new Gdk::Cursor (SB_H_DOUBLE_ARROW);
@@ -1232,7 +1340,9 @@ Editor::build_cursors ()
        time_fx_cursor = new Gdk::Cursor (SIZING);
        wait_cursor = new Gdk::Cursor  (WATCH);
        timebar_cursor = new Gdk::Cursor(LEFT_PTR);
-       note_cursor = new Gdk::Cursor (PENCIL);
+       midi_pencil_cursor = new Gdk::Cursor (PENCIL);
+       midi_select_cursor = new Gdk::Cursor (CENTER_PTR);
+       midi_erase_cursor = new Gdk::Cursor (DRAPED_BOX);
 }
 
 /** Pop up a context menu for when the user clicks on a fade in or fade out */
@@ -1261,12 +1371,18 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i
                }
                
                items.push_back (SeparatorElem());
-               
-               items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
-               items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
-               items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
-               items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
-               items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
+
+               if (Profile->get_sae()) {
+                       items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
+                       items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
+               } else {
+                       items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Linear)));
+                       items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Fast)));
+                       items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogB)));
+                       items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::LogA)));
+                       items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_in_shape), AudioRegion::Slow)));
+               }
+
                break;
 
        case FadeOutItem:
@@ -1279,11 +1395,16 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i
                
                items.push_back (SeparatorElem());
                
-               items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
-               items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
-               items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
-               items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
-               items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
+               if (Profile->get_sae()) {
+                       items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
+                       items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
+               } else {
+                       items.push_back (MenuElem (_("Linear"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Linear)));
+                       items.push_back (MenuElem (_("Slowest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Slow)));
+                       items.push_back (MenuElem (_("Slow"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogA)));
+                       items.push_back (MenuElem (_("Fast"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::LogB)));
+                       items.push_back (MenuElem (_("Fastest"), bind (mem_fun (*this, &Editor::set_fade_out_shape), AudioRegion::Fast)));
+               }
 
                break;
 
@@ -1297,28 +1418,179 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i
        fade_context_menu.popup (button, time);
 }
 
-/* Pop up the general track context menu for when the user clicks pretty much anywhere in a track or bus */
 void
-Editor::popup_track_context_menu (int button, int32_t time, nframes_t frame)
+Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, nframes_t frame)
+{
+       using namespace Menu_Helpers;
+       Menu* (Editor::*build_menu_function)(nframes_t);
+       Menu *menu;
+
+       switch (item_type) {
+       case RegionItem:
+       case RegionViewName:
+       case RegionViewNameHighlight:
+               if (with_selection) {
+                       build_menu_function = &Editor::build_track_selection_context_menu;
+               } else {
+                       build_menu_function = &Editor::build_track_region_context_menu;
+               }
+               break;
+
+       case SelectionItem:
+               if (with_selection) {
+                       build_menu_function = &Editor::build_track_selection_context_menu;
+               } else {
+                       build_menu_function = &Editor::build_track_context_menu;
+               }
+               break;
+
+       case CrossfadeViewItem:
+               build_menu_function = &Editor::build_track_crossfade_context_menu;
+               break;
+
+       case StreamItem:
+               if (clicked_routeview->get_diskstream()) {
+                       build_menu_function = &Editor::build_track_context_menu;
+               } else {
+                       build_menu_function = &Editor::build_track_bus_context_menu;
+               }
+               break;
+
+       default:
+               /* probably shouldn't happen but if it does, we don't care */
+               return;
+       }
+
+       menu = (this->*build_menu_function)(frame);
+       menu->set_name ("ArdourContextMenu");
+       
+       /* now handle specific situations */
+
+       switch (item_type) {
+       case RegionItem:
+       case RegionViewName:
+       case RegionViewNameHighlight:
+               if (!with_selection) {
+                       if (region_edit_menu_split_item) {
+                               if (clicked_regionview && clicked_regionview->region()->covers (get_preferred_edit_position())) {
+                                       ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, true);
+                               } else {
+                                       ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, false);
+                               }
+                       }
+                       /*
+                       if (region_edit_menu_split_multichannel_item) {
+                               if (clicked_regionview && clicked_regionview->region().n_channels() > 1) {
+                                       // GTK2FIX find the action, change its sensitivity
+                                       // region_edit_menu_split_multichannel_item->set_sensitive (true);
+                               } else {
+                                       // GTK2FIX see above
+                                       // region_edit_menu_split_multichannel_item->set_sensitive (false);
+                               }
+                       }*/
+               }
+               break;
+
+       case SelectionItem:
+               break;
+
+       case CrossfadeViewItem:
+               break;
+
+       case StreamItem:
+               break;
+
+       default:
+               /* probably shouldn't happen but if it does, we don't care */
+               return;
+       }
+
+       if (item_type != SelectionItem && clicked_routeview && clicked_routeview->audio_track()) {
+
+               /* Bounce to disk */
+               
+               using namespace Menu_Helpers;
+               MenuList& edit_items  = menu->items();
+               
+               edit_items.push_back (SeparatorElem());
+
+               switch (clicked_routeview->audio_track()->freeze_state()) {
+               case AudioTrack::NoFreeze:
+                       edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route)));
+                       break;
+
+               case AudioTrack::Frozen:
+                       edit_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_route)));
+                       break;
+                       
+               case AudioTrack::UnFrozen:
+                       edit_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_route)));
+                       break;
+               }
+
+       }
+
+       menu->popup (button, time);
+}
+
+Menu*
+Editor::build_track_context_menu (nframes_t ignored)
 {
-       build_track_context_menu (frame)->popup (button, time);
+       using namespace Menu_Helpers;
+
+       MenuList& edit_items = track_context_menu.items();
+       edit_items.clear();
+
+       add_dstream_context_items (edit_items);
+       return &track_context_menu;
 }
 
 Menu*
-Editor::build_track_context_menu (nframes_t frame)
+Editor::build_track_bus_context_menu (nframes_t ignored)
 {
        using namespace Menu_Helpers;
 
-       Menu* menu = manage (new Menu);
-       MenuList& edit_items = menu->items();
+       MenuList& edit_items = track_context_menu.items();
+       edit_items.clear();
+
+       add_bus_context_items (edit_items);
+       return &track_context_menu;
+}
+
+Menu*
+Editor::build_track_region_context_menu (nframes_t frame)
+{
+       using namespace Menu_Helpers;
+       MenuList& edit_items  = track_region_context_menu.items();
        edit_items.clear();
 
-       /* Build the general `track' context menu, adding what is appropriate given
-          the current selection */
+       RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
+
+       if (rtv) {
+               boost::shared_ptr<Diskstream> ds;
+               boost::shared_ptr<Playlist> pl;
+               
+               if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) {
+                       Playlist::RegionList* regions = pl->regions_at ((nframes_t) floor ( (double)frame * ds->speed()));
+                       for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+                               add_region_context_items (rtv->view(), (*i), edit_items);
+                       }
+                       delete regions;
+               }
+       }
+
+       add_dstream_context_items (edit_items);
+
+       return &track_region_context_menu;
+}
+
+Menu*
+Editor::build_track_crossfade_context_menu (nframes_t frame)
+{
+       using namespace Menu_Helpers;
+       MenuList& edit_items  = track_crossfade_context_menu.items();
+       edit_items.clear ();
 
-       /* XXX: currently crossfades can't be selected, so we can't use the selection
-          to decide which crossfades to mention in the menu.  I believe this will
-          change at some point.  For now we have to use clicked_trackview to decide. */
        AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (clicked_axisview);
 
        if (atv) {
@@ -1328,7 +1600,9 @@ Editor::build_track_context_menu (nframes_t frame)
 
                if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()) != 0) && ((apl = boost::dynamic_pointer_cast<AudioPlaylist> (pl)) != 0)) {
 
+                       Playlist::RegionList* regions = pl->regions_at (frame);
                        AudioPlaylist::Crossfades xfades;
+
                        apl->crossfades_at (frame, xfades);
 
                        bool many = xfades.size() > 1;
@@ -1336,24 +1610,18 @@ Editor::build_track_context_menu (nframes_t frame)
                        for (AudioPlaylist::Crossfades::iterator i = xfades.begin(); i != xfades.end(); ++i) {
                                add_crossfade_context_items (atv->audio_view(), (*i), edit_items, many);
                        }
-               }
-       }       
 
-       if (!selection->time.empty()) {
-               add_selection_context_items (edit_items);
-       }
+                       for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+                               add_region_context_items (atv->audio_view(), (*i), edit_items);
+                       }
 
-       if (!selection->regions.empty()) {
-               add_region_context_items (edit_items);
+                       delete regions;
+               }
        }
 
-       if (!selection->tracks.empty()) {
-               add_bus_or_audio_track_context_items (edit_items);
-       }
-       
-       menu->set_name ("ArdourContextMenu");
+       add_dstream_context_items (edit_items);
 
-       return menu;
+       return &track_crossfade_context_menu;
 }
 
 #ifdef FFT_ANALYSIS
@@ -1394,6 +1662,19 @@ Editor::analyze_range_selection()
 }
 #endif /* FFT_ANALYSIS */
 
+Menu*
+Editor::build_track_selection_context_menu (nframes_t ignored)
+{
+       using namespace Menu_Helpers;
+       MenuList& edit_items  = track_selection_context_menu.items();
+       edit_items.clear ();
+
+       add_selection_context_items (edit_items);
+       // edit_items.push_back (SeparatorElem());
+       // add_dstream_context_items (edit_items);
+
+       return &track_selection_context_menu;
+}
 
 /** Add context menu items relevant to crossfades.
  * @param edit_items List to add the items to.
@@ -1469,108 +1750,133 @@ Editor::add_item_with_sensitivity (Menu_Helpers::MenuList& m, Menu_Helpers::Menu
        }
 }
 
-/** Add context menu items relevant to regions.
- * @param edit_items List to add the items to.
- */
 void
-Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items)
+Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> region, Menu_Helpers::MenuList& edit_items)
 {
        using namespace Menu_Helpers;
-       Menu *region_menu = manage (new Menu);
-       MenuList& items = region_menu->items();
+       Menu     *region_menu = manage (new Menu);
+       MenuList& items       = region_menu->items();
        region_menu->set_name ("ArdourContextMenu");
        
-       items.push_back (MenuElem (_("Edit..."), mem_fun(*this, &Editor::edit_region)));
-       items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top)));
-       items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun  (*this, &Editor::lower_region_to_bottom)));
+       boost::shared_ptr<AudioRegion> ar;
+       boost::shared_ptr<MidiRegion>  mr;
 
-       Menu* sync_point_menu = manage (new Menu);
-       MenuList& sync_point_items = sync_point_menu->items();
-       sync_point_menu->set_name("ArdourContextMenu");
-       
-       sync_point_items.push_back (MenuElem (_("Define"), mem_fun(*this, &Editor::set_region_sync_from_edit_cursor)));
-       sync_point_items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_region_sync)));
+       if (region) {
+               ar = boost::dynamic_pointer_cast<AudioRegion> (region);
+               mr = boost::dynamic_pointer_cast<MidiRegion> (region);
+       }
+
+       /* when this particular menu pops up, make the relevant region 
+          become selected.
+       */
 
-       items.push_back (MenuElem (_("Sync points"), *sync_point_menu));
+       region_menu->signal_map_event().connect (bind (mem_fun(*this, &Editor::set_selected_regionview_from_map_event), sv, boost::weak_ptr<Region>(region)));
 
-       add_item_with_sensitivity (items, MenuElem (_("Audition"), mem_fun(*this, &Editor::audition_selected_region)), selection->regions.size() == 1);
-       
-       add_item_with_sensitivity (items, MenuElem (_("Export"), mem_fun(*this, &Editor::export_region)), selection->regions.size() == 1);
+       items.push_back (MenuElem (_("Rename"), mem_fun(*this, &Editor::rename_region)));
+       items.push_back (MenuElem (_("Popup region editor"), mem_fun(*this, &Editor::edit_region)));
+       items.push_back (MenuElem (_("Raise to top layer"), mem_fun(*this, &Editor::raise_region_to_top)));
+       items.push_back (MenuElem (_("Lower to bottom layer"), mem_fun  (*this, &Editor::lower_region_to_bottom)));
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Define sync point"), mem_fun(*this, &Editor::set_region_sync_from_edit_point)));
+       items.push_back (MenuElem (_("Remove sync point"), mem_fun(*this, &Editor::remove_region_sync)));
+       items.push_back (SeparatorElem());
 
+       items.push_back (MenuElem (_("Audition"), mem_fun(*this, &Editor::play_selected_region)));
+       items.push_back (MenuElem (_("Export"), mem_fun(*this, &Editor::export_region)));
        items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection)));
 
 #ifdef FFT_ANALYSIS
-       items.push_back (MenuElem (_("Analyze region"), mem_fun(*this, &Editor::analyze_region_selection)));
+       if (ar)
+               items.push_back (MenuElem (_("Analyze region"), mem_fun(*this, &Editor::analyze_region_selection)));
 #endif
 
        items.push_back (SeparatorElem());
 
-       items.push_back (MenuElem (_("Lock"), bind (mem_fun (*this, &Editor::set_region_lock), true)));
-       items.push_back (MenuElem (_("Unlock"), bind (mem_fun (*this, &Editor::set_region_lock), false)));
-       items.push_back (MenuElem (_("Lock Position"), bind (mem_fun (*this, &Editor::set_region_position_lock), true)));
-       items.push_back (MenuElem (_("Unlock Position"), bind (mem_fun (*this, &Editor::set_region_position_lock), false)));
-       items.push_back (MenuElem (_("Mute"), bind (mem_fun (*this, &Editor::set_region_mute), true)));
-       items.push_back (MenuElem (_("Unmute"), bind (mem_fun (*this, &Editor::set_region_mute), false)));
-       items.push_back (MenuElem (_("Opaque"), bind (mem_fun (*this, &Editor::set_region_opaque), true)));
-       items.push_back (MenuElem (_("Transparent"), bind (mem_fun (*this, &Editor::set_region_opaque), false)));
-
-       /* We allow "Original position" if at least one region is not at its
-          natural position 
-       */
-       RegionSelection::iterator i = selection->regions.begin();
-       while (i != selection->regions.end() && (*i)->region()->at_natural_position() == true) {
-               ++i;
-       }
+       sigc::connection fooc;
 
-       add_item_with_sensitivity (items, MenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)), i != selection->regions.end());
+       items.push_back (CheckMenuElem (_("Lock")));
+       CheckMenuItem* region_lock_item = static_cast<CheckMenuItem*>(&items.back());
+       fooc = region_lock_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_lock));
+       if (region->locked()) {
+               fooc.block (true);
+               region_lock_item->set_active();
+               fooc.block (false);
+       }
+       items.push_back (CheckMenuElem (_("Mute")));
+       CheckMenuItem* region_mute_item = static_cast<CheckMenuItem*>(&items.back());
+       fooc = region_mute_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_mute));
+       if (region->muted()) {
+               fooc.block (true);
+               region_mute_item->set_active();
+               fooc.block (false);
+       }
        
-       items.push_back (SeparatorElem());
-
-       /* Find out if we have a selected audio region */
-       i = selection->regions.begin();
-       while (i != selection->regions.end() && boost::dynamic_pointer_cast<AudioRegion>((*i)->region()) == 0) {
-               ++i;
+       if (!Profile->get_sae()) {
+               items.push_back (CheckMenuElem (_("Opaque")));
+               CheckMenuItem* region_opaque_item = static_cast<CheckMenuItem*>(&items.back());
+               fooc = region_opaque_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_region_opaque));
+               if (region->opaque()) {
+                       fooc.block (true);
+                       region_opaque_item->set_active();
+                       fooc.block (false);
+               }
        }
-       const bool have_selected_audio_region = (i != selection->regions.end());
-
-       if (have_selected_audio_region) {
-
-               Menu* envelopes_menu = manage (new Menu);
-               MenuList& envelopes_items = envelopes_menu->items();
-               envelopes_menu->set_name ("ArdourContextMenu");
-
-               envelopes_items.push_back (MenuElem (_("Reset"), mem_fun(*this, &Editor::reset_region_gain_envelopes)));
-               envelopes_items.push_back (MenuElem (_("Visible"), bind (mem_fun (*this, &Editor::set_gain_envelope_visibility), true)));
-               envelopes_items.push_back (MenuElem (_("Invisible"), bind (mem_fun (*this, &Editor::set_gain_envelope_visibility), false)));
-               envelopes_items.push_back (MenuElem (_("Active"), bind (mem_fun (*this, &Editor::set_gain_envelope_active), true)));
-               envelopes_items.push_back (MenuElem (_("Inactive"), bind (mem_fun (*this, &Editor::set_gain_envelope_active), false)));
 
-               items.push_back (MenuElem (_("Envelopes"), *envelopes_menu));
-               
-               items.push_back (MenuElem (_("Denormalize"), mem_fun (*this, &Editor::denormalize_regions)));
-               items.push_back (MenuElem (_("Normalize"), mem_fun (*this, &Editor::normalize_regions)));
+       items.push_back (CheckMenuElem (_("Original position"), mem_fun(*this, &Editor::naturalize)));
+       if (region->at_natural_position()) {
+               items.back().set_sensitive (false);
        }
        
-       /* Find out if we have a selected MIDI region */
-       i = selection->regions.begin();
-       while (i != selection->regions.end() && boost::dynamic_pointer_cast<MidiRegion>((*i)->region()) == 0) {
-               ++i;
-       }
-       const bool have_selected_midi_region = (i != selection->regions.end());
+       items.push_back (SeparatorElem());
        
-       if (have_selected_midi_region) {
+       if (ar) {
+               
+               RegionView* rv = sv->find_view (ar);
+               AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
+               
+               if (!Profile->get_sae()) {
+                       items.push_back (MenuElem (_("Reset Envelope"), mem_fun(*this, &Editor::reset_region_gain_envelopes)));
+
+                       items.push_back (CheckMenuElem (_("Envelope Visible")));
+                       CheckMenuItem* region_envelope_visible_item = static_cast<CheckMenuItem*> (&items.back());
+                       fooc = region_envelope_visible_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_visibility));
+                       if (arv->envelope_visible()) {
+                               fooc.block (true);
+                               region_envelope_visible_item->set_active (true);
+                               fooc.block (false);
+                       }
+               
+                       items.push_back (CheckMenuElem (_("Envelope Active")));
+                       CheckMenuItem* region_envelope_active_item = static_cast<CheckMenuItem*> (&items.back());
+                       fooc = region_envelope_active_item->signal_activate().connect (mem_fun(*this, &Editor::toggle_gain_envelope_active));
+                       
+                       if (ar->envelope_active()) {
+                               fooc.block (true);
+                               region_envelope_active_item->set_active (true);
+                               fooc.block (false);
+                       }
 
-               items.push_back (MenuElem (_("Quantize"), mem_fun(*this, &Editor::quantize_regions)));
-               items.push_back (SeparatorElem());
+                       items.push_back (SeparatorElem());
+               }
+
+               if (ar->scale_amplitude() != 1.0f) {
+                       items.push_back (MenuElem (_("DeNormalize"), mem_fun(*this, &Editor::denormalize_region)));
+               } else {
+                       items.push_back (MenuElem (_("Normalize"), mem_fun(*this, &Editor::normalize_region)));
+               }
 
+       } else if (mr) {
+               items.push_back (MenuElem (_("Quantize"), mem_fun(*this, &Editor::quantize_region)));
+               items.push_back (SeparatorElem());
        }
 
+       items.push_back (MenuElem (_("Reverse"), mem_fun(*this, &Editor::reverse_region)));
+       items.push_back (SeparatorElem());
+
        /* range related stuff */
-       
-       add_item_with_sensitivity (items, MenuElem (_("Add range markers"), mem_fun (*this, &Editor::add_location_from_audio_region)), selection->regions.size() == 1);
-       
-       add_item_with_sensitivity (items, MenuElem (_("Set range selection"), mem_fun (*this, &Editor::set_selection_from_audio_region)), selection->regions.size() == 1);
-       
+
+       items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_audio_region)));
+       items.push_back (MenuElem (_("Set Range Selection"), mem_fun (*this, &Editor::set_selection_from_region)));
        items.push_back (SeparatorElem());
                         
        /* Nudge region */
@@ -1579,34 +1885,56 @@ Editor::add_region_context_items (Menu_Helpers::MenuList& edit_items)
        MenuList& nudge_items = nudge_menu->items();
        nudge_menu->set_name ("ArdourContextMenu");
        
-       nudge_items.push_back (MenuElem (_("Nudge forward"), (bind (mem_fun(*this, &Editor::nudge_forward), false))));
-       nudge_items.push_back (MenuElem (_("Nudge backward"), (bind (mem_fun(*this, &Editor::nudge_backward), false))));
-       nudge_items.push_back (MenuElem (_("Nudge forward by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset))));
-       nudge_items.push_back (MenuElem (_("Nudge backward by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset))));
+       nudge_items.push_back (MenuElem (_("Nudge fwd"), (bind (mem_fun(*this, &Editor::nudge_forward), false))));
+       nudge_items.push_back (MenuElem (_("Nudge bwd"), (bind (mem_fun(*this, &Editor::nudge_backward), false))));
+       nudge_items.push_back (MenuElem (_("Nudge fwd by capture offset"), (mem_fun(*this, &Editor::nudge_forward_capture_offset))));
+       nudge_items.push_back (MenuElem (_("Nudge bwd by capture offset"), (mem_fun(*this, &Editor::nudge_backward_capture_offset))));
 
        items.push_back (MenuElem (_("Nudge"), *nudge_menu));
+       items.push_back (SeparatorElem());
 
        Menu *trim_menu = manage (new Menu);
        MenuList& trim_items = trim_menu->items();
        trim_menu->set_name ("ArdourContextMenu");
        
-       trim_items.push_back (MenuElem (_("Start to edit cursor"), mem_fun(*this, &Editor::trim_region_from_edit_cursor)));
-       trim_items.push_back (MenuElem (_("Edit cursor to end"), mem_fun(*this, &Editor::trim_region_to_edit_cursor)));
+       trim_items.push_back (MenuElem (_("Start to edit point"), mem_fun(*this, &Editor::trim_region_from_edit_point)));
+       trim_items.push_back (MenuElem (_("Edit point to end"), mem_fun(*this, &Editor::trim_region_to_edit_point)));
+       trim_items.push_back (MenuElem (_("Trim To Loop"), mem_fun(*this, &Editor::trim_region_to_loop)));
+       trim_items.push_back (MenuElem (_("Trim To Punch"), mem_fun(*this, &Editor::trim_region_to_punch)));
                             
        items.push_back (MenuElem (_("Trim"), *trim_menu));
+       items.push_back (SeparatorElem());
+
        items.push_back (MenuElem (_("Split"), (mem_fun(*this, &Editor::split_region))));
+       region_edit_menu_split_item = &items.back();
+
        items.push_back (MenuElem (_("Make mono regions"), (mem_fun(*this, &Editor::split_multichannel_region))));
-       items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
-       items.push_back (MenuElem (_("Fill track"), (mem_fun(*this, &Editor::region_fill_track))));
+       region_edit_menu_split_multichannel_item = &items.back();
+
+       items.push_back (MenuElem (_("Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), false))));
+       items.push_back (MenuElem (_("Multi-Duplicate"), (bind (mem_fun(*this, &Editor::duplicate_dialog), true))));
+       items.push_back (MenuElem (_("Fill Track"), (mem_fun(*this, &Editor::region_fill_track))));
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_selected_regions)));
+       items.push_back (MenuElem (_("Remove"), mem_fun(*this, &Editor::remove_clicked_region)));
 
        /* OK, stick the region submenu at the top of the list, and then add
           the standard items.
        */
 
-       string const menu_item_name = selection->regions.size() > 1 ? _("Regions") : _("Region");
+       /* we have to hack up the region name because "_" has a special
+          meaning for menu titles.
+       */
+
+       string::size_type pos = 0;
+       string menu_item_name = region->name();
+
+       while ((pos = menu_item_name.find ("_", pos)) != string::npos) {
+               menu_item_name.replace (pos, 1, "__");
+               pos += 2;
+       }
+       
        edit_items.push_back (MenuElem (menu_item_name, *region_menu));
+       edit_items.push_back (SeparatorElem());
 }
 
 /** Add context menu items relevant to selection ranges.
@@ -1621,7 +1949,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
        selection_menu->set_name ("ArdourContextMenu");
 
        items.push_back (MenuElem (_("Play range"), mem_fun(*this, &Editor::play_selection)));
-       items.push_back (MenuElem (_("Loop range"), mem_fun(*this, &Editor::set_route_loop_selection)));
+       items.push_back (MenuElem (_("Loop range"), bind (mem_fun(*this, &Editor::set_loop_from_selection), true)));
 
 #ifdef FFT_ANALYSIS
        items.push_back (SeparatorElem());
@@ -1629,15 +1957,22 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
 #endif
        
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Separate range to track"), mem_fun(*this, &Editor::separate_region_from_selection)));
-       items.push_back (MenuElem (_("Separate range to region list"), mem_fun(*this, &Editor::new_region_from_selection)));
+       items.push_back (MenuElem (_("Extend Range to End of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_end_of_region), false)));
+       items.push_back (MenuElem (_("Extend Range to Start of Region"), bind (mem_fun(*this, &Editor::extend_selection_to_start_of_region), false)));
+
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Convert to region in-place"), mem_fun(*this, &Editor::separate_region_from_selection)));
+       items.push_back (MenuElem (_("Convert to region in region list"), mem_fun(*this, &Editor::new_region_from_selection)));
        
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Select all in range"), mem_fun(*this, &Editor::select_all_selectables_using_time_selection)));
+
+       items.push_back (SeparatorElem());
+       items.push_back (MenuElem (_("Set loop from selection"), bind (mem_fun(*this, &Editor::set_loop_from_selection), false)));
+       items.push_back (MenuElem (_("Set punch from selection"), mem_fun(*this, &Editor::set_punch_from_selection)));
+       
        items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Add range markers"), mem_fun (*this, &Editor::add_location_from_selection)));
-       items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
-       items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
+       items.push_back (MenuElem (_("Add Range Markers"), mem_fun (*this, &Editor::add_location_from_selection)));
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Crop region to range"), mem_fun(*this, &Editor::crop_region_to_selection)));
        items.push_back (MenuElem (_("Fill range with region"), mem_fun(*this, &Editor::region_fill_selection)));
@@ -1646,49 +1981,25 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items)
        items.push_back (SeparatorElem());
        items.push_back (MenuElem (_("Bounce range"), mem_fun(*this, &Editor::bounce_range_selection)));
        items.push_back (MenuElem (_("Export range"), mem_fun(*this, &Editor::export_selection)));
-
-       edit_items.push_back (MenuElem (_("Range"), *selection_menu));
-       edit_items.push_back (SeparatorElem());
 }
 
-/** Add context menu items relevant to busses or audio tracks.
- * @param edit_items List to add the items to.
- */
+       
 void
-Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items)
+Editor::add_dstream_context_items (Menu_Helpers::MenuList& edit_items)
 {
        using namespace Menu_Helpers;
 
-       /* We add every possible action here, and de-sensitize things
-          that aren't allowed.  The sensitivity logic is a bit spread out;
-          on the one hand I'm using things like can_cut_copy (), which is
-          reasonably complicated and so perhaps better near the function that
-          it expresses sensitivity for, and on the other hand checks
-          in this function as well.  You can't really have can_* for everything
-          or the number of methods would get silly. */
-
-       bool const one_selected_region = selection->regions.size() == 1;
-
-       /* Count the number of selected audio tracks */
-       int n_audio_tracks = 0;
-       for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
-               RouteTimeAxisView const * r = dynamic_cast<RouteTimeAxisView*>(*i);
-               if (r && r->is_audio_track()) {
-                       n_audio_tracks++;
-               }
-       }
-
        /* Playback */
 
        Menu *play_menu = manage (new Menu);
        MenuList& play_items = play_menu->items();
        play_menu->set_name ("ArdourContextMenu");
        
-       play_items.push_back (MenuElem (_("Play from edit cursor"), mem_fun(*this, &Editor::play_from_edit_cursor)));
+       play_items.push_back (MenuElem (_("Play from edit point"), mem_fun(*this, &Editor::play_from_edit_point)));
        play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
-       add_item_with_sensitivity (play_items, MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)), one_selected_region);
-       
-       add_item_with_sensitivity (play_items, MenuElem (_("Loop region"), mem_fun(*this, &Editor::loop_selected_region)), one_selected_region);
+       play_items.push_back (MenuElem (_("Play region"), mem_fun(*this, &Editor::play_selected_region)));
+       play_items.push_back (SeparatorElem());
+       play_items.push_back (MenuElem (_("Loop Region"), mem_fun(*this, &Editor::loop_selected_region)));
        
        edit_items.push_back (MenuElem (_("Play"), *play_menu));
 
@@ -1697,33 +2008,24 @@ Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items
        Menu *select_menu = manage (new Menu);
        MenuList& select_items = select_menu->items();
        select_menu->set_name ("ArdourContextMenu");
-
-       string str = selection->tracks.size() == 1 ? _("Select all in track") : _("Select all in tracks");
-
-       select_items.push_back (MenuElem (str, bind (mem_fun(*this, &Editor::select_all_in_selected_tracks), Selection::Set)));
-       
-       select_items.push_back (MenuElem (_("Select all"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
-
-       str = selection->tracks.size() == 1 ? _("Invert selection in track") : _("Invert selection in tracks");
-       
-       select_items.push_back (MenuElem (str, mem_fun(*this, &Editor::invert_selection_in_selected_tracks)));
        
+       select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
+       select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
+       select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
        select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
        select_items.push_back (SeparatorElem());
+       select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
+       select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
+       select_items.push_back (SeparatorElem());
+       select_items.push_back (MenuElem (_("Select All After Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
+       select_items.push_back (MenuElem (_("Select All Before Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
+       select_items.push_back (MenuElem (_("Select All After Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
+       select_items.push_back (MenuElem (_("Select All Before Playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
+       select_items.push_back (MenuElem (_("Select All Between Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), false)));
+       select_items.push_back (MenuElem (_("Select All Within Playhead & Edit Point"), bind (mem_fun(*this, &Editor::select_all_selectables_between), true)));
+       select_items.push_back (MenuElem (_("Select Range Between Playhead & Edit Point"), mem_fun(*this, &Editor::select_range_between)));
 
-       if (n_audio_tracks) {
-               select_items.push_back (MenuElem (_("Set range to loop range"), mem_fun(*this, &Editor::set_selection_from_loop)));
-               select_items.push_back (MenuElem (_("Set range to punch range"), mem_fun(*this, &Editor::set_selection_from_punch)));
-       }
-       
-       select_items.push_back (MenuElem (_("Select all after edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, true)));
-       select_items.push_back (MenuElem (_("Select all before edit cursor"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), edit_cursor, false)));
-       select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
-       select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
-
-       if (n_audio_tracks) {
-               select_items.push_back (MenuElem (_("Select all between cursors"), bind (mem_fun(*this, &Editor::select_all_selectables_between_cursors), playhead_cursor, edit_cursor)));
-       }
+       select_items.push_back (SeparatorElem());
 
        edit_items.push_back (MenuElem (_("Select"), *select_menu));
 
@@ -1732,68 +2034,97 @@ Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items
        Menu *cutnpaste_menu = manage (new Menu);
        MenuList& cutnpaste_items = cutnpaste_menu->items();
        cutnpaste_menu->set_name ("ArdourContextMenu");
+       
+       cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
+       cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
+       cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
+
+       cutnpaste_items.push_back (SeparatorElem());
+
+       cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
+       cutnpaste_items.push_back (MenuElem (_("Align Relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
+
+       cutnpaste_items.push_back (SeparatorElem());
+
+       cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
 
-       add_item_with_sensitivity (cutnpaste_items, MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)), can_cut_copy ());
+       edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
+
+       /* Adding new material */
        
-       add_item_with_sensitivity (cutnpaste_items, MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)), can_cut_copy ());
+       edit_items.push_back (SeparatorElem());
+       edit_items.push_back (MenuElem (_("Insert Selected Region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)));
+       edit_items.push_back (MenuElem (_("Insert Existing Audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)));
+
+       /* Nudge track */
+
+       Menu *nudge_menu = manage (new Menu());
+       MenuList& nudge_items = nudge_menu->items();
+       nudge_menu->set_name ("ArdourContextMenu");
        
-       if (n_audio_tracks) {
-               cutnpaste_items.push_back (MenuElem (_("Paste at edit cursor"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
-               cutnpaste_items.push_back (MenuElem (_("Paste at mouse"), mem_fun(*this, &Editor::mouse_paste)));
-               
-               cutnpaste_items.push_back (SeparatorElem());
-               
-               cutnpaste_items.push_back (MenuElem (_("Align"), bind (mem_fun(*this, &Editor::align), ARDOUR::SyncPoint)));
-               cutnpaste_items.push_back (MenuElem (_("Align relative"), bind (mem_fun(*this, &Editor::align_relative), ARDOUR::SyncPoint)));
-               cutnpaste_items.push_back (MenuElem (_("Insert chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)));
-       } else {
-               cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
-       }
+       edit_items.push_back (SeparatorElem());
+       nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
+       nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
+       nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
+       nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
 
-       edit_items.push_back (MenuElem (_("Edit"), *cutnpaste_menu));
-               
-       if (n_audio_tracks) {
+       edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
+}
 
-               Menu *track_menu = manage (new Menu);
-               MenuList& track_items = track_menu->items();
-               track_menu->set_name ("ArdourContextMenu");
-               
-               /* Adding new material */
+void
+Editor::add_bus_context_items (Menu_Helpers::MenuList& edit_items)
+{
+       using namespace Menu_Helpers;
+
+       /* Playback */
+
+       Menu *play_menu = manage (new Menu);
+       MenuList& play_items = play_menu->items();
+       play_menu->set_name ("ArdourContextMenu");
        
-               add_item_with_sensitivity (track_items, MenuElem (_("Insert selected region"), bind (mem_fun(*this, &Editor::insert_region_list_selection), 1.0f)), n_audio_tracks == 1);
-               
-               add_item_with_sensitivity (track_items, MenuElem (_("Insert existing audio"), bind (mem_fun(*this, &Editor::add_external_audio_action), ImportToTrack)), n_audio_tracks == 1);
-               
-               /* Nudge */
+       play_items.push_back (MenuElem (_("Play from edit point"), mem_fun(*this, &Editor::play_from_edit_point)));
+       play_items.push_back (MenuElem (_("Play from start"), mem_fun(*this, &Editor::play_from_start)));
+       edit_items.push_back (MenuElem (_("Play"), *play_menu));
 
-               Menu *nudge_menu = manage (new Menu());
-               MenuList& nudge_items = nudge_menu->items();
-               nudge_menu->set_name ("ArdourContextMenu");
+       /* Selection */
 
-               str = selection->tracks.size() == 1 ? _("Nudge track forward") : _("Nude tracks forward");
-               nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), false, true))));
+       Menu *select_menu = manage (new Menu);
+       MenuList& select_items = select_menu->items();
+       select_menu->set_name ("ArdourContextMenu");
+       
+       select_items.push_back (MenuElem (_("Select All in track"), bind (mem_fun(*this, &Editor::select_all_in_track), Selection::Set)));
+       select_items.push_back (MenuElem (_("Select All"), bind (mem_fun(*this, &Editor::select_all), Selection::Set)));
+       select_items.push_back (MenuElem (_("Invert selection in track"), mem_fun(*this, &Editor::invert_selection_in_track)));
+       select_items.push_back (MenuElem (_("Invert selection"), mem_fun(*this, &Editor::invert_selection)));
+       select_items.push_back (SeparatorElem());
+       select_items.push_back (MenuElem (_("Select all after edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), true)));
+       select_items.push_back (MenuElem (_("Select all before edit point"), bind (mem_fun(*this, &Editor::select_all_selectables_using_edit), false)));
+       select_items.push_back (MenuElem (_("Select all after playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, true)));
+       select_items.push_back (MenuElem (_("Select all before playhead"), bind (mem_fun(*this, &Editor::select_all_selectables_using_cursor), playhead_cursor, false)));
 
-               str = selection->tracks.size() == 1 ? _("Nudge track after edit cursor forward") : _("Nudge tracks after edit cursor forward");
-               
-               nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), true, true))));
+       edit_items.push_back (MenuElem (_("Select"), *select_menu));
 
-               str = selection->tracks.size() == 1 ? _("Nudge track backward") : _("Nudge tracks backward");
-               
-               nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), false, false))));
+       /* Cut-n-Paste */
 
-               str = selection->tracks.size() == 1 ? _("Nudge track after edit cursor backward") : _("Nudge tracks after edit cursor backward");
-               
-               nudge_items.push_back (MenuElem (str, (bind (mem_fun(*this, &Editor::nudge_selected_tracks), true, false))));
-               
-               track_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
+       Menu *cutnpaste_menu = manage (new Menu);
+       MenuList& cutnpaste_items = cutnpaste_menu->items();
+       cutnpaste_menu->set_name ("ArdourContextMenu");
+       
+       cutnpaste_items.push_back (MenuElem (_("Cut"), mem_fun(*this, &Editor::cut)));
+       cutnpaste_items.push_back (MenuElem (_("Copy"), mem_fun(*this, &Editor::copy)));
+       cutnpaste_items.push_back (MenuElem (_("Paste"), bind (mem_fun(*this, &Editor::paste), 1.0f)));
 
-               /* Freeze */
-               track_items.push_back (MenuElem (_("Freeze"), mem_fun(*this, &Editor::freeze_routes)));
-               track_items.push_back (MenuElem (_("Unfreeze"), mem_fun(*this, &Editor::unfreeze_routes)));
+       Menu *nudge_menu = manage (new Menu());
+       MenuList& nudge_items = nudge_menu->items();
+       nudge_menu->set_name ("ArdourContextMenu");
+       
+       edit_items.push_back (SeparatorElem());
+       nudge_items.push_back (MenuElem (_("Nudge entire track fwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, true))));
+       nudge_items.push_back (MenuElem (_("Nudge track after edit point fwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, true))));
+       nudge_items.push_back (MenuElem (_("Nudge entire track bwd"), (bind (mem_fun(*this, &Editor::nudge_track), false, false))));
+       nudge_items.push_back (MenuElem (_("Nudge track after edit point bwd"), (bind (mem_fun(*this, &Editor::nudge_track), true, false))));
 
-               str = selection->tracks.size() == 1 ? _("Track") : _("Tracks");
-               edit_items.push_back (MenuElem (str, *track_menu));
-       }
+       edit_items.push_back (MenuElem (_("Nudge"), *nudge_menu));
 }
 
 /* CURSOR SETTING AND MARKS AND STUFF */
@@ -1801,8 +2132,15 @@ Editor::add_bus_or_audio_track_context_items (Menu_Helpers::MenuList& edit_items
 void
 Editor::set_snap_to (SnapType st)
 {      
+   unsigned int snap_ind = (unsigned int)st;
        snap_type = st;
-       string str = snap_type_strings[(int) st];
+
+   if ( snap_ind > snap_type_strings.size() - 1 ) {
+      snap_ind = 0;
+      snap_type = (SnapType)snap_ind;
+   }
+
+       string str = snap_type_strings[snap_ind];
 
        if (str != snap_type_selector.get_active_text()) {
                snap_type_selector.set_active_text (str);
@@ -1816,7 +2154,9 @@ Editor::set_snap_to (SnapType st)
        case SnapToAEighthBeat:
        case SnapToAQuarterBeat:
        case SnapToAThirdBeat:
+                compute_bbt_ruler_scale (leftmost_frame, leftmost_frame + (nframes_t)(canvas_width * frames_per_unit));
                 update_tempo_based_rulers ();
+               break;
        default:
                /* relax */
                break;
@@ -1835,6 +2175,47 @@ Editor::set_snap_mode (SnapMode mode)
 
        instant_save ();
 }
+void
+Editor::set_edit_point_preference (EditPoint ep)
+{
+       bool changed = _edit_point != ep;
+
+       _edit_point = ep;
+       string str = edit_point_strings[(int)ep];
+
+       if (str != edit_point_selector.get_active_text ()) {
+               edit_point_selector.set_active_text (str);
+       }
+
+       if (!changed) {
+               return;
+       }
+
+       if (Profile->get_sae()) {
+
+               switch (zoom_focus) {
+               case ZoomFocusMouse:
+               case ZoomFocusPlayhead:
+               case ZoomFocusEdit:
+                       switch (_edit_point) {
+                       case EditAtMouse:
+                               set_zoom_focus (ZoomFocusMouse);
+                               break;
+                       case EditAtPlayhead:
+                               set_zoom_focus (ZoomFocusPlayhead);
+                               break;
+                       case EditAtSelectedMarker:
+                               set_zoom_focus (ZoomFocusEdit);
+                               break;
+                       }
+                       break;
+               default:
+                       break;
+               }
+       } 
+                                               
+       instant_save ();
+}
 
 int
 Editor::set_state (const XMLNode& node)
@@ -1885,13 +2266,6 @@ Editor::set_state (const XMLNode& node)
                horizontal_adjustment.set_value (0);
        }
 
-       if (session && (prop = node.property ("edit-cursor"))) {
-               nframes_t pos = atol (prop->value().c_str());
-               edit_cursor->set_position (pos);
-       } else {
-               edit_cursor->set_position (0);
-       }
-
        if ((prop = node.property ("mixer-width"))) {
                editor_mixer_strip_width = Width (string_2_enum (prop->value(), editor_mixer_strip_width));
        }
@@ -1912,6 +2286,10 @@ Editor::set_state (const XMLNode& node)
                set_snap_mode ((SnapMode) atoi (prop->value()));
        }
 
+       if ((prop = node.property ("edit-point"))) {
+               set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point));
+       }
+
        if ((prop = node.property ("mouse-mode"))) {
                MouseMode m = str2mousemode(prop->value());
                mouse_mode = MouseMode ((int) m + 1); /* lie, force mode switch */
@@ -2063,10 +2441,10 @@ Editor::get_state ()
        snprintf (buf, sizeof(buf), "%d", (int) snap_mode);
        node->add_property ("snap-mode", buf);
 
+       node->add_property ("edit-point", enum_2_string (_edit_point));
+
        snprintf (buf, sizeof (buf), "%" PRIu32, playhead_cursor->current_frame);
        node->add_property ("playhead", buf);
-       snprintf (buf, sizeof (buf), "%" PRIu32, edit_cursor->current_frame);
-       node->add_property ("edit-cursor", buf);
 
        node->add_property ("show-waveforms", _show_waveforms ? "yes" : "no");
        node->add_property ("show-waveforms-recording", _show_waveforms_recording ? "yes" : "no");
@@ -2114,7 +2492,7 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
        Location* before = 0;
        Location* after = 0;
 
-       if (!session) {
+       if (!session || snap_mode == SnapOff) {
                return;
        }
 
@@ -2125,9 +2503,6 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
        nframes64_t presnap = start;
 
        switch (snap_type) {
-       case SnapToFrame:
-               break;
-
        case SnapToCDFrame:
                if (direction) {
                        start = (nframes_t) ceil ((double) start / (one_second / 75)) * (one_second / 75);
@@ -2229,10 +2604,6 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
                start = session->tempo_map().round_to_beat_subdivision (start, 3);
                break;
 
-       case SnapToEditCursor:
-               start = edit_cursor->current_frame;
-               break;
-
        case SnapToMark:
                if (for_mark) {
                        return;
@@ -2313,6 +2684,7 @@ Editor::snap_to (nframes64_t& start, int32_t direction, bool for_mark)
                }
                
        default:
+               /* handled at entry */
                return;
                
        }
@@ -2325,12 +2697,6 @@ Editor::snap_length_beats (nframes_t start)
                return 1.0;
        }
 
-       const nframes64_t one_second = session->frame_rate();
-       const nframes64_t one_minute = session->frame_rate() * 60;
-       const nframes64_t one_smpte_second = (nframes64_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame());
-       nframes64_t one_smpte_minute = (nframes64_t)(rint(session->smpte_frames_per_second()) * session->frames_per_smpte_frame() * 60);
-       nframes64_t presnap = start;
-
        /* FIXME: This could/should also work with non-tempo based snap settings (ie seconds) */
 
        switch (snap_type) {
@@ -2369,8 +2735,11 @@ Editor::setup_toolbar ()
 {
        string pixmap_path;
 
+#ifdef GTKOSX
+       const guint32 FUDGE = 38; // Combo's are stupid - they steal space from the entry for the button
+#else
        const guint32 FUDGE = 18; // Combo's are stupid - they steal space from the entry for the button
-
+#endif
 
        /* Mode Buttons (tool selection) */
 
@@ -2379,12 +2748,17 @@ Editor::setup_toolbar ()
        mouse_move_button.add (*(manage (new Image (::get_icon("tool_object")))));
        mouse_move_button.set_relief(Gtk::RELIEF_NONE);
        mouse_mode_buttons.push_back (&mouse_move_button);
-       mouse_select_button.add (*(manage (new Image (get_xpm("tool_range.xpm")))));
-       mouse_select_button.set_relief(Gtk::RELIEF_NONE);
-       mouse_mode_buttons.push_back (&mouse_select_button);
-       mouse_gain_button.add (*(manage (new Image (::get_icon("tool_gain")))));
-       mouse_gain_button.set_relief(Gtk::RELIEF_NONE);
-       mouse_mode_buttons.push_back (&mouse_gain_button);
+
+       if (!Profile->get_sae()) {
+               mouse_select_button.add (*(manage (new Image (get_xpm("tool_range.xpm")))));
+               mouse_select_button.set_relief(Gtk::RELIEF_NONE);
+               mouse_mode_buttons.push_back (&mouse_select_button);
+
+               mouse_gain_button.add (*(manage (new Image (::get_icon("tool_gain")))));
+               mouse_gain_button.set_relief(Gtk::RELIEF_NONE);
+               mouse_mode_buttons.push_back (&mouse_gain_button);
+       }
+
        mouse_zoom_button.add (*(manage (new Image (::get_icon("tool_zoom")))));
        mouse_zoom_button.set_relief(Gtk::RELIEF_NONE);
        mouse_mode_buttons.push_back (&mouse_zoom_button);
@@ -2405,9 +2779,13 @@ Editor::setup_toolbar ()
        mode_box->set_spacing(4);
        mouse_mode_button_box.set_spacing(1);
        mouse_mode_button_box.pack_start(mouse_move_button, true, true);
-       mouse_mode_button_box.pack_start(mouse_select_button, true, true);
+       if (!Profile->get_sae()) {
+               mouse_mode_button_box.pack_start(mouse_select_button, true, true);
+       }
        mouse_mode_button_box.pack_start(mouse_zoom_button, true, true);
-       mouse_mode_button_box.pack_start(mouse_gain_button, true, true);
+       if (!Profile->get_sae()) {
+               mouse_mode_button_box.pack_start(mouse_gain_button, true, true);
+       }
        mouse_mode_button_box.pack_start(mouse_timefx_button, true, true);
        mouse_mode_button_box.pack_start(mouse_audition_button, true, true);
        mouse_mode_button_box.pack_start(mouse_note_button, true, true);
@@ -2477,7 +2855,7 @@ Editor::setup_toolbar ()
        /* Zoom */
        
        zoom_box.set_spacing (1);
-       zoom_box.set_border_width (2);
+       zoom_box.set_border_width (0);
 
        zoom_in_button.set_name ("EditorTimeButton");
        zoom_in_button.set_size_request(-1,16);
@@ -2498,7 +2876,7 @@ Editor::setup_toolbar ()
        ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to Session"));
 
        zoom_focus_selector.set_name ("ZoomFocusSelector");
-       Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Center", FUDGE, 0);
+       Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, _("Playhead"), FUDGE, 0);
        set_popdown_strings (zoom_focus_selector, zoom_focus_strings);
        zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
        ARDOUR_UI::instance()->tooltips().set_tip (zoom_focus_selector, _("Zoom focus"));
@@ -2508,26 +2886,31 @@ Editor::setup_toolbar ()
        zoom_box.pack_start (zoom_in_button, false, false);
        zoom_box.pack_start (zoom_out_full_button, false, false);
 
-       /* Edit Cursor / Snap */
-
        snap_box.set_spacing (1);
        snap_box.set_border_width (2);
 
        snap_type_selector.set_name ("SnapTypeSelector");
-       Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10);
+       Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, _("SMPTE Seconds"), 2+FUDGE, 10);
        set_popdown_strings (snap_type_selector, snap_type_strings);
        snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done));
-       ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Unit to snap cursors and ranges to"));
+       ARDOUR_UI::instance()->tooltips().set_tip (snap_type_selector, _("Snap/Grid Units"));
 
        snap_mode_selector.set_name ("SnapModeSelector");
-       Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "Magnetic Snap", 2+FUDGE, 10);
+       Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, _("Magnetic Snap"), 2+FUDGE, 10);
        set_popdown_strings (snap_mode_selector, snap_mode_strings);
        snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
+       ARDOUR_UI::instance()->tooltips().set_tip (snap_mode_selector, _("Snap/Grid Mode"));
 
-       snap_box.pack_start (edit_cursor_clock, false, false);
+       edit_point_selector.set_name ("SnapModeSelector");
+       Gtkmm2ext::set_size_request_to_display_given_text (edit_point_selector, _("Playhead"), 2+FUDGE, 10);
+       set_popdown_strings (edit_point_selector, edit_point_strings);
+       edit_point_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_point_selection_done));
+       ARDOUR_UI::instance()->tooltips().set_tip (edit_point_selector, _("Edit point"));
+
+       snap_box.pack_start (edit_point_clock, false, false);
        snap_box.pack_start (snap_mode_selector, false, false);
        snap_box.pack_start (snap_type_selector, false, false);
-
+       snap_box.pack_start (edit_point_selector, false, false);
 
        /* Nudge */
 
@@ -2545,10 +2928,10 @@ Editor::setup_toolbar ()
 
        /* Pack everything in... */
 
-       HBox* hbox = new HBox;
+       HBox* hbox = manage (new HBox);
        hbox->set_spacing(10);
 
-       tools_tearoff = new TearOff (*hbox);
+       tools_tearoff = manage (new TearOff (*hbox));
        tools_tearoff->set_name ("MouseModeBase");
 
        tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox), 
@@ -2581,6 +2964,90 @@ Editor::setup_toolbar ()
        toolbar_frame.add (toolbar_base);
 }
 
+
+void
+Editor::setup_midi_toolbar ()
+{
+       string pixmap_path;
+
+       /* Mode Buttons (tool selection) */
+
+       vector<ToggleButton *> midi_tool_buttons;
+
+       midi_tool_pencil_button.add (*(manage (new Image (::get_icon("midi_tool_pencil")))));
+       midi_tool_pencil_button.set_relief(Gtk::RELIEF_NONE);
+       midi_tool_buttons.push_back (&midi_tool_pencil_button);
+       midi_tool_select_button.add (*(manage (new Image (::get_icon("midi_tool_select")))));
+       midi_tool_select_button.set_relief(Gtk::RELIEF_NONE);
+       midi_tool_buttons.push_back (&midi_tool_select_button);
+       midi_tool_erase_button.add (*(manage (new Image (::get_icon("midi_tool_erase")))));
+       midi_tool_erase_button.set_relief(Gtk::RELIEF_NONE);
+       midi_tool_buttons.push_back (&midi_tool_erase_button);
+
+       midi_tool_pencil_button.set_active(true);
+       
+       midi_tool_button_set = new GroupedButtons (midi_tool_buttons);
+
+       midi_tool_button_box.set_border_width (2);
+       midi_tool_button_box.set_spacing(4);
+       midi_tool_button_box.set_spacing(1);
+       midi_tool_button_box.pack_start(midi_tool_pencil_button, true, true);
+       midi_tool_button_box.pack_start(midi_tool_select_button, true, true);
+       midi_tool_button_box.pack_start(midi_tool_erase_button, true, true);
+       midi_tool_button_box.set_homogeneous(true);
+
+       midi_tool_pencil_button.set_name ("MouseModeButton");
+       midi_tool_select_button.set_name ("MouseModeButton");
+       midi_tool_erase_button.set_name ("MouseModeButton");
+
+       ARDOUR_UI::instance()->tooltips().set_tip (midi_tool_pencil_button, _("Add/Move/Stretch Notes"));
+       ARDOUR_UI::instance()->tooltips().set_tip (midi_tool_select_button, _("Select/Move Notes"));
+       ARDOUR_UI::instance()->tooltips().set_tip (midi_tool_erase_button, _("Erase Notes"));
+
+       midi_tool_pencil_button.unset_flags (CAN_FOCUS);
+       midi_tool_select_button.unset_flags (CAN_FOCUS);
+       midi_tool_erase_button.unset_flags (CAN_FOCUS);
+       
+       midi_tool_pencil_button.signal_toggled().connect (bind (mem_fun(*this,
+                               &Editor::midi_edit_mode_toggled), Editing::MidiEditPencil));
+       midi_tool_select_button.signal_toggled().connect (bind (mem_fun(*this,
+                               &Editor::midi_edit_mode_toggled), Editing::MidiEditSelect));
+       midi_tool_erase_button.signal_toggled().connect (bind (mem_fun(*this,
+                               &Editor::midi_edit_mode_toggled), Editing::MidiEditErase));
+       
+       /* Pack everything in... */
+
+       midi_tools_tearoff = manage (new TearOff (midi_tool_button_box));
+       midi_tools_tearoff->set_name ("MouseModeBase");
+
+       /*
+       midi_tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&midi_toolbar_hbox), 
+                                            &midi_tools_tearoff->tearoff_window()));
+       midi_tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&midi_toolbar_hbox), 
+                                            &midi_tools_tearoff->tearoff_window(), 0));
+       midi_tools_tearoff->Hidden.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&midi_toolbar_hbox), 
+                                            &midi_tools_tearoff->tearoff_window()));
+       midi_tools_tearoff->Visible.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&midi_toolbar_hbox), 
+                                             &midi_tools_tearoff->tearoff_window(), 0));
+       */
+
+       midi_toolbar_hbox.set_spacing (10);
+       midi_toolbar_hbox.set_border_width (1);
+
+       midi_toolbar_hbox.pack_start (*midi_tools_tearoff, false, true);
+
+       midi_tool_button_box.show_all ();
+       midi_toolbar_hbox.show_all();
+       midi_tools_tearoff->show_all();
+       
+       midi_toolbar_base.set_name ("ToolBarBase");
+       midi_toolbar_base.add (midi_toolbar_hbox);
+
+       midi_toolbar_frame.set_shadow_type (SHADOW_OUT);
+       midi_toolbar_frame.set_name ("BaseFrame");
+       midi_toolbar_frame.add (midi_toolbar_base);
+}
+
 int
 Editor::convert_drop_to_paths (vector<ustring>& paths, 
                               const RefPtr<Gdk::DragContext>& context,
@@ -2598,7 +3065,7 @@ Editor::convert_drop_to_paths (vector<ustring>& paths,
        vector<ustring> uris = data.get_uris();
 
        if (uris.empty()) {
-               
+
                /* This is seriously fucked up. Nautilus doesn't say that its URI lists
                   are actually URI lists. So do it by hand.
                */
@@ -2648,10 +3115,34 @@ Editor::convert_drop_to_paths (vector<ustring>& paths,
        }
        
        for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
+
                if ((*i).substr (0,7) == "file://") {
-                       string p = *i;
+                       
+                       ustring p = *i;
                         PBD::url_decode (p);
-                       paths.push_back (p.substr (7));
+
+                       // scan forward past three slashes
+                       
+                       ustring::size_type slashcnt = 0;
+                       ustring::size_type n = 0;
+                       ustring::iterator x = p.begin();
+
+                       while (slashcnt < 3 && x != p.end()) {
+                               if ((*x) == '/') {
+                                       slashcnt++;
+                               } else if (slashcnt == 3) {
+                                       break;
+                               }
+                               ++n;
+                               ++x;
+                       }
+
+                       if (slashcnt != 3 || x == p.end()) {
+                               error << _("malformed URL passed to drag-n-drop code") << endmsg;
+                               continue;
+                       }
+
+                       paths.push_back (p.substr (n - 1));
                }
        }
 
@@ -2678,9 +3169,9 @@ Editor::map_transport_state ()
 
 /* UNDO/REDO */
 
-Editor::State::State ()
+Editor::State::State (PublicEditor const * e)
 {
-       selection = new Selection;
+       selection = new Selection (e);
 }
 
 Editor::State::~State ()
@@ -2691,7 +3182,7 @@ Editor::State::~State ()
 UndoAction
 Editor::get_memento () const
 {
-       State *state = new State;
+       State *state = new State (this);
 
        store_state (*state);
        return bind (mem_fun (*(const_cast<Editor*>(this)), &Editor::restore_state), state);
@@ -2783,50 +3274,67 @@ Editor::history_changed ()
 }
 
 void
-Editor::duplicate_dialog (bool dup_region)
+Editor::duplicate_dialog (bool with_dialog)
 {
-       if (selection->regions.empty() && (selection->time.length() == 0)) {
-               return;
-       }
-
-       ArdourDialog win ("duplicate dialog");
-       Label  label (_("Duplicate how many times?"));
-       Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
-       SpinButton spinner (adjustment);
-
-       win.get_vbox()->set_spacing (12);
-       win.get_vbox()->pack_start (label);
-
-       /* dialogs have ::add_action_widget() but that puts the spinner in the wrong
-          place, visually. so do this by hand.
-       */
+       float times = 1.0f;
 
-       win.get_vbox()->pack_start (spinner);
-       spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT));
+       if (mouse_mode == MouseRange) {
+               if (selection->time.length() == 0) {
+                       return;
+               }
+       }
 
-       label.show ();
-       spinner.show ();
+       
+       if (mouse_mode != MouseRange) {
 
-       win.add_button (Stock::OK, RESPONSE_ACCEPT);
-       win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
+               ensure_entered_region_selected (true);
 
-       win.set_position (WIN_POS_MOUSE);
+               if (selection->regions.empty()) {
+                       return;
+               }
+       }
 
-       spinner.grab_focus ();
+       if (with_dialog) {
 
-       switch (win.run ()) {
-       case RESPONSE_ACCEPT:
-               break;
-       default:
-               return;
+               ArdourDialog win ("duplicate dialog");
+               Label  label (_("Duplicate how many times?"));
+               Adjustment adjustment (1.0, 1.0, 1000000.0, 1.0, 5.0);
+               SpinButton spinner (adjustment);
+               
+               win.get_vbox()->set_spacing (12);
+               win.get_vbox()->pack_start (label);
+               
+               /* dialogs have ::add_action_widget() but that puts the spinner in the wrong
+                  place, visually. so do this by hand.
+               */
+               
+               win.get_vbox()->pack_start (spinner);
+               spinner.signal_activate().connect (sigc::bind (mem_fun (win, &ArdourDialog::response), RESPONSE_ACCEPT));
+               
+               label.show ();
+               spinner.show ();
+               
+               win.add_button (Stock::OK, RESPONSE_ACCEPT);
+               win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
+               
+               win.set_position (WIN_POS_MOUSE);
+               
+               spinner.grab_focus ();
+               
+               switch (win.run ()) {
+               case RESPONSE_ACCEPT:
+                       break;
+               default:
+                       return;
+               }
+               
+               times = adjustment.get_value();
        }
 
-       float times = adjustment.get_value();
-
-       if (!selection->regions.empty()) {
-               duplicate_some_regions (selection->regions, times);
-       } else {
+       if (mouse_mode == MouseRange) {
                duplicate_selection (times);
+       } else {
+               duplicate_some_regions (selection->regions, times);
        }
 }
 
@@ -2862,6 +3370,25 @@ Editor::set_verbose_canvas_cursor_text (const string & txt)
        verbose_canvas_cursor->property_text() = txt.c_str();
 }
 
+void
+Editor::set_edit_mode (EditMode m)
+{
+       Config->set_edit_mode (m);
+}
+
+void
+Editor::cycle_edit_mode ()
+{
+       switch (Config->get_edit_mode()) {
+       case Slide:
+               Config->set_edit_mode (Splice);
+               break;
+       case Splice:
+               Config->set_edit_mode (Slide);
+               break;
+       }
+}
+
 void
 Editor::edit_mode_selection_done ()
 {
@@ -2885,7 +3412,7 @@ void
 Editor::snap_type_selection_done ()
 {
        string choice = snap_type_selector.get_active_text();
-       SnapType snaptype = SnapToFrame;
+       SnapType snaptype = SnapToBeat;
 
        if (choice == _("Beats/3")) {
                snaptype = SnapToAThirdBeat;
@@ -2903,8 +3430,6 @@ Editor::snap_type_selection_done ()
                snaptype = SnapToBar;
        } else if (choice == _("Marks")) {
                snaptype = SnapToMark;
-       } else if (choice == _("Edit Cursor")) {
-               snaptype = SnapToEditCursor;
        } else if (choice == _("Region starts")) {
                snaptype = SnapToRegionStart;
        } else if (choice == _("Region ends")) {
@@ -2925,8 +3450,6 @@ Editor::snap_type_selection_done ()
                snaptype = SnapToSeconds;
        } else if (choice == _("Minutes")) {
                snaptype = SnapToMinutes;
-       } else if (choice == _("None")) {
-               snaptype = SnapToFrame;
        }
 
        RefPtr<RadioAction> ract = snap_type_action (snaptype);
@@ -2941,7 +3464,9 @@ Editor::snap_mode_selection_done ()
        string choice = snap_mode_selector.get_active_text();
        SnapMode mode = SnapNormal;
 
-       if (choice == _("Normal")) {
+       if (choice == _("No Grid")) {
+               mode = SnapOff;
+       } else if (choice == _("Grid")) {
                mode = SnapNormal;
        } else if (choice == _("Magnetic")) {
                mode = SnapMagnetic;
@@ -2954,6 +3479,47 @@ Editor::snap_mode_selection_done ()
        }
 }
 
+void
+Editor::cycle_edit_point (bool with_marker)
+{
+       switch (_edit_point) {
+       case EditAtMouse:
+               set_edit_point_preference (EditAtPlayhead);
+               break;
+       case EditAtPlayhead:
+               if (with_marker) {
+                       set_edit_point_preference (EditAtSelectedMarker);
+               } else {
+                       set_edit_point_preference (EditAtMouse);
+               }
+               break;
+       case EditAtSelectedMarker:
+               set_edit_point_preference (EditAtMouse);
+               break;
+       }
+}
+
+void
+Editor::edit_point_selection_done ()
+{
+       string choice = edit_point_selector.get_active_text();
+       EditPoint ep = EditAtSelectedMarker;
+
+       if (choice == _("Marker")) {
+               set_edit_point_preference (EditAtSelectedMarker);
+       } else if (choice == _("Playhead")) {
+               set_edit_point_preference (EditAtPlayhead);
+       } else {
+               set_edit_point_preference (EditAtMouse);
+       }
+
+       RefPtr<RadioAction> ract = edit_point_action (ep);
+
+       if (ract) {
+               ract->set_active (true);
+       }
+}
+
 void
 Editor::zoom_focus_selection_done ()
 {
@@ -2970,6 +3536,10 @@ Editor::zoom_focus_selection_done ()
                focus_type = ZoomFocusPlayhead;
        } else if (choice == _("Edit")) {
                focus_type = ZoomFocusEdit;
+       } else if (choice == _("Edit Point")) {
+               focus_type = ZoomFocusEdit;
+       } else {
+               focus_type = ZoomFocusMouse;
        } 
        
        RefPtr<RadioAction> ract = zoom_focus_action (focus_type);
@@ -3440,16 +4010,21 @@ Editor::redisplay_snapshots ()
                return;
        }
 
-       vector<string*>* states;
+       vector<sys::path> state_file_paths;
 
-       if ((states = session->possible_states()) == 0) {
-               return;
-       }
+       get_state_files_in_directory (session->session_directory().root_path(),
+                       state_file_paths);
+
+       if (state_file_paths.empty()) return;
+
+       vector<string> state_file_names(get_file_names_no_extension(state_file_paths));
 
        snapshot_display_model->clear ();
 
-       for (vector<string*>::iterator i = states->begin(); i != states->end(); ++i) {
-               string statename = *(*i);
+       for (vector<string>::iterator i = state_file_names.begin();
+                       i != state_file_names.end(); ++i)
+       {
+               string statename = (*i);
                TreeModel::Row row = *(snapshot_display_model->append());
                
                /* this lingers on in case we ever want to change the visible
@@ -3466,8 +4041,6 @@ Editor::redisplay_snapshots ()
                row[snapshot_display_columns.visible_name] = display_name;
                row[snapshot_display_columns.real_name] = statename;
        }
-
-       delete states;
 }
 
 void
@@ -3524,27 +4097,45 @@ Editor::restore_editing_space ()
        );
 }
 
+/**
+ *  Make new playlists for a given track and also any others that belong
+ *  to the same active edit group.
+ *  @param v Track.
+ */
+
 void 
-Editor::new_playlists ()
+Editor::new_playlists (TimeAxisView* v)
 {
        begin_reversible_command (_("new playlists"));
-       mapover_tracks (mem_fun (*this, &Editor::mapped_use_new_playlist));
+       mapover_tracks (mem_fun (*this, &Editor::mapped_use_new_playlist), v);
        commit_reversible_command ();
 }
 
+/**
+ *  Use a copy of the current playlist for a given track and also any others that belong
+ *  to the same active edit group.
+ *  @param v Track.
+ */
+
 void
-Editor::copy_playlists ()
+Editor::copy_playlists (TimeAxisView* v)
 {
        begin_reversible_command (_("copy playlists"));
-       mapover_tracks (mem_fun (*this, &Editor::mapped_use_copy_playlist));
+       mapover_tracks (mem_fun (*this, &Editor::mapped_use_copy_playlist), v);
        commit_reversible_command ();
 }
 
+/**
+ *  Clear the current playlist for a given track and also any others that belong
+ *  to the same active edit group.
+ *  @param v Track.
+ */
+
 void 
-Editor::clear_playlists ()
+Editor::clear_playlists (TimeAxisView* v)
 {
        begin_reversible_command (_("clear playlists"));
-       mapover_tracks (mem_fun (*this, &Editor::mapped_clear_playlist));
+       mapover_tracks (mem_fun (*this, &Editor::mapped_clear_playlist), v);
        commit_reversible_command ();
 }
 
@@ -3572,6 +4163,13 @@ Editor::on_key_press_event (GdkEventKey* ev)
        return key_press_focus_accelerator_handler (*this, ev);
 }
 
+bool
+Editor::on_key_release_event (GdkEventKey* ev)
+{
+       return Gtk::Window::on_key_release_event (ev);
+       // return key_press_focus_accelerator_handler (*this, ev);
+}
+
 void
 Editor::reset_x_origin (nframes_t frame)
 {
@@ -3592,10 +4190,26 @@ Editor::reposition_and_zoom (nframes_t frame, double fpu)
 }
 
 void
-Editor::set_frames_per_unit (double fpu)
+Editor::swap_visual_state ()
 {
-       nframes_t frames;
+       if (last_visual_state.frames_per_unit == 0) {
+               // never set
+               return;
+       }
+
+       /* note: the correct functionality here is very dependent on the ordering of 
+          setting zoom focus, horizontal position and finally zoom. this is because
+          it is set_frames_per_unit() that overwrites last_visual_state.
+       */
+
+       set_zoom_focus (last_visual_state.zoom_focus);
+       reposition_and_zoom (last_visual_state.leftmost_frame, last_visual_state.frames_per_unit);
+       zoomed_to_region = false;
+}
 
+void
+Editor::set_frames_per_unit (double fpu)
+{
        /* this is the core function that controls the zoom level of the canvas. it is called
           whenever one or more calls are made to reset_zoom(). it executes in an idle handler.
        */
@@ -3608,9 +4222,6 @@ Editor::set_frames_per_unit (double fpu)
                fpu = 2.0;
        }
 
-       // convert fpu to frame count
-
-       frames = (nframes_t) floor (fpu * canvas_width);
        
        /* don't allow zooms that fit more than the maximum number
           of frames into an 800 pixel wide space.
@@ -3623,10 +4234,23 @@ Editor::set_frames_per_unit (double fpu)
        if (fpu == frames_per_unit) {
                return;
        }
+       
+       last_visual_state.frames_per_unit = frames_per_unit;
+       last_visual_state.leftmost_frame = leftmost_frame;
+       last_visual_state.zoom_focus = zoom_focus;
 
        frames_per_unit = fpu;
+       post_zoom ();
+}
 
-       if (frames != zoom_range_clock.current_duration()) {
+void
+Editor::post_zoom ()
+{
+       // convert fpu to frame count
+
+       nframes_t frames = (nframes_t) floor (frames_per_unit * canvas_width);
+
+       if (frames_per_unit != zoom_range_clock.current_duration()) {
                zoom_range_clock.set (frames);
        }
 
@@ -3646,8 +4270,7 @@ Editor::set_frames_per_unit (double fpu)
 
        reset_hscrollbar_stepping ();
        reset_scrolling_region ();
-       
-       if (edit_cursor) edit_cursor->set_position (edit_cursor->current_frame);
+
        if (playhead_cursor) playhead_cursor->set_position (playhead_cursor->current_frame);
 
        instant_save ();
@@ -3658,7 +4281,7 @@ Editor::queue_visual_change (nframes_t where)
 {
        pending_visual_change.pending = VisualChange::Type (pending_visual_change.pending | VisualChange::TimeOrigin);
        pending_visual_change.time_origin = where;
-
+       
        if (pending_visual_change.idle_handler_id < 0) {
                pending_visual_change.idle_handler_id = g_idle_add (_idle_visual_changer, this);
        }
@@ -3671,8 +4294,9 @@ Editor::queue_visual_change (double fpu)
        pending_visual_change.frames_per_unit = fpu;
 
        if (pending_visual_change.idle_handler_id < 0) {
-               pending_visual_change.idle_handler_id = g_idle_add_full (G_PRIORITY_HIGH_IDLE, _idle_visual_changer, this, 0);
+               pending_visual_change.idle_handler_id = g_idle_add ( _idle_visual_changer, this);
        }
+       
 }
 
 int
@@ -3687,21 +4311,27 @@ Editor::idle_visual_changer ()
        VisualChange::Type p = pending_visual_change.pending;
 
        pending_visual_change.pending = (VisualChange::Type) 0;
-       pending_visual_change.idle_handler_id = -1;
-       
+
        if (p & VisualChange::ZoomLevel) {
                set_frames_per_unit (pending_visual_change.frames_per_unit);
-       }
 
+               compute_fixed_ruler_scale ();
+               compute_current_bbt_points(pending_visual_change.time_origin, pending_visual_change.time_origin + (nframes_t)(canvas_width * pending_visual_change.frames_per_unit));
+               compute_bbt_ruler_scale (pending_visual_change.time_origin, pending_visual_change.time_origin + (nframes_t)(canvas_width * pending_visual_change.frames_per_unit));
+               update_tempo_based_rulers ();
+       }
        if (p & VisualChange::TimeOrigin) {
-               if (pending_visual_change.time_origin != leftmost_frame) {
+               
+               nframes_t time_origin = (nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
+
+               if (time_origin != pending_visual_change.time_origin) {
                        horizontal_adjustment.set_value (pending_visual_change.time_origin/frames_per_unit);
-                       /* the signal handler will do the rest */
                } else {
                        update_fixed_rulers();
                        redisplay_tempo (true);
                }
        }
+       pending_visual_change.idle_handler_id = -1;
 
        return 0; /* this is always a one-shot call */
 }
@@ -3713,19 +4343,246 @@ struct EditorOrderTimeAxisSorter {
 };
        
 void
-Editor::sort_track_selection ()
+Editor::sort_track_selection (TrackSelection* sel)
 {
        EditorOrderTimeAxisSorter cmp;
-       selection->tracks.sort (cmp);
+
+       if (sel) {
+               sel->sort (cmp);
+       } else {
+               selection->tracks.sort (cmp);
+       }
 }
 
-nframes_t
-Editor::edit_cursor_position(bool sync)
+nframes64_t
+Editor::get_preferred_edit_position (bool ignore_playhead)
+{
+       bool ignored;
+       nframes64_t where = 0;
+       EditPoint ep = _edit_point;
+
+       if (entered_marker) {
+               return entered_marker->position();
+       }
+
+       if (ignore_playhead && ep == EditAtPlayhead) {
+               ep = EditAtSelectedMarker;
+       }
+
+       switch (ep) {
+       case EditAtPlayhead:
+               where = session->audible_frame();
+               break;
+               
+       case EditAtSelectedMarker:
+               if (!selection->markers.empty()) {
+                       bool is_start;
+                       Location* loc = find_location_from_marker (selection->markers.front(), is_start);
+                       if (loc) {
+                               if (is_start) {
+                                       where =  loc->start();
+                               } else {
+                                       where = loc->end();
+                               }
+                               break;
+                       }
+               } 
+               /* fallthru */
+               
+       default:
+       case EditAtMouse:
+               if (!mouse_frame (where, ignored)) {
+                       /* XXX not right but what can we do ? */
+                       return 0;
+               }
+               snap_to (where);
+               break;
+       }
+
+       return where;
+}
+
+void
+Editor::set_loop_range (nframes_t start, nframes_t end, string cmd)
+{
+       if (!session) return;
+
+       begin_reversible_command (cmd);
+       
+       Location* tll;
+
+       if ((tll = transport_loop_location()) == 0) {
+               Location* loc = new Location (start, end, _("Loop"),  Location::IsAutoLoop);
+                XMLNode &before = session->locations()->get_state();
+               session->locations()->add (loc, true);
+               session->set_auto_loop_location (loc);
+                XMLNode &after = session->locations()->get_state();
+               session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+       }
+       else {
+                XMLNode &before = tll->get_state();
+               tll->set_hidden (false, this);
+               tll->set (start, end);
+                XMLNode &after = tll->get_state();
+                session->add_command (new MementoCommand<Location>(*tll, &before, &after));
+       }
+       
+       commit_reversible_command ();
+}
+
+void
+Editor::set_punch_range (nframes_t start, nframes_t end, string cmd)
+{
+       if (!session) return;
+
+       begin_reversible_command (cmd);
+       
+       Location* tpl;
+
+       if ((tpl = transport_punch_location()) == 0) {
+               Location* loc = new Location (start, end, _("Loop"),  Location::IsAutoPunch);
+                XMLNode &before = session->locations()->get_state();
+               session->locations()->add (loc, true);
+               session->set_auto_loop_location (loc);
+                XMLNode &after = session->locations()->get_state();
+               session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+       }
+       else {
+                XMLNode &before = tpl->get_state();
+               tpl->set_hidden (false, this);
+               tpl->set (start, end);
+                XMLNode &after = tpl->get_state();
+                session->add_command (new MementoCommand<Location>(*tpl, &before, &after));
+       }
+       
+       commit_reversible_command ();
+}
+
+RegionSelection
+Editor::get_regions_at (nframes64_t where, const TrackSelection& ts) const
+{
+       RegionSelection rs;
+       const TrackSelection* tracks;
+
+       if (ts.empty()) {
+               tracks = &track_views;
+       } else {
+               tracks = &ts;
+       }
+
+       for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
+       
+               AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*t);
+
+               if (atv) {
+                       boost::shared_ptr<Diskstream> ds;
+                       boost::shared_ptr<Playlist> pl;
+                       
+                       if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
+
+                               Playlist::RegionList* regions = pl->regions_at ((nframes_t) floor ( (double)where * ds->speed()));
+
+                               for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+
+                                       RegionView* rv = atv->audio_view()->find_view (*i);
+
+                                       if (rv) {
+                                               rs.push_back (rv);
+                                       }
+                               }
+
+                               delete regions;
+                       }
+               }
+       }
+
+       return rs;
+}
+
+
+RegionSelection
+Editor::get_regions_after (nframes64_t where, const TrackSelection& ts) const
 {
-       if (sync && edit_cursor->current_frame != edit_cursor_clock.current_time()) {
-               edit_cursor_clock.set(edit_cursor->current_frame, true);
+       RegionSelection rs;
+       const TrackSelection* tracks;
+
+       if (ts.empty()) {
+               tracks = &track_views;
+       } else {
+               tracks = &ts;
        }
 
-       return edit_cursor->current_frame;
+       for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) {
+       
+               AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*t);
+
+               if (atv) {
+                       boost::shared_ptr<Diskstream> ds;
+                       boost::shared_ptr<Playlist> pl;
+                       
+                       if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) {
+
+                               Playlist::RegionList* regions = pl->regions_touched ((nframes_t) floor ( (double)where * ds->speed()), max_frames);
+
+                               for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) {
+
+                                       RegionView* rv = atv->audio_view()->find_view (*i);
+
+                                       if (rv) {
+                                               rs.push_back (rv);
+                                       }
+                               }
+
+                               delete regions;
+                       }
+               }
+       }
+
+       return rs;
+}
+
+RegionSelection&
+Editor::get_regions_for_action ()
+{
+       if (!selection->regions.empty()) {
+               return selection->regions;
+       } 
+
+       nframes64_t where = get_preferred_edit_position();
+       tmp_regions = get_regions_at (where, selection->tracks);
+       return tmp_regions;
 }
 
+void
+Editor::get_regions_corresponding_to (boost::shared_ptr<Region> region, vector<RegionView*>& regions)
+{
+
+       for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+               
+               RouteTimeAxisView* tatv;
+               
+               if ((tatv = dynamic_cast<RouteTimeAxisView*> (*i)) != 0) {
+                       
+                       boost::shared_ptr<Playlist> pl;
+                       vector<boost::shared_ptr<Region> > results;
+                       RegionView* marv;
+                       boost::shared_ptr<Diskstream> ds;
+                       
+                       if ((ds = tatv->get_diskstream()) == 0) {
+                               /* bus */
+                               continue;
+                       }
+                       
+                       if ((pl = (ds->playlist())) != 0) {
+                               pl->get_region_list_equivalent_regions (region, results);
+                       }
+                       
+                       for (vector<boost::shared_ptr<Region> >::iterator ir = results.begin(); ir != results.end(); ++ir) {
+                               if ((marv = tatv->view()->find_view (*ir)) != 0) {
+                                       regions.push_back (marv);
+                               }
+                       }
+                       
+               }
+       }
+}