X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=2eb3987b8915fe75f8c6765e4ad58844dc3c9173;hb=5b520324ceab2559723b4ef5127301fa61ff4846;hp=0570a436481891c2deb17a11939a44aa31a94c95;hpb=a3f7f86d9b8cee4183e9da6c2f8f6cfd4ee26969;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 0570a43648..2eb3987b89 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2004 Paul Davis + Copyright (C) 2000-2004 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,10 +32,10 @@ #include "pbd/pthread_utils.h" #include "pbd/memento_command.h" #include "pbd/whitespace.h" +#include "pbd/stateful_diff_command.h" #include #include -#include #include #include "ardour/audioengine.h" @@ -45,7 +45,6 @@ #include "ardour/audio_diskstream.h" #include "ardour/utils.h" #include "ardour/location.h" -#include "ardour/named_selection.h" #include "ardour/audio_track.h" #include "ardour/audioplaylist.h" #include "ardour/region_factory.h" @@ -79,16 +78,18 @@ #include "strip_silence_dialog.h" #include "editor_routes.h" #include "editor_regions.h" +#include "quantize_dialog.h" +#include "interthread_progress_window.h" #include "i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace Editing; +using Gtkmm2ext::Keyboard; /*********************************************************************** Editor operations @@ -97,28 +98,19 @@ using namespace Editing; void Editor::undo (uint32_t n) { - if (session) { - session->undo (n); + if (_session) { + _session->undo (n); } } void Editor::redo (uint32_t n) { - if (session) { - session->redo (n); + if (_session) { + _session->redo (n); } } -void -Editor::split_region () -{ - RegionSelection rs; - - get_regions_for_action (rs, true); - split_regions_at (get_preferred_edit_position (), selection->regions); -} - void Editor::split_regions_at (nframes64_t where, RegionSelection& regions) { @@ -134,7 +126,7 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions) // region boundaries, don't pay attention to them if (regions.size() == 1) { - switch (snap_type) { + switch (_snap_type) { case SnapToRegionStart: case SnapToRegionSync: case SnapToRegionEnd: @@ -153,7 +145,7 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions) /* XXX this test needs to be more complicated, to make sure we really have something to split. */ - + if (!(*a)->region()->covers (where)) { ++a; continue; @@ -164,24 +156,23 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions) boost::shared_ptr pl = (*a)->region()->playlist(); - if (! pl->frozen()) { + if (!pl) { + a = tmp; + continue; + } + + if (!pl->frozen()) { /* we haven't seen this playlist before */ - /* remember used playlists so we can thaw them later */ + /* remember used playlists so we can thaw them later */ used_playlists.push_back(pl); pl->freeze(); } - AudioRegionView* const arv = dynamic_cast(*a); - if (arv) { - _new_regionviews_show_envelope = arv->envelope_visible(); - } - if (pl) { - XMLNode &before = pl->get_state(); + pl->clear_history (); pl->split_region ((*a)->region(), where); - XMLNode &after = pl->get_state(); - session->add_command(new MementoCommand(*pl, &before, &after)); + _session->add_command (new StatefulDiffCommand (pl)); } a = tmp; @@ -192,27 +183,26 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions) (*i)->thaw(); used_playlists.pop_front(); } - + commit_reversible_command (); - _new_regionviews_show_envelope = false; } boost::shared_ptr -Editor::select_region_for_operation (int dir, TimeAxisView **tv) +Editor::select_region_for_operation (int /*dir*/, TimeAxisView **tv) { RegionView* rv; boost::shared_ptr region; nframes64_t start = 0; if (selection->time.start () == selection->time.end_frame ()) { - + /* no current selection-> is there a selected regionview? */ if (selection->regions.empty()) { return region; } - } + } if (!selection->regions.empty()) { @@ -228,18 +218,18 @@ Editor::select_region_for_operation (int dir, TimeAxisView **tv) if ((rtv = dynamic_cast (*tv)) != 0) { boost::shared_ptr pl; - + if ((pl = rtv->playlist()) == 0) { return region; } - + region = pl->top_region_at (start); } - } - + } + return region; } - + void Editor::extend_selection_to_end_of_region (bool next) { @@ -257,14 +247,8 @@ Editor::extend_selection_to_end_of_region (bool next) start = selection->time.start (); } - /* Try to leave the selection with the same route if possible */ - - if ((tv = selection->time.track) == 0) { - return; - } - begin_reversible_command (_("extend selection")); - selection->set (tv, start, region->position() + region->length()); + selection->set (start, region->position() + region->length()); commit_reversible_command (); } @@ -286,13 +270,9 @@ Editor::extend_selection_to_start_of_region (bool previous) } /* Try to leave the selection with the same route if possible */ - - if ((tv = selection->time.track) == 0) { - return; - } begin_reversible_command (_("extend selection")); - selection->set (tv, region->position(), end); + selection->set (region->position(), end); commit_reversible_command (); } @@ -324,48 +304,47 @@ Editor::nudge_forward (bool next, bool force_playhead) { nframes64_t distance; nframes64_t next_distance; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - if (!session) return; - + if (!_session) return; + if (!force_playhead && !rs.empty()) { begin_reversible_command (_("nudge regions forward")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { boost::shared_ptr r ((*i)->region()); - + distance = get_nudge_distance (r->position(), next_distance); if (next) { distance = next_distance; } - XMLNode &before = r->playlist()->get_state(); + r->clear_history (); r->set_position (r->position() + distance, this); - XMLNode &after = r->playlist()->get_state(); - session->add_command (new MementoCommand(*(r->playlist()), &before, &after)); + _session->add_command (new StatefulDiffCommand (r)); } commit_reversible_command (); - + } else if (!force_playhead && !selection->markers.empty()) { bool is_start; begin_reversible_command (_("nudge location forward")); - + for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) { - + Location* loc = find_location_from_marker ((*i), is_start); - + if (loc) { - + XMLNode& before (loc->get_state()); - + if (is_start) { distance = get_nudge_distance (loc->start(), next_distance); if (next) { @@ -388,29 +367,29 @@ Editor::nudge_forward (bool next, bool force_playhead) } } XMLNode& after (loc->get_state()); - session->add_command (new MementoCommand(*loc, &before, &after)); + _session->add_command (new MementoCommand(*loc, &before, &after)); } } - + commit_reversible_command (); - + } else { distance = get_nudge_distance (playhead_cursor->current_frame, next_distance); - session->request_locate (playhead_cursor->current_frame + distance); + _session->request_locate (playhead_cursor->current_frame + distance); } } - + void Editor::nudge_backward (bool next, bool force_playhead) { nframes64_t distance; nframes64_t next_distance; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - if (!session) return; - + if (!_session) return; + if (!force_playhead && !rs.empty()) { begin_reversible_command (_("nudge regions backward")); @@ -419,20 +398,19 @@ Editor::nudge_backward (bool next, bool force_playhead) boost::shared_ptr r ((*i)->region()); distance = get_nudge_distance (r->position(), next_distance); - + if (next) { distance = next_distance; } + + r->clear_history (); - XMLNode &before = r->playlist()->get_state(); - if (r->position() > distance) { r->set_position (r->position() - distance, this); } else { r->set_position (0, this); } - XMLNode &after = r->playlist()->get_state(); - session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); + _session->add_command (new StatefulDiffCommand (r)); } commit_reversible_command (); @@ -446,11 +424,11 @@ Editor::nudge_backward (bool next, bool force_playhead) for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) { Location* loc = find_location_from_marker ((*i), is_start); - + if (loc) { - + XMLNode& before (loc->get_state()); - + if (is_start) { distance = get_nudge_distance (loc->start(), next_distance); if (next) { @@ -463,33 +441,33 @@ Editor::nudge_backward (bool next, bool force_playhead) } } else { distance = get_nudge_distance (loc->end(), next_distance); - + if (next) { distance = next_distance; } - + if (distance < loc->end() - loc->length()) { loc->set_end (loc->end() - distance); } else { loc->set_end (loc->length()); } } - + XMLNode& after (loc->get_state()); - session->add_command (new MementoCommand(*loc, &before, &after)); + _session->add_command (new MementoCommand(*loc, &before, &after)); } } commit_reversible_command (); - + } else { distance = get_nudge_distance (playhead_cursor->current_frame, next_distance); if (playhead_cursor->current_frame > distance) { - session->request_locate (playhead_cursor->current_frame - distance); + _session->request_locate (playhead_cursor->current_frame - distance); } else { - session->goto_start(); + _session->goto_start(); } } } @@ -498,60 +476,58 @@ void Editor::nudge_forward_capture_offset () { nframes64_t distance; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - if (!session) return; - + if (!_session) return; + if (!rs.empty()) { begin_reversible_command (_("nudge forward")); - distance = session->worst_output_latency(); + distance = _session->worst_output_latency(); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { boost::shared_ptr r ((*i)->region()); - - XMLNode &before = r->playlist()->get_state(); + + r->clear_history (); r->set_position (r->position() + distance, this); - XMLNode &after = r->playlist()->get_state(); - session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); + _session->add_command(new StatefulDiffCommand (r)); } commit_reversible_command (); - } + } } - + void Editor::nudge_backward_capture_offset () { nframes64_t distance; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - if (!session) return; - + if (!_session) return; + if (!rs.empty()) { begin_reversible_command (_("nudge forward")); - distance = session->worst_output_latency(); + distance = _session->worst_output_latency(); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { boost::shared_ptr r ((*i)->region()); - XMLNode &before = r->playlist()->get_state(); - + r->clear_history (); + if (r->position() > distance) { r->set_position (r->position() - distance, this); } else { r->set_position (0, this); } - XMLNode &after = r->playlist()->get_state(); - session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); + _session->add_command(new StatefulDiffCommand (r)); } commit_reversible_command (); @@ -563,20 +539,20 @@ Editor::nudge_backward_capture_offset () void Editor::move_to_start () { - session->goto_start (); + _session->goto_start (); } void Editor::move_to_end () { - session->request_locate (session->current_end_frame()); + _session->request_locate (_session->current_end_frame()); } void Editor::build_region_boundary_cache () { - nframes64_t pos = 0; + framepos_t pos = 0; vector interesting_points; boost::shared_ptr r; TrackViewList tracks; @@ -584,30 +560,30 @@ Editor::build_region_boundary_cache () region_boundary_cache.clear (); - if (session == 0) { + if (_session == 0) { return; } - - switch (snap_type) { + + switch (_snap_type) { case SnapToRegionStart: interesting_points.push_back (Start); break; case SnapToRegionEnd: interesting_points.push_back (End); - break; + break; case SnapToRegionSync: interesting_points.push_back (SyncPoint); - break; + break; case SnapToRegionBoundary: interesting_points.push_back (Start); interesting_points.push_back (End); - break; + break; default: - fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), snap_type) << endmsg; + fatal << string_compose (_("build_region_boundary_cache called with snap_type = %1"), _snap_type) << endmsg; /*NOTREACHED*/ return; } - + TimeAxisView *ontrack = 0; TrackViewList tlist; @@ -617,10 +593,10 @@ Editor::build_region_boundary_cache () tlist = track_views; } - while (pos < session->current_end_frame() && !at_end) { + while (pos < _session->current_end_frame() && !at_end) { - nframes64_t rpos; - nframes64_t lpos = max_frames; + framepos_t rpos; + framepos_t lpos = max_frames; for (vector::iterator p = interesting_points.begin(); p != interesting_points.end(); ++p) { @@ -639,7 +615,7 @@ Editor::build_region_boundary_cache () case End: rpos = r->last_frame(); - break; + break; case SyncPoint: rpos = r->sync_position (); @@ -649,16 +625,16 @@ Editor::build_region_boundary_cache () default: break; } - + float speed = 1.0f; RouteTimeAxisView *rtav; - + if (ontrack != 0 && (rtav = dynamic_cast(ontrack)) != 0 ) { - if (rtav->get_diskstream() != 0) { - speed = rtav->get_diskstream()->speed(); + if (rtav->track() != 0) { + speed = rtav->track()->speed(); } } - + rpos = track_frame_to_session_frame (rpos, speed); if (rpos < lpos) { @@ -669,8 +645,8 @@ Editor::build_region_boundary_cache () to sort later. */ - vector::iterator ri; - + vector::iterator ri; + for (ri = region_boundary_cache.begin(); ri != region_boundary_cache.end(); ++ri) { if (*ri == rpos) { break; @@ -688,29 +664,35 @@ Editor::build_region_boundary_cache () /* finally sort to be sure that the order is correct */ sort (region_boundary_cache.begin(), region_boundary_cache.end()); + + cerr << "RBC contains " << region_boundary_cache.size() << endl; + + for (vector::iterator x = region_boundary_cache.begin(); x != region_boundary_cache.end(); ++x) { + cerr << "Region boundary @ " << *x << endl; + } } boost::shared_ptr -Editor::find_next_region (nframes64_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack) +Editor::find_next_region (framepos_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack) { TrackViewList::iterator i; nframes64_t closest = max_frames; boost::shared_ptr ret; - nframes64_t rpos = 0; + framepos_t rpos = 0; float track_speed; - nframes64_t track_frame; + framepos_t track_frame; RouteTimeAxisView *rtav; for (i = tracks.begin(); i != tracks.end(); ++i) { - nframes64_t distance; + framecnt_t distance; boost::shared_ptr r; - + track_speed = 1.0f; if ( (rtav = dynamic_cast(*i)) != 0 ) { - if (rtav->get_diskstream()!=0) - track_speed = rtav->get_diskstream()->speed(); + if (rtav->track()!=0) + track_speed = rtav->track()->speed(); } track_frame = session_frame_to_track_frame(frame, track_speed); @@ -734,7 +716,7 @@ Editor::find_next_region (nframes64_t frame, RegionPoint point, int32_t dir, Tra break; } - // rpos is a "track frame", converting it to "session frame" + // rpos is a "track frame", converting it to "_session frame" rpos = track_frame_to_session_frame(rpos, track_speed); if (rpos > frame) { @@ -754,17 +736,16 @@ Editor::find_next_region (nframes64_t frame, RegionPoint point, int32_t dir, Tra return ret; } -nframes64_t -Editor::find_next_region_boundary (nframes64_t pos, int32_t dir, const TrackViewList& tracks) +framepos_t +Editor::find_next_region_boundary (framepos_t pos, int32_t dir, const TrackViewList& tracks) { - nframes64_t distance = max_frames; - nframes64_t current_nearest = -1; - + framecnt_t distance = max_frames; + framepos_t current_nearest = -1; for (TrackViewList::const_iterator i = tracks.begin(); i != tracks.end(); ++i) { - nframes64_t contender; - nframes64_t d; - + framepos_t contender; + framecnt_t d; + RouteTimeAxisView* rtv = dynamic_cast (*i); if (!rtv) { @@ -782,24 +763,24 @@ Editor::find_next_region_boundary (nframes64_t pos, int32_t dir, const TrackView distance = d; } } - + return current_nearest; } -nframes64_t -Editor::get_region_boundary (nframes64_t pos, int32_t dir, bool with_selection, bool only_onscreen) +framepos_t +Editor::get_region_boundary (framepos_t pos, int32_t dir, bool with_selection, bool only_onscreen) { - nframes64_t target; + framepos_t target; TrackViewList tvl; if (with_selection && Config->get_region_boundaries_from_selected_tracks()) { if (!selection->tracks.empty()) { - + target = find_next_region_boundary (pos, dir, selection->tracks); - + } else { - + if (only_onscreen || Config->get_region_boundaries_from_onscreen_tracks()) { get_onscreen_tracks (tvl); target = find_next_region_boundary (pos, dir, tvl); @@ -807,7 +788,7 @@ Editor::get_region_boundary (nframes64_t pos, int32_t dir, bool with_selection, target = find_next_region_boundary (pos, dir, track_views); } } - + } else { if (only_onscreen || Config->get_region_boundaries_from_onscreen_tracks()) { @@ -817,7 +798,7 @@ Editor::get_region_boundary (nframes64_t pos, int32_t dir, bool with_selection, target = find_next_region_boundary (pos, dir, track_views); } } - + return target; } @@ -827,7 +808,7 @@ Editor::cursor_to_region_boundary (bool with_selection, int32_t dir) nframes64_t pos = playhead_cursor->current_frame; nframes64_t target; - if (!session) { + if (!_session) { return; } @@ -840,8 +821,7 @@ Editor::cursor_to_region_boundary (bool with_selection, int32_t dir) return; } - - session->request_locate (target); + _session->request_locate (target); } void @@ -862,7 +842,7 @@ Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t boost::shared_ptr r; nframes64_t pos = cursor->current_frame; - if (!session) { + if (!_session) { return; } @@ -873,25 +853,25 @@ Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t pos+=dir; if (!selection->tracks.empty()) { - + r = find_next_region (pos, point, dir, selection->tracks, &ontrack); - + } else if (clicked_axisview) { - + TrackViewList t; t.push_back (clicked_axisview); - + r = find_next_region (pos, point, dir, t, &ontrack); - + } else { - + r = find_next_region (pos, point, dir, track_views, &ontrack); } if (r == 0) { return; } - + switch (point){ case Start: pos = r->first_frame (); @@ -904,22 +884,22 @@ Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t case SyncPoint: pos = r->sync_position (); // r->adjust_to_sync (r->first_frame()); - break; + break; } - + float speed = 1.0f; RouteTimeAxisView *rtav; if ( ontrack != 0 && (rtav = dynamic_cast(ontrack)) != 0 ) { - if (rtav->get_diskstream() != 0) { - speed = rtav->get_diskstream()->speed(); + if (rtav->track() != 0) { + speed = rtav->track()->speed(); } } pos = track_frame_to_session_frame(pos, speed); - + if (cursor == playhead_cursor) { - session->request_locate (pos); + _session->request_locate (pos); } else { cursor->set_position (pos); } @@ -941,7 +921,7 @@ void Editor::cursor_to_selection_start (EditorCursor *cursor) { nframes64_t pos = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -963,7 +943,7 @@ Editor::cursor_to_selection_start (EditorCursor *cursor) } if (cursor == playhead_cursor) { - session->request_locate (pos); + _session->request_locate (pos); } else { cursor->set_position (pos); } @@ -973,7 +953,7 @@ void Editor::cursor_to_selection_end (EditorCursor *cursor) { nframes64_t pos = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -995,7 +975,7 @@ Editor::cursor_to_selection_end (EditorCursor *cursor) } if (cursor == playhead_cursor) { - session->request_locate (pos); + _session->request_locate (pos); } else { cursor->set_position (pos); } @@ -1008,7 +988,7 @@ Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir) Location* loc; bool ignored; - if (!session) { + if (!_session) { return; } @@ -1019,7 +999,7 @@ Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir) if (!mouse_frame (mouse, ignored)) { return; } - + add_location_mark (mouse); } @@ -1061,7 +1041,7 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir) Location* loc; bool ignored; - if (!session || selection->markers.empty()) { + if (!_session || selection->markers.empty()) { return; } @@ -1078,18 +1058,18 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir) pos+=dir; if (!selection->tracks.empty()) { - + r = find_next_region (pos, point, dir, selection->tracks, &ontrack); - + } else { - + r = find_next_region (pos, point, dir, track_views, &ontrack); } if (r == 0) { return; } - + switch (point){ case Start: pos = r->first_frame (); @@ -1101,15 +1081,15 @@ Editor::selected_marker_to_region_point (RegionPoint point, int32_t dir) case SyncPoint: pos = r->adjust_to_sync (r->first_frame()); - break; + break; } - + float speed = 1.0f; RouteTimeAxisView *rtav; if (ontrack != 0 && (rtav = dynamic_cast(ontrack)) != 0) { - if (rtav->get_diskstream() != 0) { - speed = rtav->get_diskstream()->speed(); + if (rtav->track() != 0) { + speed = rtav->track()->speed(); } } @@ -1137,7 +1117,7 @@ Editor::selected_marker_to_selection_start () Location* loc; bool ignored; - if (!session || selection->markers.empty()) { + if (!_session || selection->markers.empty()) { return; } @@ -1145,7 +1125,7 @@ Editor::selected_marker_to_selection_start () return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1176,7 +1156,7 @@ Editor::selected_marker_to_selection_end () Location* loc; bool ignored; - if (!session || selection->markers.empty()) { + if (!_session || selection->markers.empty()) { return; } @@ -1184,7 +1164,7 @@ Editor::selected_marker_to_selection_end () return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1223,13 +1203,13 @@ Editor::scroll_playhead (bool forward) pos += delta ; } else { pos = max_frames; - } + } } else { if (pos == 0) { return; - } + } if (pos > delta) { pos -= delta; @@ -1238,7 +1218,7 @@ Editor::scroll_playhead (bool forward) } } - session->request_locate (pos); + _session->request_locate (pos); } void @@ -1253,7 +1233,7 @@ Editor::playhead_backward () cnt = 1; } else { if (was_floating) { - cnt = (nframes64_t) floor (prefix * session->frame_rate ()); + cnt = (nframes64_t) floor (prefix * _session->frame_rate ()); } else { cnt = (nframes64_t) prefix; } @@ -1266,13 +1246,13 @@ Editor::playhead_backward () } else { pos -= cnt; } - + /* XXX this is completely insane. with the current buffering design, we'll force a complete track buffer flush and reload, just to move 1 sample !!! */ - session->request_locate (pos); + _session->request_locate (pos); } void @@ -1287,26 +1267,26 @@ Editor::playhead_forward () cnt = 1; } else { if (was_floating) { - cnt = (nframes64_t) floor (prefix * session->frame_rate ()); + cnt = (nframes64_t) floor (prefix * _session->frame_rate ()); } else { cnt = (nframes64_t) floor (prefix); } } pos = playhead_cursor->current_frame; - + /* XXX this is completely insane. with the current buffering design, we'll force a complete track buffer flush and reload, just to move 1 sample !!! */ - session->request_locate (pos+cnt); + _session->request_locate (pos+cnt); } void Editor::cursor_align (bool playhead_to_edit) { - if (!session) { + if (!_session) { return; } @@ -1315,17 +1295,17 @@ Editor::cursor_align (bool playhead_to_edit) if (selection->markers.empty()) { return; } - - session->request_locate (selection->markers.front()->position(), session->transport_rolling()); - + + _session->request_locate (selection->markers.front()->position(), _session->transport_rolling()); + } else { /* move selected markers to playhead */ - + for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) { bool ignored; - + Location* loc = find_location_from_marker (*i, ignored); - + if (loc->is_mark()) { loc->set_start (playhead_cursor->current_frame); } else { @@ -1348,7 +1328,7 @@ Editor::edit_cursor_backward () cnt = 1; } else { if (was_floating) { - cnt = (nframes64_t) floor (prefix * session->frame_rate ()); + cnt = (nframes64_t) floor (prefix * _session->frame_rate ()); } else { cnt = (nframes64_t) prefix; } @@ -1363,7 +1343,7 @@ Editor::edit_cursor_backward () } else { pos -= cnt; } - + // EDIT CURSOR edit_cursor->set_position (pos); } @@ -1379,7 +1359,7 @@ Editor::edit_cursor_forward () cnt = 1; } else { if (was_floating) { - cnt = (nframes64_t) floor (prefix * session->frame_rate ()); + cnt = (nframes64_t) floor (prefix * _session->frame_rate ()); } else { cnt = (nframes64_t) floor (prefix); } @@ -1401,12 +1381,12 @@ Editor::goto_frame () } if (was_floating) { - frame = (nframes64_t) floor (prefix * session->frame_rate()); + frame = (nframes64_t) floor (prefix * _session->frame_rate()); } else { frame = (nframes64_t) floor (prefix); } - session->request_locate (frame); + _session->request_locate (frame); } void @@ -1417,12 +1397,12 @@ Editor::scroll_backward (float pages) bool was_floating; float prefix; nframes64_t cnt; - + if (get_prefix (prefix, was_floating)) { cnt = (nframes64_t) floor (pages * one_page); } else { if (was_floating) { - cnt = (nframes64_t) floor (prefix * session->frame_rate()); + cnt = (nframes64_t) floor (prefix * _session->frame_rate()); } else { cnt = (nframes64_t) floor (prefix * one_page); } @@ -1445,12 +1425,12 @@ Editor::scroll_forward (float pages) bool was_floating; float prefix; nframes64_t cnt; - + if (get_prefix (prefix, was_floating)) { cnt = (nframes64_t) floor (pages * one_page); } else { if (was_floating) { - cnt = (nframes64_t) floor (prefix * session->frame_rate()); + cnt = (nframes64_t) floor (prefix * _session->frame_rate()); } else { cnt = (nframes64_t) floor (prefix * one_page); } @@ -1505,48 +1485,61 @@ Editor::scroll_tracks_up () void Editor::scroll_tracks_down_line () { + double vert_value = vertical_adjustment.get_value() + 60; - Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - double vert_value = adj->get_value() + 60; - - if (vert_value>adj->get_upper() - _canvas_height) { - vert_value = adj->get_upper() - _canvas_height; + if (vert_value > vertical_adjustment.get_upper() - _canvas_height) { + vert_value = vertical_adjustment.get_upper() - _canvas_height; } - adj->set_value (vert_value); + + vertical_adjustment.set_value (vert_value); } void Editor::scroll_tracks_up_line () { - Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - adj->set_value (adj->get_value() - 60); + reset_y_origin (vertical_adjustment.get_value() - 60); } /* ZOOM */ +void +Editor::tav_zoom_step (bool coarser) +{ + ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, coarser) + + _routes->suspend_redisplay (); + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + TimeAxisView *tv = (static_cast(*i)); + tv->step_height (coarser); + } + + _routes->resume_redisplay (); +} + void Editor::temporal_zoom_step (bool coarser) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser)); + ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, coarser) double nfpu; nfpu = frames_per_unit; - - if (coarser) { + + if (coarser) { nfpu *= 1.61803399; - } else { + } else { nfpu = max(1.0,(nfpu/1.61803399)); } temporal_zoom (nfpu); -} +} void Editor::temporal_zoom (gdouble fpu) { - if (!session) return; - + if (!_session) return; + nframes64_t current_page = current_page_frames(); nframes64_t current_leftmost = leftmost_frame; nframes64_t current_rightmost; @@ -1561,12 +1554,12 @@ Editor::temporal_zoom (gdouble fpu) /* XXX this limit is also in ::set_frames_per_unit() */ - if (frames_per_unit <= 2.0 && fpu <= frames_per_unit) { + if (frames_per_unit <= 1.0 && fpu <= frames_per_unit) { return; } nfpu = fpu; - + new_page_size = (nframes64_t) floor (_canvas_width * nfpu); half_page_size = new_page_size / 2; @@ -1574,7 +1567,7 @@ Editor::temporal_zoom (gdouble fpu) case ZoomFocusLeft: leftmost_after_zoom = current_leftmost; break; - + case ZoomFocusRight: current_rightmost = leftmost_frame + current_page; if (current_rightmost < new_page_size) { @@ -1583,26 +1576,23 @@ Editor::temporal_zoom (gdouble fpu) leftmost_after_zoom = current_rightmost - new_page_size; } break; - + case ZoomFocusCenter: - current_center = current_leftmost + (current_page/2); + current_center = current_leftmost + (current_page/2); if (current_center < half_page_size) { leftmost_after_zoom = 0; } else { leftmost_after_zoom = current_center - half_page_size; } break; - - case ZoomFocusPlayhead: - /* try to keep the playhead in the same place */ - where = playhead_cursor->current_frame; - - l = - ((new_page_size * ((where - current_leftmost)/(double)current_page)) - where); + case ZoomFocusPlayhead: + /* centre playhead */ + l = playhead_cursor->current_frame - (new_page_size * 0.5); if (l < 0) { leftmost_after_zoom = 0; - } else if (l > max_frames) { + } else if (l > max_frames) { leftmost_after_zoom = max_frames - new_page_size; } else { leftmost_after_zoom = (nframes64_t) l; @@ -1628,7 +1618,7 @@ Editor::temporal_zoom (gdouble fpu) if (l < 0) { leftmost_after_zoom = 0; - } else if (l > max_frames) { + } else if (l > max_frames) { leftmost_after_zoom = max_frames - new_page_size; } else { leftmost_after_zoom = (nframes64_t) l; @@ -1647,7 +1637,7 @@ Editor::temporal_zoom (gdouble fpu) if (l < 0) { leftmost_after_zoom = 0; - } else if (l > max_frames) { + } else if (l > max_frames) { leftmost_after_zoom = max_frames - new_page_size; } else { leftmost_after_zoom = (nframes64_t) l; @@ -1658,13 +1648,13 @@ Editor::temporal_zoom (gdouble fpu) return; } break; - + } - - // leftmost_after_zoom = min (leftmost_after_zoom, session->current_end_frame()); + + // leftmost_after_zoom = min (leftmost_after_zoom, _session->current_end_frame()); reposition_and_zoom (leftmost_after_zoom, nfpu); -} +} void Editor::temporal_zoom_region (bool both_axes) @@ -1672,7 +1662,7 @@ Editor::temporal_zoom_region (bool both_axes) nframes64_t start = max_frames; nframes64_t end = 0; - RegionSelection rs; + RegionSelection rs; set tracks; get_regions_for_action (rs); @@ -1717,7 +1707,7 @@ Editor::temporal_zoom_region (bool both_axes) start -= extra_samples; } else { start = 0; - } + } if (max_frames - extra_samples > end) { end += extra_samples; @@ -1737,20 +1727,20 @@ Editor::temporal_zoom_region (bool both_axes) if (both_axes) { uint32_t per_track_height = (uint32_t) floor ((_canvas_height - canvas_timebars_vsize - 10.0) / tracks.size()); - + /* set visible track heights appropriately */ - + for (set::iterator t = tracks.begin(); t != tracks.end(); ++t) { (*t)->set_height (per_track_height); } - + /* hide irrelevant tracks */ _routes->suspend_redisplay (); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) { - hide_track_in_display (**i, true); + hide_track_in_display (*i, true); } } @@ -1760,25 +1750,20 @@ Editor::temporal_zoom_region (bool both_axes) no_save_visual = false; } - zoomed_to_region = true; redo_visual_stack.push_back (current_visual_state()); } void -Editor::toggle_zoom_region (bool both_axes) +Editor::zoom_to_region (bool both_axes) { - if (zoomed_to_region) { - swap_visual_state (); - } else { - temporal_zoom_region (both_axes); - } + temporal_zoom_region (both_axes); } void Editor::temporal_zoom_selection () { if (!selection) return; - + if (selection->time.empty()) { return; } @@ -1792,17 +1777,23 @@ Editor::temporal_zoom_selection () void Editor::temporal_zoom_session () { - ENSURE_GUI_THREAD (mem_fun (*this, &Editor::temporal_zoom_session)); + ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_session) - if (session) { - temporal_zoom_by_frame (session->current_start_frame(), session->current_end_frame(), "zoom to session"); + if (_session) { + nframes_t const l = _session->current_end_frame() - _session->current_start_frame(); + double s = _session->current_start_frame() - l * 0.01; + if (s < 0) { + s = 0; + } + nframes_t const e = _session->current_end_frame() + l * 0.01; + temporal_zoom_by_frame (nframes_t (s), e, "zoom to _session"); } } void -Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & op) +Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string & /*op*/) { - if (!session) return; + if (!_session) return; if ((start == 0 && end == 0) || end < start) { return; @@ -1811,7 +1802,7 @@ Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string nframes64_t range = end - start; double new_fpu = (double)range / (double)_canvas_width; - + nframes64_t new_page = (nframes64_t) floor (_canvas_width * new_fpu); nframes64_t middle = (nframes64_t) floor( (double)start + ((double)range / 2.0f )); nframes64_t new_leftmost = (nframes64_t) floor( (double)middle - ((double)new_page/2.0f)); @@ -1823,21 +1814,21 @@ Editor::temporal_zoom_by_frame (nframes64_t start, nframes64_t end, const string reposition_and_zoom (new_leftmost, new_fpu); } -void +void Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame) { - if (!session) { + if (!_session) { return; } double range_before = frame - leftmost_frame; double new_fpu; - + new_fpu = frames_per_unit; - - if (coarser) { + + if (coarser) { new_fpu *= 1.61803399; range_before *= 1.61803399; - } else { + } else { new_fpu = max(1.0,(new_fpu/1.61803399)); range_before /= 1.61803399; } @@ -1852,8 +1843,8 @@ Editor::temporal_zoom_to_frame (bool coarser, nframes64_t frame) new_leftmost = 0; } // begin_reversible_command (_("zoom to frame")); -// session->add_undo (bind (mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit)); -// session->add_redo (bind (mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu)); +// _session->add_undo (sigc::bind (sigc::mem_fun(*this, &Editor::reposition_and_zoom), leftmost_frame, frames_per_unit)); +// _session->add_redo (sigc::bind (sigc::mem_fun(*this, &Editor::reposition_and_zoom), new_leftmost, new_fpu)); // commit_reversible_command (); reposition_and_zoom (new_leftmost, new_fpu); @@ -1872,10 +1863,7 @@ Editor::choose_new_marker_name(string &name) { dialog.set_prompt (_("New Name:")); - WindowTitle title(Glib::get_application_name()); - title += _("Name New Location Marker"); - - dialog.set_title(title.get_string()); + dialog.set_title (_("New Location Marker")); dialog.set_name ("MarkNameWindow"); dialog.set_size_request (250, -1); @@ -1892,7 +1880,7 @@ Editor::choose_new_marker_name(string &name) { default: return false; } - + dialog.get_result(name); return true; @@ -1908,22 +1896,22 @@ Editor::add_location_from_selection () return; } - if (session == 0 || clicked_axisview == 0) { + if (_session == 0 || clicked_axisview == 0) { return; } nframes64_t start = selection->time[clicked_selection].start; nframes64_t end = selection->time[clicked_selection].end; - session->locations()->next_available_name(rangename,"selection"); - Location *location = new Location (start, end, rangename, Location::IsRangeMarker); + _session->locations()->next_available_name(rangename,"selection"); + Location *location = new Location (*_session, start, end, rangename, Location::IsRangeMarker); - session->begin_reversible_command (_("add marker")); - XMLNode &before = session->locations()->get_state(); - session->locations()->add (location, true); - XMLNode &after = session->locations()->get_state(); - session->add_command(new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + _session->begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->add (location, true); + XMLNode &after = _session->locations()->get_state(); + _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } void @@ -1933,29 +1921,29 @@ Editor::add_location_mark (nframes64_t where) select_new_marker = true; - session->locations()->next_available_name(markername,"mark"); + _session->locations()->next_available_name(markername,"mark"); if (!choose_new_marker_name(markername)) { return; } - Location *location = new Location (where, where, markername, Location::IsMark); - session->begin_reversible_command (_("add marker")); - XMLNode &before = session->locations()->get_state(); - session->locations()->add (location, true); - XMLNode &after = session->locations()->get_state(); - session->add_command(new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + Location *location = new Location (*_session, where, where, markername, Location::IsMark); + _session->begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->add (location, true); + XMLNode &after = _session->locations()->get_state(); + _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } void Editor::add_location_from_playhead_cursor () { - add_location_mark (session->audible_frame()); + add_location_mark (_session->audible_frame()); } void Editor::add_locations_from_audio_region () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1963,29 +1951,27 @@ Editor::add_locations_from_audio_region () return; } - session->begin_reversible_command (rs.size () > 1 ? _("add markers") : _("add marker")); - XMLNode &before = session->locations()->get_state(); - - cerr << "Add locations\n"; + _session->begin_reversible_command (rs.size () > 1 ? _("add markers") : _("add marker")); + XMLNode &before = _session->locations()->get_state(); for (RegionSelection::iterator i = rs.begin (); i != rs.end (); ++i) { - + boost::shared_ptr region = (*i)->region (); - - Location *location = new Location (region->position(), region->last_frame(), region->name(), Location::IsRangeMarker); - - session->locations()->add (location, true); + + Location *location = new Location (*_session, region->position(), region->last_frame(), region->name(), Location::IsRangeMarker); + + _session->locations()->add (location, true); } - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } void Editor::add_location_from_audio_region () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1993,32 +1979,30 @@ Editor::add_location_from_audio_region () return; } - session->begin_reversible_command (_("add marker")); - XMLNode &before = session->locations()->get_state(); + _session->begin_reversible_command (_("add marker")); + XMLNode &before = _session->locations()->get_state(); string markername; if (rs.size() > 1) { // more than one region selected - session->locations()->next_available_name(markername, "regions"); + _session->locations()->next_available_name(markername, "regions"); } else { RegionView* rv = *(rs.begin()); boost::shared_ptr region = rv->region(); markername = region->name(); } - + if (!choose_new_marker_name(markername)) { return; } - cerr << "Add location\n"; - - // single range spanning all selected - Location *location = new Location (rs.start(), rs.end_frame(), markername, Location::IsRangeMarker); - session->locations()->add (location, true); + // single range spanning all selected + Location *location = new Location (*_session, rs.start(), rs.end_frame(), markername, Location::IsRangeMarker); + _session->locations()->add (location, true); - XMLNode &after = session->locations()->get_state(); - session->add_command (new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + XMLNode &after = _session->locations()->get_state(); + _session->add_command (new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } void @@ -2039,7 +2023,7 @@ Editor::amplitude_zoom_step (bool in) #ifdef FIX_FOR_CANVAS /* XXX DO SOMETHING */ #endif -} +} /* DELETION */ @@ -2079,32 +2063,32 @@ Editor::search_forwards () void Editor::jump_forward_to_mark () { - if (!session) { + if (!_session) { return; } - - Location *location = session->locations()->first_location_after (playhead_cursor->current_frame); + + Location *location = _session->locations()->first_location_after (playhead_cursor->current_frame); if (location) { - session->request_locate (location->start(), session->transport_rolling()); + _session->request_locate (location->start(), _session->transport_rolling()); } else { - session->request_locate (session->current_end_frame()); + _session->request_locate (_session->current_end_frame()); } } void Editor::jump_backward_to_mark () { - if (!session) { + if (!_session) { return; } - Location *location = session->locations()->first_location_before (playhead_cursor->current_frame); - + Location *location = _session->locations()->first_location_before (playhead_cursor->current_frame); + if (location) { - session->request_locate (location->start(), session->transport_rolling()); + _session->request_locate (location->start(), _session->transport_rolling()); } else { - session->goto_start (); + _session->goto_start (); } } @@ -2117,66 +2101,66 @@ Editor::set_mark () string markername; if (get_prefix (prefix, was_floating)) { - pos = session->audible_frame (); + pos = _session->audible_frame (); } else { if (was_floating) { - pos = (nframes64_t) floor (prefix * session->frame_rate ()); + pos = (nframes64_t) floor (prefix * _session->frame_rate ()); } else { pos = (nframes64_t) floor (prefix); } } - session->locations()->next_available_name(markername,"mark"); + _session->locations()->next_available_name(markername,"mark"); if (!choose_new_marker_name(markername)) { return; } - session->locations()->add (new Location (pos, 0, markername, Location::IsMark), true); + _session->locations()->add (new Location (*_session, pos, 0, markername, Location::IsMark), true); } void Editor::clear_markers () { - if (session) { - session->begin_reversible_command (_("clear markers")); - XMLNode &before = session->locations()->get_state(); - session->locations()->clear_markers (); - XMLNode &after = session->locations()->get_state(); - session->add_command(new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + if (_session) { + _session->begin_reversible_command (_("clear markers")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->clear_markers (); + XMLNode &after = _session->locations()->get_state(); + _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } } void Editor::clear_ranges () { - if (session) { - session->begin_reversible_command (_("clear ranges")); - XMLNode &before = session->locations()->get_state(); - - Location * looploc = session->locations()->auto_loop_location(); - Location * punchloc = session->locations()->auto_punch_location(); - - session->locations()->clear_ranges (); + if (_session) { + _session->begin_reversible_command (_("clear ranges")); + XMLNode &before = _session->locations()->get_state(); + + Location * looploc = _session->locations()->auto_loop_location(); + Location * punchloc = _session->locations()->auto_punch_location(); + + _session->locations()->clear_ranges (); // re-add these - if (looploc) session->locations()->add (looploc); - if (punchloc) session->locations()->add (punchloc); - - XMLNode &after = session->locations()->get_state(); - session->add_command(new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); + if (looploc) _session->locations()->add (looploc); + if (punchloc) _session->locations()->add (punchloc); + + XMLNode &after = _session->locations()->get_state(); + _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); } } void Editor::clear_locations () { - session->begin_reversible_command (_("clear locations")); - XMLNode &before = session->locations()->get_state(); - session->locations()->clear (); - XMLNode &after = session->locations()->get_state(); - session->add_command(new MementoCommand(*(session->locations()), &before, &after)); - session->commit_reversible_command (); - session->locations()->clear (); + _session->begin_reversible_command (_("clear locations")); + XMLNode &before = _session->locations()->get_state(); + _session->locations()->clear (); + XMLNode &after = _session->locations()->get_state(); + _session->add_command(new MementoCommand(*(_session->locations()), &before, &after)); + _session->commit_reversible_command (); + _session->locations()->clear (); } void @@ -2195,7 +2179,7 @@ Editor::unhide_ranges () { for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { Location *l = (*i).first; - if (l->is_hidden() && l->is_range_marker()) { + if (l->is_hidden() && l->is_range_marker()) { l->set_hidden(false, this); } } @@ -2211,16 +2195,14 @@ Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) nframes64_t where; RouteTimeAxisView *rtv = 0; boost::shared_ptr playlist; - + track_canvas->window_to_world (x, y, wx, wy); - //wx += horizontal_adjustment.get_value(); - //wy += vertical_adjustment.get_value(); GdkEvent event; event.type = GDK_BUTTON_RELEASE; event.button.x = wx; event.button.y = wy; - + where = event_frame (&event, &cx, &cy); if (where < leftmost_frame || where > leftmost_frame + current_page_frames()) { @@ -2232,7 +2214,7 @@ Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) if (tv.first == 0) { return; } - + if ((rtv = dynamic_cast (tv.first)) == 0) { return; } @@ -2240,18 +2222,19 @@ Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) if ((playlist = rtv->playlist()) == 0) { return; } - + snap_to (where); - + begin_reversible_command (_("insert dragged region")); - XMLNode &before = playlist->get_state(); + playlist->clear_history (); playlist->add_region (RegionFactory::create (region), where, 1.0); - session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command(new StatefulDiffCommand (playlist)); commit_reversible_command (); } void -Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) { +Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) +{ double wx, wy; double cx, cy; nframes_t where; @@ -2259,7 +2242,7 @@ Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) { RouteTimeAxisView *source_rtv = 0; track_canvas->window_to_world (x, y, wx, wy); - wx += horizontal_adjustment.get_value(); + wx += horizontal_position (); wy += vertical_adjustment.get_value(); GdkEvent event; @@ -2278,13 +2261,13 @@ Editor::insert_route_list_drag (boost::shared_ptr route, int x, int y) { return; } - /* use this drag source to add underlay to a track. But we really don't care + /* use this drag source to add underlay to a track. But we really don't care about the Route, only the view of the route, so find it first */ for(TrackViewList::iterator it = track_views.begin(); it != track_views.end(); ++it) { if((source_rtv = dynamic_cast(*it)) == 0) { continue; } - + if(source_rtv->route() == route && source_rtv != dest_rtv) { dest_rtv->add_underlay(source_rtv->view()); break; @@ -2320,11 +2303,11 @@ Editor::insert_region_list_selection (float times) if (region == 0) { return; } - + begin_reversible_command (_("insert region")); - XMLNode &before = playlist->get_state(); + playlist->clear_history (); playlist->add_region ((RegionFactory::create (region)), get_preferred_edit_position(), times); - session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command(new StatefulDiffCommand (playlist)); commit_reversible_command (); } @@ -2348,68 +2331,38 @@ Editor::edit_envelope () void Editor::transition_to_rolling (bool fwd) { - if (!session) { - return; - } - - switch (Config->get_slave_source()) { - case None: - case JACK: - break; - default: - /* transport controlled by the master */ - return; - } - - if (session->is_auditioning()) { - session->cancel_audition (); + if (!_session) { return; } - - session->request_transport_speed (fwd ? 1.0f : -1.0f); -} -void -Editor::toggle_playback (bool with_abort) -{ - if (!session) { - return; + if (_session->config.get_external_sync()) { + switch (_session->config.get_sync_source()) { + case JACK: + break; + default: + /* transport controlled by the master */ + return; + } } - switch (Config->get_slave_source()) { - case None: - case JACK: - break; - default: - /* transport controlled by the master */ + if (_session->is_auditioning()) { + _session->cancel_audition (); return; } - if (session->is_auditioning()) { - session->cancel_audition (); - return; - } - - if (session->transport_rolling()) { - session->request_stop (with_abort); - if (session->get_play_loop()) { - session->request_play_loop (false); - } - } else { - session->request_transport_speed (1.0f); - } + _session->request_transport_speed (fwd ? 1.0f : -1.0f); } void Editor::play_from_start () { - session->request_locate (session->current_start_frame(), true); + _session->request_locate (_session->current_start_frame(), true); } void Editor::play_from_edit_point () { - session->request_locate (get_preferred_edit_position(), true); + _session->request_locate (get_preferred_edit_position(), true); } void @@ -2420,19 +2373,19 @@ Editor::play_from_edit_point_and_return () start_frame = get_preferred_edit_position (true); - if (session->transport_rolling()) { - session->request_locate (start_frame, false); + if (_session->transport_rolling()) { + _session->request_locate (start_frame, false); return; } /* don't reset the return frame if its already set */ - if ((return_frame = session->requested_return_frame()) < 0) { - return_frame = session->audible_frame(); + if ((return_frame = _session->requested_return_frame()) < 0) { + return_frame = _session->audible_frame(); } if (start_frame >= 0) { - session->request_roll_at_and_return (start_frame, return_frame); + _session->request_roll_at_and_return (start_frame, return_frame); } } @@ -2443,13 +2396,13 @@ Editor::play_selection () return; } - session->request_play_range (true); + _session->request_play_range (&selection->time, true); } void Editor::loop_selected_region () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -2460,12 +2413,12 @@ Editor::loop_selected_region () if ((tll = transport_loop_location()) != 0) { tll->set (rv->region()->position(), rv->region()->last_frame()); - + // enable looping, reposition and start rolling - session->request_play_loop (true); - session->request_locate (tll->start(), false); - session->request_transport_speed (1.0f); + _session->request_play_loop (true); + _session->request_locate (tll->start(), false); + _session->request_transport_speed (1.0f); } } } @@ -2477,7 +2430,7 @@ Editor::play_location (Location& location) return; } - session->request_bounded_roll (location.start(), location.end()); + _session->request_bounded_roll (location.start(), location.end()); } void @@ -2493,8 +2446,8 @@ Editor::loop_location (Location& location) tll->set (location.start(), location.end()); // enable looping, reposition and start rolling - session->request_play_loop (true); - session->request_locate (tll->start(), true); + _session->request_play_loop (true); + _session->request_locate (tll->start(), true); } } @@ -2529,10 +2482,17 @@ Editor::edit_region () selection->foreach_regionview (&RegionView::show_region_editor); } +/** Show the midi list editor for the selected MIDI regions */ +void +Editor::show_midi_list_editor () +{ + selection->foreach_midi_regionview (&MidiRegionView::show_list_editor); +} + void Editor::rename_region() { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -2540,10 +2500,7 @@ Editor::rename_region() return; } - WindowTitle title (Glib::get_application_name()); - title += _("Rename Region"); - - ArdourDialog d (*this, title.get_string(), true, false); + ArdourDialog d (*this, _("Rename Region"), true, false); Entry entry; Label label (_("New name:")); HBox hbox; @@ -2555,8 +2512,8 @@ Editor::rename_region() d.get_vbox()->set_border_width (12); d.get_vbox()->pack_start (hbox, false, false); - d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK); d.add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); + d.add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK); d.set_size_request (300, -1); d.set_position (Gtk::WIN_POS_MOUSE); @@ -2564,10 +2521,10 @@ Editor::rename_region() entry.set_text (rs.front()->region()->name()); entry.select_region (0, -1); - entry.signal_activate().connect (bind (mem_fun (d, &Dialog::response), RESPONSE_OK)); - + entry.signal_activate().connect (sigc::bind (sigc::mem_fun (d, &Dialog::response), RESPONSE_OK)); + d.show_all (); - + entry.grab_focus(); int ret = d.run(); @@ -2587,9 +2544,9 @@ Editor::rename_region() void Editor::audition_playlist_region_via_route (boost::shared_ptr region, Route& route) { - if (session->is_auditioning()) { - session->cancel_audition (); - } + if (_session->is_auditioning()) { + _session->cancel_audition (); + } // note: some potential for creativity here, because region doesn't // have to belong to the playlist that Route is handling @@ -2597,9 +2554,9 @@ Editor::audition_playlist_region_via_route (boost::shared_ptr region, Ro // bool was_soloed = route.soloed(); route.set_solo (true, this); - - session->request_bounded_roll (region->position(), region->position() + region->length()); - + + _session->request_bounded_roll (region->position(), region->position() + region->length()); + /* XXX how to unset the solo state ? */ } @@ -2610,7 +2567,7 @@ Editor::play_edit_range () nframes64_t start, end; if (get_edit_op_range (start, end)) { - session->request_bounded_roll (start, end); + _session->request_bounded_roll (start, end); } } @@ -2619,10 +2576,10 @@ Editor::play_selected_region () { nframes64_t start = max_frames; nframes64_t end = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - + if (rs.empty()) { return; } @@ -2636,47 +2593,13 @@ Editor::play_selected_region () } } - session->request_stop (); - session->request_bounded_roll (start, end); + _session->request_bounded_roll (start, end); } void Editor::audition_playlist_region_standalone (boost::shared_ptr region) { - session->audition_region (region); -} - -void -Editor::build_interthread_progress_window () -{ - interthread_progress_window = new ArdourDialog (X_("interthread progress"), true); - - interthread_progress_bar.set_orientation (Gtk::PROGRESS_LEFT_TO_RIGHT); - - interthread_progress_window->set_border_width (12); - interthread_progress_window->get_vbox()->set_spacing (6); - - interthread_progress_label.set_alignment (0.5, 0.5); - - interthread_progress_window->get_vbox()->pack_start (interthread_progress_label, false, false); - interthread_progress_window->get_vbox()->pack_start (interthread_progress_bar,false, false); - - // GTK2FIX: this button needs a modifiable label - - Button* b = interthread_progress_window->add_button (Stock::CANCEL, RESPONSE_CANCEL); - b->signal_clicked().connect (mem_fun(*this, &Editor::interthread_cancel_clicked)); - - interthread_cancel_button.add (interthread_cancel_label); - - interthread_progress_window->set_default_size (200, 100); -} - -void -Editor::interthread_cancel_clicked () -{ - if (current_interthread_info) { - current_interthread_info->cancel = true; - } + _session->audition_region (region); } void @@ -2693,9 +2616,11 @@ Editor::region_from_selection () nframes64_t start = selection->time[clicked_selection].start; nframes64_t end = selection->time[clicked_selection].end; + TrackViewList tracks = get_tracks_for_range_action (); + nframes64_t selection_cnt = end - start + 1; - - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + + for (TrackSelection::iterator i = tracks.begin(); i != tracks.end(); ++i) { boost::shared_ptr current; boost::shared_ptr pl; nframes64_t internal_start; @@ -2710,11 +2635,18 @@ Editor::region_from_selection () } internal_start = start - current->position(); - session->region_name (new_name, current->name(), true); - boost::shared_ptr region (RegionFactory::create (current, - internal_start, selection_cnt, new_name)); + RegionFactory::region_name (new_name, current->name(), true); + + PropertyList plist; + + plist.add (ARDOUR::Properties::start, current->start() + internal_start); + plist.add (ARDOUR::Properties::length, selection_cnt); + plist.add (ARDOUR::Properties::name, new_name); + plist.add (ARDOUR::Properties::layer, 0); + + boost::shared_ptr region (RegionFactory::create (current, plist)); } -} +} void Editor::create_region_from_selection (vector >& new_regions) @@ -2725,7 +2657,7 @@ Editor::create_region_from_selection (vector >& new_re nframes64_t start = selection->time[clicked_selection].start; nframes64_t end = selection->time[clicked_selection].end; - + sort_track_selection (); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { @@ -2743,17 +2675,22 @@ Editor::create_region_from_selection (vector >& new_re } internal_start = start - current->position(); - session->region_name (new_name, current->name(), true); + RegionFactory::region_name (new_name, current->name(), true); + + PropertyList plist; + + plist.add (ARDOUR::Properties::start, current->start() + internal_start); + plist.add (ARDOUR::Properties::length, end - start + 1); + plist.add (ARDOUR::Properties::name, new_name); - new_regions.push_back (RegionFactory::create (current, - internal_start, end - start + 1, new_name)); + new_regions.push_back (RegionFactory::create (current, plist)); } } void Editor::split_multichannel_region () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -2764,7 +2701,7 @@ Editor::split_multichannel_region () vector< boost::shared_ptr > v; for (list::iterator x = rs.begin(); x != rs.end(); ++x) { - (*x)->region()->separate_by_channel (*session, v); + (*x)->region()->separate_by_channel (*_session, v); } } @@ -2786,41 +2723,52 @@ add_if_covered (RegionView* rv, const AudioRange* ar, RegionSelection* rs) } } -void -Editor::separate_regions_between (const TimeSelection& ts) +/** Return either: + * - selected tracks, or if there are none... + * - tracks containing selected regions, or if there are none... + * - all tracks + * @return tracks. + */ +TrackViewList +Editor::get_tracks_for_range_action () const { - bool in_command = false; - boost::shared_ptr playlist; - RegionSelection new_selection; - TrackSelection tmptracks; + TrackViewList t; if (selection->tracks.empty()) { - - /* use tracks with selected regions */ - RegionSelection rs; + /* use tracks with selected regions */ - get_regions_for_action (rs); + RegionSelection rs = selection->regions; for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { TimeAxisView* tv = &(*i)->get_time_axis_view(); - if (find (tmptracks.begin(), tmptracks.end(), tv) == tmptracks.end()) { - tmptracks.push_back (tv); + if (!t.contains (tv)) { + t.push_back (tv); } } - if (tmptracks.empty()) { - /* no regions selected: do nothing */ - return; + if (t.empty()) { + /* no regions and no tracks: use all tracks */ + t = track_views; } } else { - tmptracks = selection->tracks; - + t = selection->tracks; } + return t; +} + +void +Editor::separate_regions_between (const TimeSelection& ts) +{ + bool in_command = false; + boost::shared_ptr playlist; + RegionSelection new_selection; + + TrackViewList tmptracks = get_tracks_for_range_action (); sort_track_selection (&tmptracks); for (TrackSelection::iterator i = tmptracks.begin(); i != tmptracks.end(); ++i) { @@ -2833,54 +2781,55 @@ Editor::separate_regions_between (const TimeSelection& ts) /* no edits to destructive tracks */ - if (rtv->track()->diskstream()->destructive()) { + if (rtv->track()->destructive()) { continue; } - - if ((playlist = rtv->playlist()) != 0) { - XMLNode *before; - bool got_some; + if ((playlist = rtv->playlist()) != 0) { - before = &(playlist->get_state()); - got_some = false; + playlist->clear_history (); /* XXX need to consider musical time selections here at some point */ - double speed = rtv->get_diskstream()->speed(); + double speed = rtv->track()->speed(); for (list::const_iterator t = ts.begin(); t != ts.end(); ++t) { sigc::connection c = rtv->view()->RegionViewAdded.connect ( - mem_fun(*this, &Editor::collect_new_region_view)); + sigc::mem_fun(*this, &Editor::collect_new_region_view)); + latest_regionviews.clear (); playlist->partition ((nframes64_t)((*t).start * speed), - (nframes64_t)((*t).end * speed), true); + (nframes64_t)((*t).end * speed), false); c.disconnect (); if (!latest_regionviews.empty()) { - - got_some = true; - rtv->view()->foreach_regionview (bind ( + rtv->view()->foreach_regionview (sigc::bind ( sigc::ptr_fun (add_if_covered), &(*t), &new_selection)); - + if (!in_command) { begin_reversible_command (_("separate")); in_command = true; } - - session->add_command(new MementoCommand( - *playlist, before, &playlist->get_state())); - } - } + + /* pick up changes to existing regions */ + + vector cmds; + playlist->rdiff (cmds); + for (vector::iterator j = cmds.begin(); j != cmds.end(); ++j) { + _session->add_command (*j); + } + + /* pick up changes to the playlist itself (adds/removes) + */ - if (!got_some) { - delete before; + _session->add_command(new StatefulDiffCommand (playlist)); + } } } } @@ -2895,6 +2844,15 @@ Editor::separate_regions_between (const TimeSelection& ts) } } +struct PlaylistState { + boost::shared_ptr playlist; + XMLNode* before; +}; + +/** Take tracks from get_tracks_for_range_action and cut any regions + * on those tracks so that the tracks are empty over the time + * selection. + */ void Editor::separate_region_from_selection () { @@ -2911,9 +2869,9 @@ Editor::separate_region_from_selection () nframes64_t start; nframes64_t end; - + if (get_edit_op_range (start, end)) { - + AudioRange ar (start, end, 1); TimeSelection ts; ts.push_back (ar); @@ -2926,7 +2884,7 @@ Editor::separate_region_from_selection () void Editor::separate_region_from_punch () { - Location* loc = session->locations()->auto_punch_location(); + Location* loc = _session->locations()->auto_punch_location(); if (loc) { separate_regions_using_location (*loc); } @@ -2935,7 +2893,7 @@ Editor::separate_region_from_punch () void Editor::separate_region_from_loop () { - Location* loc = session->locations()->auto_loop_location(); + Location* loc = _session->locations()->auto_loop_location(); if (loc) { separate_regions_using_location (*loc); } @@ -2956,6 +2914,85 @@ Editor::separate_regions_using_location (Location& loc) separate_regions_between (ts); } +/** Separate regions under the selected region */ +void +Editor::separate_under_selected_regions () +{ + RegionSelection rs; + get_regions_for_action (rs); + + vector playlists; + + if (!_session) { + return; + } + + if (rs.empty()) { + return; + } + + begin_reversible_command (_("separate region under")); + + list > regions_to_remove; + + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + // we can't just remove the region(s) in this loop because + // this removes them from the RegionSelection, and they thus + // disappear from underneath the iterator, and the ++i above + // SEGVs in a puzzling fashion. + + // so, first iterate over the regions to be removed from rs and + // add them to the regions_to_remove list, and then + // iterate over the list to actually remove them. + + regions_to_remove.push_back ((*i)->region()); + } + + for (list >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) { + + boost::shared_ptr playlist = (*rl)->playlist(); + + if (!playlist) { + // is this check necessary? + continue; + } + + vector::iterator i; + + //only take state if this is a new playlist. + for (i = playlists.begin(); i != playlists.end(); ++i) { + if ((*i).playlist == playlist) { + break; + } + } + + if (i == playlists.end()) { + + PlaylistState before; + before.playlist = playlist; + before.before = &playlist->get_state(); + + playlist->freeze (); + playlists.push_back(before); + } + + //Partition on the region bounds + playlist->partition ((*rl)->first_frame() - 1, (*rl)->last_frame() + 1, true); + + //Re-add region that was just removed due to the partition operation + playlist->add_region( (*rl), (*rl)->first_frame() ); + } + + vector::iterator pl; + + for (pl = playlists.begin(); pl != playlists.end(); ++pl) { + (*pl).playlist->thaw (); + _session->add_command(new MementoCommand(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state())); + } + + commit_reversible_command (); +} + void Editor::crop_region_to_selection () { @@ -2972,15 +3009,15 @@ Editor::crop_region_to_selection () crop_region_to (start, end); } } - -} + +} void Editor::crop_region_to (nframes64_t start, nframes64_t end) { vector > playlists; boost::shared_ptr playlist; - TrackSelection* ts; + TrackViewList* ts; if (selection->tracks.empty()) { ts = &track_views; @@ -2988,17 +3025,17 @@ Editor::crop_region_to (nframes64_t start, nframes64_t end) sort_track_selection (); ts = &selection->tracks; } - + for (TrackSelection::iterator i = ts->begin(); i != ts->end(); ++i) { - + RouteTimeAxisView* rtv; - + if ((rtv = dynamic_cast ((*i))) != 0) { boost::shared_ptr t = rtv->track(); - if (t != 0 && ! t->diskstream()->destructive()) { - + if (t != 0 && ! t->destructive()) { + if ((playlist = rtv->playlist()) != 0) { playlists.push_back (playlist); } @@ -3009,27 +3046,27 @@ Editor::crop_region_to (nframes64_t start, nframes64_t end) if (playlists.empty()) { return; } - + nframes64_t the_start; nframes64_t the_end; nframes64_t cnt; - + begin_reversible_command (_("trim to selection")); - + for (vector >::iterator i = playlists.begin(); i != playlists.end(); ++i) { - + boost::shared_ptr region; - + the_start = start; - + if ((region = (*i)->top_region_at(the_start)) == 0) { continue; } - + /* now adjust lengths to that we do the right thing if the selection extends beyond the region */ - + the_start = max (the_start, (nframes64_t) region->position()); if (max_frames - the_start < region->length()) { the_end = the_start + region->length() - 1; @@ -3038,39 +3075,34 @@ Editor::crop_region_to (nframes64_t start, nframes64_t end) } the_end = min (end, the_end); cnt = the_end - the_start + 1; - - XMLNode &before = (*i)->get_state(); + + region->clear_history (); region->trim_to (the_start, cnt, this); - XMLNode &after = (*i)->get_state(); - session->add_command (new MementoCommand(*(*i), &before, &after)); + _session->add_command (new StatefulDiffCommand (region)); } - + commit_reversible_command (); -} +} void Editor::region_fill_track () { nframes64_t end; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - end = session->current_end_frame (); + end = _session->current_end_frame (); begin_reversible_command (_("region fill")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { boost::shared_ptr region ((*i)->region()); - - // FIXME - boost::shared_ptr ar = boost::dynamic_pointer_cast(region); - assert(ar); boost::shared_ptr pl = region->playlist(); @@ -3084,9 +3116,9 @@ Editor::region_fill_track () return; } - XMLNode &before = pl->get_state(); - pl->add_region (RegionFactory::create (ar), ar->last_frame(), times); - session->add_command (new MementoCommand(*pl, &before, &pl->get_state())); + pl->clear_history (); + pl->add_region (RegionFactory::create (region), region->last_frame(), times); + _session->add_command (new StatefulDiffCommand (pl)); } commit_reversible_command (); @@ -3095,7 +3127,7 @@ Editor::region_fill_track () void Editor::region_fill_selection () { - if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { + if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { return; } @@ -3111,7 +3143,7 @@ Editor::region_fill_selection () nframes64_t start = selection->time[clicked_selection].start; nframes64_t end = selection->time[clicked_selection].end; - boost::shared_ptr playlist; + boost::shared_ptr playlist; if (selection->tracks.empty()) { return; @@ -3119,21 +3151,21 @@ Editor::region_fill_selection () nframes64_t selection_length = end - start; float times = (float)selection_length / region->length(); - + begin_reversible_command (_("fill selection")); - + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { if ((playlist = (*i)->playlist()) == 0) { continue; - } - - XMLNode &before = playlist->get_state(); + } + + playlist->clear_history (); playlist->add_region (RegionFactory::create (region), start, times); - session->add_command (new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command (new StatefulDiffCommand (playlist)); } - - commit_reversible_command (); + + commit_reversible_command (); } void @@ -3151,7 +3183,7 @@ Editor::set_sync_point (nframes64_t where, const RegionSelection& rs) bool in_command = false; for (RegionSelection::const_iterator r = rs.begin(); r != rs.end(); ++r) { - + if (!(*r)->region()->covers (where)) { continue; } @@ -3163,10 +3195,9 @@ Editor::set_sync_point (nframes64_t where, const RegionSelection& rs) in_command = true; } - XMLNode &before = region->playlist()->get_state(); - region->set_sync_position (get_preferred_edit_position()); - XMLNode &after = region->playlist()->get_state(); - session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); + region->clear_history (); + region->set_sync_position (where); + _session->add_command(new StatefulDiffCommand (region)); } if (in_command) { @@ -3178,7 +3209,7 @@ Editor::set_sync_point (nframes64_t where, const RegionSelection& rs) void Editor::remove_region_sync () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -3189,10 +3220,9 @@ Editor::remove_region_sync () begin_reversible_command (_("remove sync")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - XMLNode &before = (*i)->region()->playlist()->get_state(); + (*i)->region()->clear_history (); (*i)->region()->clear_sync_position (); - XMLNode &after = (*i)->region()->playlist()->get_state(); - session->add_command(new MementoCommand(*((*i)->region()->playlist()), &before, &after)); + _session->add_command(new StatefulDiffCommand ((*i)->region())); } commit_reversible_command (); } @@ -3200,7 +3230,7 @@ Editor::remove_region_sync () void Editor::naturalize () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -3210,10 +3240,9 @@ Editor::naturalize () begin_reversible_command (_("naturalize")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - XMLNode &before = (*i)->region()->get_state(); + (*i)->region()->clear_history (); (*i)->region()->move_to_natural_position (this); - XMLNode &after = (*i)->region()->get_state(); - session->add_command (new MementoCommand(*((*i)->region().get()), &before, &after)); + _session->add_command (new StatefulDiffCommand ((*i)->region())); } commit_reversible_command (); } @@ -3221,7 +3250,7 @@ Editor::naturalize () void Editor::align (RegionPoint what) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); nframes64_t where = get_preferred_edit_position(); @@ -3240,13 +3269,13 @@ void Editor::align_relative (RegionPoint what) { nframes64_t where = get_preferred_edit_position(); - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); if (!rs.empty()) { align_selection_relative (what, where, rs); - } + } } struct RegionSortByTime { @@ -3281,7 +3310,7 @@ Editor::align_selection_relative (RegionPoint point, nframes64_t position, const dir = -1; } break; - + case End: if (position > r->last_frame()) { distance = position - r->last_frame(); @@ -3301,7 +3330,7 @@ Editor::align_selection_relative (RegionPoint point, nframes64_t position, const distance = r->position() - pos; dir = -1; } - break; + break; } if (pos == r->position()) { @@ -3312,29 +3341,27 @@ Editor::align_selection_relative (RegionPoint point, nframes64_t position, const /* move first one specially */ - XMLNode &before = r->playlist()->get_state(); + r->clear_history (); r->set_position (pos, this); - XMLNode &after = r->playlist()->get_state(); - session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); + _session->add_command(new StatefulDiffCommand (r)); /* move rest by the same amount */ - + sorted.pop_front(); - + for (list::iterator i = sorted.begin(); i != sorted.end(); ++i) { boost::shared_ptr region ((*i)->region()); - XMLNode &before = region->playlist()->get_state(); - + region->clear_history (); + if (dir > 0) { region->set_position (region->position() + distance, this); } else { region->set_position (region->position() - distance, this); } - - XMLNode &after = region->playlist()->get_state(); - session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); + + _session->add_command(new StatefulDiffCommand (region)); } @@ -3368,7 +3395,7 @@ Editor::align_region (boost::shared_ptr region, RegionPoint point, nfram void Editor::align_region_internal (boost::shared_ptr region, RegionPoint point, nframes64_t position) { - XMLNode &before = region->playlist()->get_state(); + region->clear_history (); switch (point) { case SyncPoint: @@ -3386,9 +3413,8 @@ Editor::align_region_internal (boost::shared_ptr region, RegionPoint poi break; } - XMLNode &after = region->playlist()->get_state(); - session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); -} + _session->add_command(new StatefulDiffCommand (region)); +} void Editor::trim_region_front () @@ -3418,15 +3444,16 @@ Editor::trim_region (bool front) for (list::const_iterator i = rs.by_layer().begin(); i != rs.by_layer().end(); ++i) { if (!(*i)->region()->locked()) { - boost::shared_ptr pl = (*i)->region()->playlist(); - XMLNode &before = pl->get_state(); + + (*i)->region()->clear_history (); + if (front) { - (*i)->region()->trim_front (where, this); + (*i)->region()->trim_front (where, this); } else { - (*i)->region()->trim_end (where, this); + (*i)->region()->trim_end (where, this); } - XMLNode &after = pl->get_state(); - session->add_command(new MementoCommand(*pl.get(), &before, &after)); + + _session->add_command (new StatefulDiffCommand ((*i)->region())); } } @@ -3437,7 +3464,7 @@ Editor::trim_region (bool front) void Editor::trim_region_to_loop () { - Location* loc = session->locations()->auto_loop_location(); + Location* loc = _session->locations()->auto_loop_location(); if (!loc) { return; } @@ -3447,7 +3474,7 @@ Editor::trim_region_to_loop () void Editor::trim_region_to_punch () { - Location* loc = session->locations()->auto_punch_location(); + Location* loc = _session->locations()->auto_punch_location(); if (!loc) { return; } @@ -3472,7 +3499,7 @@ Editor::trim_region_to_location (const Location& loc, const char* str) default: continue; } - + RouteTimeAxisView* tav = dynamic_cast (&rv->get_time_axis_view()); if (!tav) { return; @@ -3482,18 +3509,16 @@ Editor::trim_region_to_location (const Location& loc, const char* str) nframes64_t start; nframes64_t end; - if (tav->get_diskstream() != 0) { - speed = tav->get_diskstream()->speed(); + if (tav->track() != 0) { + speed = tav->track()->speed(); } - + start = session_frame_to_track_frame (loc.start(), speed); end = session_frame_to_track_frame (loc.end(), speed); - - XMLNode &before = rv->region()->playlist()->get_state(); + + rv->region()->clear_history (); rv->region()->trim_to (start, (end - start), this); - XMLNode &after = rv->region()->playlist()->get_state(); - session->add_command(new MementoCommand( - *(rv->region()->playlist()), &before, &after)); + _session->add_command(new StatefulDiffCommand (rv->region())); } commit_reversible_command (); @@ -3503,7 +3528,7 @@ void Editor::trim_region_to_edit_point () { RegionSelection rs; - + get_regions_for_action (rs); nframes64_t where = get_preferred_edit_position(); @@ -3525,17 +3550,15 @@ Editor::trim_region_to_edit_point () float speed = 1.0; - if (tav->get_diskstream() != 0) { - speed = tav->get_diskstream()->speed(); + if (tav->track() != 0) { + speed = tav->track()->speed(); } - XMLNode &before = rv->region()->playlist()->get_state(); - rv->region()->trim_end( session_frame_to_track_frame(where, speed), this); - XMLNode &after = rv->region()->playlist()->get_state(); - session->add_command(new MementoCommand( - *(rv->region()->playlist()), &before, &after)); + rv->region()->clear_history (); + rv->region()->trim_end (session_frame_to_track_frame(where, speed), this); + _session->add_command(new StatefulDiffCommand (rv->region())); } - + commit_reversible_command (); } @@ -3565,17 +3588,15 @@ Editor::trim_region_from_edit_point () float speed = 1.0; - if (tav->get_diskstream() != 0) { - speed = tav->get_diskstream()->speed(); + if (tav->track() != 0) { + speed = tav->track()->speed(); } - XMLNode &before = rv->region()->playlist()->get_state(); - rv->region()->trim_front ( session_frame_to_track_frame(where, speed), this); - XMLNode &after = rv->region()->playlist()->get_state(); - session->add_command(new MementoCommand( - *(rv->region()->playlist()), &before, &after)); + rv->region()->clear_history (); + rv->region()->trim_front (session_frame_to_track_frame(where, speed), this); + _session->add_command(new StatefulDiffCommand (rv->region())); } - + commit_reversible_command (); } @@ -3618,15 +3639,15 @@ Editor::trim_to_region(bool forward) float speed = 1.0; - if (atav->get_diskstream() != 0) { - speed = atav->get_diskstream()->speed(); + if (atav->track() != 0) { + speed = atav->track()->speed(); } - + boost::shared_ptr region = arv->region(); boost::shared_ptr playlist (region->playlist()); - - XMLNode &before = playlist->get_state(); + + region->clear_history (); if(forward){ @@ -3636,8 +3657,8 @@ Editor::trim_to_region(bool forward) continue; } - region->trim_end((nframes64_t) (next_region->first_frame() * speed), this); - arv->region_changed (Change (LengthChanged)); + region->trim_end((nframes64_t) ( (next_region->first_frame() - 1) * speed), this); + arv->region_changed (PropertyChange (ARDOUR::Properties::length)); } else { @@ -3647,12 +3668,12 @@ Editor::trim_to_region(bool forward) continue; } - region->trim_front((nframes64_t) ((next_region->last_frame() + 1) * speed), this); - arv->region_changed (Change (LengthChanged|PositionChanged|StartChanged)); + region->trim_front((nframes64_t) ((next_region->last_frame() + 1) * speed), this); + + arv->region_changed (ARDOUR::bounds_change); } - XMLNode &after = playlist->get_state(); - session->add_command(new MementoCommand(*playlist, &before, &after)); + _session->add_command(new StatefulDiffCommand (region)); } commit_reversible_command (); @@ -3664,69 +3685,39 @@ Editor::unfreeze_route () if (clicked_routeview == 0 || !clicked_routeview->is_track()) { return; } - + clicked_routeview->track()->unfreeze (); } void* Editor::_freeze_thread (void* arg) { - PBD::notify_gui_about_thread_creation (pthread_self(), X_("Freeze")); + SessionEvent::create_per_thread_pool ("freeze events", 64); + return static_cast(arg)->freeze_thread (); } void* Editor::freeze_thread () { - clicked_routeview->audio_track()->freeze (*current_interthread_info); + clicked_routeview->audio_track()->freeze_me (*current_interthread_info); current_interthread_info->done = true; return 0; } -gint -Editor::freeze_progress_timeout (void *arg) -{ - interthread_progress_bar.set_fraction (current_interthread_info->progress); - return !(current_interthread_info->done || current_interthread_info->cancel); -} - void Editor::freeze_route () { if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { return; } - - InterThreadInfo itt; - - if (interthread_progress_window == 0) { - build_interthread_progress_window (); - } - WindowTitle title(Glib::get_application_name()); - title += _("Freeze"); - interthread_progress_window->set_title (title.get_string()); - interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); - interthread_progress_window->show_all (); - interthread_progress_bar.set_fraction (0.0f); - interthread_progress_label.set_text (""); - interthread_cancel_label.set_text (_("Cancel Freeze")); + InterThreadInfo itt; current_interthread_info = &itt; - interthread_progress_connection = - Glib::signal_timeout().connect (bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100); - - itt.done = false; - itt.cancel = false; - itt.progress = 0.0f; - - pthread_attr_t attr; - pthread_attr_init(&attr); - pthread_attr_setstacksize(&attr, 500000); - - pthread_create_and_store (X_("freezer"), &itt.thread, &attr, _freeze_thread, this); + InterthreadProgressWindow ipw (current_interthread_info, _("Freeze"), _("Cancel Freeze")); - pthread_attr_destroy(&attr); + pthread_create_and_store (X_("freezer"), &itt.thread, _freeze_thread, this); track_canvas->get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); @@ -3734,8 +3725,6 @@ Editor::freeze_route () gtk_main_iteration (); } - interthread_progress_connection.disconnect (); - interthread_progress_window->hide_all (); current_interthread_info = 0; track_canvas->get_window()->set_cursor (*current_canvas_cursor); } @@ -3762,22 +3751,20 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) if ((rtv = dynamic_cast (*i)) == 0) { continue; } - + boost::shared_ptr playlist; - + if ((playlist = rtv->playlist()) == 0) { return; } InterThreadInfo itt; - - itt.done = false; - itt.cancel = false; - itt.progress = false; - XMLNode &before = playlist->get_state(); - boost::shared_ptr r = rtv->track()->bounce_range (start, start+cnt, itt, enable_processing); + playlist->clear_history (); + playlist->clear_owned_history (); + boost::shared_ptr r = rtv->track()->bounce_range (start, start+cnt, itt, enable_processing); + if (replace) { list ranges; ranges.push_back (AudioRange (start, start+cnt, 0)); @@ -3785,10 +3772,15 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) playlist->add_region (r, start); } - XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand (*playlist, &before, &after)); + vector cmds; + playlist->rdiff (cmds); + for (vector::iterator j = cmds.begin(); j != cmds.end(); ++j) { + _session->add_command (*j); + } + + _session->add_command (new StatefulDiffCommand (playlist)); } - + commit_reversible_command (); } @@ -3812,19 +3804,19 @@ bool Editor::can_cut_copy () const { switch (current_mouse_mode()) { - + case MouseObject: if (!selection->regions.empty() || !selection->points.empty()) { return true; } break; - + case MouseRange: if (!selection->time.empty()) { return true; } break; - + default: break; } @@ -3836,7 +3828,7 @@ Editor::can_cut_copy () const /** Cut, copy or clear selected regions, automation points or a time range. * @param op Operation (Cut, Copy or Clear) */ -void +void Editor::cut_copy (CutCopyOp op) { /* only cancel selection if cut/copy is successful.*/ @@ -3862,13 +3854,11 @@ Editor::cut_copy (CutCopyOp op) */ if (op == Cut || op == Clear) { - if (_drag) { - _drag->item()->ungrab (0); - delete _drag; - _drag = 0; + if (_drags->active ()) { + _drags->abort (); } } - + cut_buffer->clear (); if (entered_marker) { @@ -3878,84 +3868,92 @@ Editor::cut_copy (CutCopyOp op) bool ignored; Location* loc = find_location_from_marker (entered_marker, ignored); - if (session && loc) { - Glib::signal_idle().connect (bind (mem_fun(*this, &Editor::really_remove_marker), loc)); + if (_session && loc) { + Glib::signal_idle().connect (sigc::bind (sigc::mem_fun(*this, &Editor::really_remove_marker), loc)); } - break_drag (); - delete _drag; - _drag = 0; - + _drags->abort (); return; } - RegionSelection rs; + if (internal_editing()) { - /* we only want to cut regions if some are selected */ + switch (current_mouse_mode()) { + case MouseObject: + case MouseRange: + cut_copy_midi (op); + break; + default: + break; + } - if (!selection->regions.empty()) { - get_regions_for_action (rs); - } + } else { - switch (current_mouse_mode()) { - case MouseObject: - if (!rs.empty() || !selection->points.empty()) { + RegionSelection rs; + + /* we only want to cut regions if some are selected */ + + if (!selection->regions.empty()) { + get_regions_for_action (rs, false, false); + } - begin_reversible_command (opname + _(" objects")); + switch (current_mouse_mode()) { + case MouseObject: + if (!rs.empty() || !selection->points.empty()) { - if (!rs.empty()) { - cut_copy_regions (op, rs); - - if (op == Cut) { - selection->clear_regions (); + begin_reversible_command (opname + _(" objects")); + + if (!rs.empty()) { + cut_copy_regions (op, rs); + + if (op == Cut) { + selection->clear_regions (); + } } - } - if (!selection->points.empty()) { - cut_copy_points (op); + if (!selection->points.empty()) { + cut_copy_points (op); - if (op == Cut) { - selection->clear_points (); + if (op == Cut) { + selection->clear_points (); + } } + + commit_reversible_command (); + break; // terminate case statement here } + if (!selection->time.empty()) { + /* don't cause suprises */ + break; + } + // fall thru if there was nothing selected - commit_reversible_command (); - break; // terminate case statement here - } - if (!selection->time.empty()) { - /* don't cause suprises */ - break; - } - // fall thru if there was nothing selected - - case MouseRange: - if (selection->time.empty()) { - nframes64_t start, end; - if (!get_edit_op_range (start, end)) { - return; + case MouseRange: + if (selection->time.empty()) { + nframes64_t start, end; + if (!get_edit_op_range (start, end)) { + return; + } + selection->set (start, end); } - selection->set ((TimeAxisView*) 0, start, end); - } - - begin_reversible_command (opname + _(" range")); - cut_copy_ranges (op); - commit_reversible_command (); - - if (op == Cut) { - selection->clear_time (); - } - break; - - default: - break; - } + begin_reversible_command (opname + _(" range")); + cut_copy_ranges (op); + commit_reversible_command (); + + if (op == Cut) { + selection->clear_time (); + } + break; + + default: + break; + } + } if (op == Cut || op == Clear) { - break_drag (); - delete _drag; - _drag = 0; + _drags->abort (); } } @@ -3967,26 +3965,35 @@ Editor::cut_copy_points (CutCopyOp op) { for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - AutomationTimeAxisView* atv = dynamic_cast(&(*i).track); + AutomationTimeAxisView* atv = dynamic_cast((*i).track); if (atv) { atv->cut_copy_clear_objects (selection->points, op); - } + } } } -struct PlaylistState { - boost::shared_ptr playlist; - XMLNode* before; -}; +/** Cut, copy or clear selected automation points. + * @param op Operation (Cut, Copy or Clear) + */ +void +Editor::cut_copy_midi (CutCopyOp op) +{ + for (MidiRegionSelection::iterator i = selection->midi_regions.begin(); i != selection->midi_regions.end(); ++i) { + MidiRegionView* mrv = *i; + mrv->cut_copy_clear (op); + } +} + + struct lt_playlist { bool operator () (const PlaylistState& a, const PlaylistState& b) { return a.playlist < b.playlist; } }; - -struct PlaylistMapping { + +struct PlaylistMapping { TimeAxisView* tv; boost::shared_ptr pl; @@ -4002,12 +4009,11 @@ Editor::remove_clicked_region () } boost::shared_ptr playlist = clicked_routeview->playlist(); - + begin_reversible_command (_("remove region")); - XMLNode &before = playlist->get_state(); + playlist->clear_history (); playlist->remove_region (clicked_regionview->region()); - XMLNode &after = playlist->get_state(); - session->add_command(new MementoCommand(*playlist, &before, &after)); + _session->add_command(new StatefulDiffCommand (playlist)); commit_reversible_command (); } @@ -4016,10 +4022,10 @@ Editor::remove_clicked_region () void Editor::remove_selected_regions () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - - if (!session) { + + if (!_session) { return; } @@ -4040,12 +4046,12 @@ Editor::remove_selected_regions () // so, first iterate over the regions to be removed from rs and // add them to the regions_to_remove list, and then // iterate over the list to actually remove them. - + regions_to_remove.push_back ((*i)->region()); } - vector playlists; - + vector > playlists; + for (list >::iterator rl = regions_to_remove.begin(); rl != regions_to_remove.end(); ++rl) { boost::shared_ptr playlist = (*rl)->playlist(); @@ -4055,33 +4061,31 @@ Editor::remove_selected_regions () continue; } - vector::iterator i; + vector >::iterator i; - //only take state if this is a new playlist. + //only prep history if this is a new playlist. for (i = playlists.begin(); i != playlists.end(); ++i) { - if ((*i).playlist == playlist) { + if ((*i) == playlist) { break; } } if (i == playlists.end()) { - PlaylistState before; - before.playlist = playlist; - before.before = &playlist->get_state(); - + playlist->clear_history (); playlist->freeze (); - playlists.push_back(before); + + playlists.push_back (playlist); } - playlist->remove_region (*rl); + playlist->remove_region (*rl); } - vector::iterator pl; + vector >::iterator pl; for (pl = playlists.begin(); pl != playlists.end(); ++pl) { - (*pl).playlist->thaw (); - session->add_command(new MementoCommand(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state())); + (*pl)->thaw (); + _session->add_command(new StatefulDiffCommand (*pl)); } commit_reversible_command (); @@ -4100,12 +4104,12 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) vector pmap; nframes64_t first_position = max_frames; - - set freezelist; - pair::iterator,bool> insert_result; - + + typedef set > FreezeList; + FreezeList freezelist; + /* get ordering correct before we cut/copy */ - + rs.sort_by_position_and_track (); for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { @@ -4116,21 +4120,19 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) boost::shared_ptr pl = (*x)->region()->playlist(); if (pl) { - set::iterator fl; + FreezeList::iterator fl; //only take state if this is a new playlist. for (fl = freezelist.begin(); fl != freezelist.end(); ++fl) { - if ((*fl).playlist == pl) { + if ((*fl) == pl) { break; } } - + if (fl == freezelist.end()) { - PlaylistState before; - before.playlist = pl; - before.before = &pl->get_state(); + pl->clear_history(); pl->freeze (); - insert_result = freezelist.insert (before); + freezelist.insert (pl); } } } @@ -4143,7 +4145,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) break; } } - + if (z == pmap.end()) { pmap.push_back (PlaylistMapping (tv)); } @@ -4152,7 +4154,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ) { boost::shared_ptr pl = (*x)->region()->playlist(); - + if (!pl) { /* impossible, but this handles it for the future */ continue; @@ -4161,28 +4163,28 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) TimeAxisView& tv = (*x)->get_trackview(); boost::shared_ptr npl; RegionSelection::iterator tmp; - + tmp = x; ++tmp; vector::iterator z; - + for (z = pmap.begin(); z != pmap.end(); ++z) { if ((*z).tv == &tv) { break; } } - + assert (z != pmap.end()); - + if (!(*z).pl) { - npl = PlaylistFactory::create (pl->data_type(), *session, "cutlist", true); + npl = PlaylistFactory::create (pl->data_type(), *_session, "cutlist", true); npl->freeze(); (*z).pl = npl; } else { npl = (*z).pl; } - + boost::shared_ptr r = (*x)->region(); boost::shared_ptr _xx; @@ -4194,12 +4196,12 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) npl->add_region (_xx, r->position() - first_position); pl->remove_region (r); break; - + case Copy: /* copy region before adding, so we're not putting same object into two different playlists */ npl->add_region (RegionFactory::create (r), r->position() - first_position); break; - + case Clear: pl->remove_region (r); break; @@ -4207,32 +4209,32 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) x = tmp; } - + list > foo; - + /* the pmap is in the same order as the tracks in which selected regions occured */ - + for (vector::iterator i = pmap.begin(); i != pmap.end(); ++i) { (*i).pl->thaw(); foo.push_back ((*i).pl); } - + if (!foo.empty()) { cut_buffer->set (foo); } - - for (set::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) { - (*pl).playlist->thaw (); - session->add_command (new MementoCommand(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state())); + + for (FreezeList::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) { + (*pl)->thaw (); + _session->add_command (new StatefulDiffCommand (*pl)); } } void Editor::cut_copy_ranges (CutCopyOp op) { - TrackSelection* ts; - TrackSelection entered; + TrackViewList* ts; + TrackViewList entered; if (selection->tracks.empty()) { if (!entered_track) { @@ -4274,8 +4276,14 @@ Editor::paste_internal (nframes64_t position, float times) { bool commit = false; - if (cut_buffer->empty()) { - return; + if (internal_editing()) { + if (cut_buffer->midi_notes.empty()) { + return; + } + } else { + if (cut_buffer->empty()) { + return; + } } if (position == max_frames) { @@ -4284,13 +4292,12 @@ Editor::paste_internal (nframes64_t position, float times) begin_reversible_command (_("paste")); - TrackSelection ts; - TrackSelection::iterator i; + TrackViewList ts; + TrackViewList::iterator i; size_t nth; /* get everything in the correct order */ - if (!selection->tracks.empty()) { sort_track_selection (); ts = selection->tracks; @@ -4300,81 +4307,48 @@ Editor::paste_internal (nframes64_t position, float times) for (nth = 0, i = ts.begin(); i != ts.end(); ++i, ++nth) { - /* undo/redo is handled by individual tracks */ - - if ((*i)->paste (position, times, *cut_buffer, nth)) { - commit = true; - } - } - - if (commit) { - commit_reversible_command (); - } -} - -void -Editor::paste_named_selection (float times) -{ - TrackSelection::iterator t; - - Glib::RefPtr selected = named_selection_display.get_selection(); - - if (selected->count_selected_rows() != 1 || selection->tracks.empty()) { - return; - } - - TreeModel::iterator i = selected->get_selected(); - NamedSelection* ns = (*i)[named_selection_columns.selection]; + /* undo/redo is handled by individual tracks/regions */ - list >::iterator chunk; - list >::iterator tmp; + if (internal_editing()) { - chunk = ns->playlists.begin(); - - begin_reversible_command (_("paste chunk")); - - sort_track_selection (); + RegionSelection rs; + RegionSelection::iterator r; + MidiNoteSelection::iterator cb; - for (t = selection->tracks.begin(); t != selection->tracks.end(); ++t) { - - RouteTimeAxisView* rtv; - boost::shared_ptr pl; - boost::shared_ptr apl; + get_regions_at (rs, position, ts); - if ((rtv = dynamic_cast (*t)) == 0) { - continue; - } - - if ((pl = rtv->playlist()) == 0) { - continue; - } - - if ((apl = boost::dynamic_pointer_cast (pl)) == 0) { - continue; - } - - tmp = chunk; - ++tmp; + for (cb = cut_buffer->midi_notes.begin(), r = rs.begin(); + cb != cut_buffer->midi_notes.end() && r != rs.end(); ++r) { + MidiRegionView* mrv = dynamic_cast (*r); + if (mrv) { + mrv->paste (position, times, **cb); + ++cb; + } + } - XMLNode &before = apl->get_state(); - apl->paste (*chunk, get_preferred_edit_position(), times); - session->add_command(new MementoCommand(*apl, &before, &apl->get_state())); + } else { - if (tmp != ns->playlists.end()) { - chunk = tmp; + if ((*i)->paste (position, times, *cut_buffer, nth)) { + commit = true; + } } } - commit_reversible_command(); + if (commit) { + commit_reversible_command (); + } } void Editor::duplicate_some_regions (RegionSelection& regions, float times) { - boost::shared_ptr playlist; + boost::shared_ptr playlist; RegionSelection sel = regions; // clear (below) may clear the argument list if its the current region selection RegionSelection foo; + nframes_t const start_frame = regions.start (); + nframes_t const end_frame = regions.end_frame (); + begin_reversible_command (_("duplicate region")); selection->clear_regions (); @@ -4386,15 +4360,15 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) TimeAxisView& tv = (*i)->get_time_axis_view(); RouteTimeAxisView* rtv = dynamic_cast (&tv); latest_regionviews.clear (); - sigc::connection c = rtv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view)); - + sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)); + playlist = (*i)->region()->playlist(); - XMLNode &before = playlist->get_state(); - playlist->duplicate (r, r->last_frame(), times); - session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); + playlist->clear_history (); + playlist->duplicate (r, end_frame + (r->first_frame() - start_frame), times); + _session->add_command(new StatefulDiffCommand (playlist)); c.disconnect (); - + foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); } @@ -4412,16 +4386,16 @@ Editor::duplicate_selection (float times) return; } - boost::shared_ptr playlist; + boost::shared_ptr playlist; vector > new_regions; vector >::iterator ri; - + create_region_from_selection (new_regions); if (new_regions.empty()) { return; } - + begin_reversible_command (_("duplicate selection")); ri = new_regions.begin(); @@ -4430,10 +4404,9 @@ Editor::duplicate_selection (float times) if ((playlist = (*i)->playlist()) == 0) { continue; } - XMLNode &before = playlist->get_state(); + playlist->clear_history (); playlist->duplicate (*ri, selection->time[clicked_selection].end, times); - XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand(*playlist, &before, &after)); + _session->add_command (new StatefulDiffCommand (playlist)); ++ri; if (ri == new_regions.end()) { @@ -4450,12 +4423,12 @@ Editor::reset_point_selection () /* reset all selected points to the relevant default value */ for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - - AutomationTimeAxisView* atv = dynamic_cast(&(*i).track); - + + AutomationTimeAxisView* atv = dynamic_cast((*i).track); + if (atv) { atv->reset_objects (selection->points); - } + } } } @@ -4477,17 +4450,16 @@ void Editor::clear_playlist (boost::shared_ptr playlist) { begin_reversible_command (_("clear playlist")); - XMLNode &before = playlist->get_state(); + playlist->clear_history (); playlist->clear (); - XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand(*playlist.get(), &before, &after)); + _session->add_command (new StatefulDiffCommand (playlist)); commit_reversible_command (); } void Editor::nudge_track (bool use_edit, bool forwards) { - boost::shared_ptr playlist; + boost::shared_ptr playlist; nframes64_t distance; nframes64_t next_distance; nframes64_t start; @@ -4501,26 +4473,36 @@ Editor::nudge_track (bool use_edit, bool forwards) if ((distance = get_nudge_distance (start, next_distance)) == 0) { return; } - + if (selection->tracks.empty()) { return; } - + begin_reversible_command (_("nudge track")); - + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { if ((playlist = (*i)->playlist()) == 0) { continue; - } - - XMLNode &before = playlist->get_state(); + } + + playlist->clear_history (); + playlist->clear_owned_history (); + playlist->nudge_after (start, distance, forwards); - XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand(*playlist, &before, &after)); + + vector cmds; + + playlist->rdiff (cmds); + + for (vector::iterator c = cmds.begin(); c != cmds.end(); ++c) { + _session->add_command (*c); + } + + _session->add_command (new StatefulDiffCommand (playlist)); } - - commit_reversible_command (); + + commit_reversible_command (); } void @@ -4528,8 +4510,8 @@ Editor::remove_last_capture () { vector choices; string prompt; - - if (!session) { + + if (!_session) { return; } @@ -4539,34 +4521,38 @@ Editor::remove_last_capture () choices.push_back (_("No, do nothing.")); choices.push_back (_("Yes, destroy it.")); - - Gtkmm2ext::Choice prompter (prompt, choices); - + + Gtkmm2ext::Choice prompter (_("Destroy last capture"), prompt, choices); + if (prompter.run () == 1) { - session->remove_last_capture (); + _session->remove_last_capture (); + _regions->redisplay (); } } else { - session->remove_last_capture(); + _session->remove_last_capture(); + _regions->redisplay (); } } void Editor::normalize_region () { - if (!session) { + if (!_session) { return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); if (rs.empty()) { return; } - + Dialog dialog (rs.size() > 1 ? _("Normalize regions") : _("Normalize region")); HBox hbox; + hbox.set_spacing (6); + hbox.set_border_width (6); hbox.pack_start (*manage (new Label (_("Normalize to:")))); SpinButton spin (0.2, 2); spin.set_range (-112, 0); @@ -4576,6 +4562,7 @@ Editor::normalize_region () spin.set_value (_last_normalization_value); hbox.pack_start (*manage (new Label (_("dbFS")))); hbox.show_all (); + dialog.get_vbox()->set_spacing (12); dialog.get_vbox()->pack_start (hbox); dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL); dialog.add_button (_("Normalize"), RESPONSE_ACCEPT); @@ -4593,9 +4580,10 @@ Editor::normalize_region () AudioRegionView* const arv = dynamic_cast(*r); if (!arv) continue; - XMLNode &before = arv->region()->get_state(); + arv->region()->clear_history (); arv->audio_region()->normalize_to (spin.get_value()); - session->add_command (new MementoCommand(*(arv->region().get()), &before, &arv->region()->get_state())); + _session->add_command (new StatefulDiffCommand (arv->region())); + } commit_reversible_command (); @@ -4606,13 +4594,13 @@ Editor::normalize_region () void -Editor::denormalize_region () +Editor::reset_region_scale_amplitude () { - if (!session) { + if (!_session) { return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -4620,15 +4608,15 @@ Editor::denormalize_region () return; } - begin_reversible_command ("denormalize"); + begin_reversible_command ("reset gain"); for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { AudioRegionView* const arv = dynamic_cast(*r); if (!arv) continue; - XMLNode &before = arv->region()->get_state(); + arv->region()->clear_history (); arv->audio_region()->set_scale_amplitude (1.0f); - session->add_command (new MementoCommand(*(arv->region().get()), &before, &arv->region()->get_state())); + _session->add_command (new StatefulDiffCommand (arv->region())); } commit_reversible_command (); @@ -4637,11 +4625,11 @@ Editor::denormalize_region () void Editor::adjust_region_scale_amplitude (bool up) { - if (!session) { + if (!_session) { return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -4653,12 +4641,14 @@ Editor::adjust_region_scale_amplitude (bool up) for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { AudioRegionView* const arv = dynamic_cast(*r); - if (!arv) + if (!arv) { continue; - XMLNode &before = arv->region()->get_state(); - + } + + arv->region()->clear_history (); + double fraction = gain_to_slider_position (arv->audio_region()->scale_amplitude ()); - + if (up) { fraction += 0.05; fraction = min (fraction, 1.0); @@ -4672,15 +4662,13 @@ Editor::adjust_region_scale_amplitude (bool up) } fraction = slider_position_to_gain (fraction); - fraction = coefficient_to_dB (fraction); - fraction = dB_to_coefficient (fraction); if (up && fraction >= 2.0) { continue; } - + arv->audio_region()->set_scale_amplitude (fraction); - session->add_command (new MementoCommand(*(arv->region().get()), &before, &arv->region()->get_state())); + _session->add_command (new StatefulDiffCommand (arv->region())); } commit_reversible_command (); @@ -4690,18 +4678,18 @@ Editor::adjust_region_scale_amplitude (bool up) void Editor::reverse_region () { - if (!session) { + if (!_session) { return; } - Reverse rev (*session); + Reverse rev (*_session); apply_filter (rev, _("reverse regions")); } void Editor::strip_region_silence () { - if (!session) { + if (!_session) { return; } @@ -4713,40 +4701,74 @@ Editor::strip_region_silence () } std::list > ar; - + for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast (*i); if (arv) { ar.push_back (arv->audio_region ()); } } - - StripSilenceDialog d (ar); + + StripSilenceDialog d (_session, ar); int const r = d.run (); if (r == Gtk::RESPONSE_OK) { - StripSilence s (*session, d.threshold (), d.minimum_length (), d.fade_length ()); + StripSilence s (*_session, d.threshold (), d.minimum_length (), d.fade_length ()); apply_filter (s, _("strip silence")); } } +Command* +Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv) +{ + Evoral::Sequence::Notes selected; + mrv.selection_as_notelist (selected, true); + + vector::Notes> v; + v.push_back (selected); + + return op (mrv.midi_region()->model(), v); +} void -Editor::quantize_region () +Editor::apply_midi_note_edit_op (MidiOperator& op) { - if (!session) { + RegionSelection rs; + Command* cmd; + + get_regions_for_action (rs); + + if (rs.empty()) { return; } - // FIXME: varying meter? - Quantize quant (*session, snap_length_beats(0)); - apply_filter (quant, _("quantize regions")); + begin_reversible_command (op.name ()); + + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { + RegionSelection::iterator tmp = r; + ++tmp; + + MidiRegionView* const mrv = dynamic_cast (*r); + + if (mrv) { + cmd = apply_midi_note_edit_op_to_region (op, *mrv); + if (cmd) { + (*cmd)(); + _session->add_command (cmd); + } + } + + r = tmp; + } + + commit_reversible_command (); + rs.clear (); } void -Editor::apply_filter (Filter& filter, string command) +Editor::fork_region () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -4754,7 +4776,7 @@ Editor::apply_filter (Filter& filter, string command) return; } - begin_reversible_command (command); + begin_reversible_command (_("Fork Region(s)")); track_canvas->get_window()->set_cursor (*wait_cursor); gdk_flush (); @@ -4764,25 +4786,81 @@ Editor::apply_filter (Filter& filter, string command) ++tmp; MidiRegionView* const mrv = dynamic_cast(*r); + if (mrv) { - if (mrv->midi_region()->apply(filter) == 0) { - mrv->redisplay_model(); - } + boost::shared_ptr playlist = mrv->region()->playlist(); + boost::shared_ptr newregion = mrv->midi_region()->clone (); + + playlist->clear_history (); + playlist->replace_region (mrv->region(), newregion, mrv->region()->position()); + _session->add_command(new StatefulDiffCommand (playlist)); } + r = tmp; + } + + commit_reversible_command (); + rs.clear (); + + track_canvas->get_window()->set_cursor (*current_canvas_cursor); +} + +void +Editor::quantize_region () +{ + if (!_session) { + return; + } + + QuantizeDialog* qd = new QuantizeDialog (*this); + + qd->present (); + const int r = qd->run (); + qd->hide (); + + if (r == Gtk::RESPONSE_OK) { + Quantize quant (*_session, Plain, + qd->snap_start(), qd->snap_end(), + qd->start_grid_size(), qd->end_grid_size(), + qd->strength(), qd->swing(), qd->threshold()); + + apply_midi_note_edit_op (quant); + } +} + +void +Editor::apply_filter (Filter& filter, string command) +{ + RegionSelection rs; + + get_regions_for_action (rs); + + if (rs.empty()) { + return; + } + + begin_reversible_command (command); + + track_canvas->get_window()->set_cursor (*wait_cursor); + gdk_flush (); + + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ) { + RegionSelection::iterator tmp = r; + ++tmp; + AudioRegionView* const arv = dynamic_cast(*r); if (arv) { boost::shared_ptr playlist = arv->region()->playlist(); if (arv->audio_region()->apply (filter) == 0) { - XMLNode &before = playlist->get_state(); - + playlist->clear_history (); + if (filter.results.empty ()) { /* no regions returned; remove the old one */ playlist->remove_region (arv->region ()); - + } else { std::vector >::iterator res = filter.results.begin (); @@ -4796,11 +4874,10 @@ Editor::apply_filter (Filter& filter, string command) playlist->add_region (*res, (*res)->position()); ++res; } - + } - XMLNode &after = playlist->get_state(); - session->add_command(new MementoCommand(*playlist, &before, &after)); + _session->add_command(new StatefulDiffCommand (playlist)); } else { goto out; } @@ -4854,7 +4931,7 @@ void Editor::brush (nframes64_t pos) { RegionSelection sel; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -4872,13 +4949,13 @@ Editor::brush (nframes64_t pos) void Editor::reset_region_gain_envelopes () { - RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection rs = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - session->begin_reversible_command (_("reset region gain")); + _session->begin_reversible_command (_("reset region gain")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); @@ -4887,144 +4964,139 @@ Editor::reset_region_gain_envelopes () XMLNode& before (alist->get_state()); arv->audio_region()->set_default_envelope (); - session->add_command (new MementoCommand(*arv->audio_region()->envelope().get(), &before, &alist->get_state())); + _session->add_command (new MementoCommand(*arv->audio_region()->envelope().get(), &before, &alist->get_state())); } } - session->commit_reversible_command (); + _session->commit_reversible_command (); } void Editor::toggle_gain_envelope_visibility () { - RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection rs = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - session->begin_reversible_command (_("region gain envelope visible")); + _session->begin_reversible_command (_("region gain envelope visible")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { - XMLNode &before = arv->region()->get_state (); + arv->region()->clear_history (); arv->set_envelope_visible (!arv->envelope_visible()); - XMLNode &after = arv->region()->get_state (); - session->add_command (new MementoCommand (*(arv->region().get()), &before, &after)); + _session->add_command (new StatefulDiffCommand (arv->region())); } } - session->commit_reversible_command (); + _session->commit_reversible_command (); } void Editor::toggle_gain_envelope_active () { - RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection rs = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - - session->begin_reversible_command (_("region gain envelope active")); + + _session->begin_reversible_command (_("region gain envelope active")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView* const arv = dynamic_cast(*i); if (arv) { - XMLNode &before = arv->region()->get_state (); + arv->region()->clear_history (); arv->audio_region()->set_envelope_active (!arv->audio_region()->envelope_active()); - XMLNode &after = arv->region()->get_state (); - session->add_command (new MementoCommand (*(arv->region().get()), &before, &after)); + _session->add_command (new StatefulDiffCommand (arv->region())); } } - session->commit_reversible_command (); + _session->commit_reversible_command (); } void Editor::toggle_region_lock () { - RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection rs = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - - session->begin_reversible_command (_("region lock")); + + _session->begin_reversible_command (_("region lock")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - XMLNode &before = (*i)->region()->get_state (); + (*i)->region()->clear_history (); (*i)->region()->set_locked (!(*i)->region()->locked()); - XMLNode &after = (*i)->region()->get_state (); - session->add_command (new MementoCommand (*((*i)->region().get()), &before, &after)); + _session->add_command (new StatefulDiffCommand ((*i)->region())); } - session->commit_reversible_command (); + _session->commit_reversible_command (); } void -Editor::set_region_lock_style (Region::PositionLockStyle ps) +Editor::toggle_region_lock_style () { - RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection rs = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - - session->begin_reversible_command (_("region lock style")); + + _session->begin_reversible_command (_("region lock style")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - XMLNode &before = (*i)->region()->get_state (); - (*i)->region()->set_position_lock_style (ps); - XMLNode &after = (*i)->region()->get_state (); - session->add_command (new MementoCommand (*((*i)->region().get()), &before, &after)); + (*i)->region()->clear_history (); + PositionLockStyle const ns = (*i)->region()->position_lock_style() == AudioTime ? MusicTime : AudioTime; + (*i)->region()->set_position_lock_style (ns); + _session->add_command (new StatefulDiffCommand ((*i)->region())); } - session->commit_reversible_command (); + _session->commit_reversible_command (); } void Editor::toggle_region_mute () { - RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection rs = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - - session->begin_reversible_command (_("region mute")); + + _session->begin_reversible_command (_("region mute")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - XMLNode &before = (*i)->region()->get_state (); + (*i)->region()->clear_history (); (*i)->region()->set_muted (!(*i)->region()->muted()); - XMLNode &after = (*i)->region()->get_state (); - session->add_command (new MementoCommand (*((*i)->region().get()), &before, &after)); + _session->add_command (new StatefulDiffCommand ((*i)->region())); } - session->commit_reversible_command (); + _session->commit_reversible_command (); } void Editor::toggle_region_opaque () { - RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); + RegionSelection rs = get_equivalent_regions (selection->regions, ARDOUR::Properties::edit.property_id); - if (!session || rs.empty()) { + if (!_session || rs.empty()) { return; } - - session->begin_reversible_command (_("region opacity")); + + _session->begin_reversible_command (_("region opacity")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { - XMLNode &before = (*i)->region()->get_state (); + (*i)->region()->clear_history (); (*i)->region()->set_opaque (!(*i)->region()->opaque()); - XMLNode &after = (*i)->region()->get_state (); - session->add_command (new MementoCommand (*((*i)->region().get()), &before, &after)); + _session->add_command (new StatefulDiffCommand ((*i)->region())); } - session->commit_reversible_command (); + _session->commit_reversible_command (); } void @@ -5044,7 +5116,7 @@ Editor::toggle_record_enable () first = false; } - rtav->track()->set_record_enable(new_state, this); + rtav->track()->set_record_enabled (new_state, this); } } @@ -5052,7 +5124,7 @@ Editor::toggle_record_enable () void Editor::set_fade_length (bool in) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs, true); @@ -5066,8 +5138,8 @@ Editor::set_fade_length (bool in) nframes64_t pos = get_preferred_edit_position(); nframes64_t len; - char* cmd; - + char const * cmd; + if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) { /* edit point is outside the relevant region */ return; @@ -5114,9 +5186,9 @@ Editor::set_fade_length (bool in) tmp->audio_region()->set_fade_out_length (len); tmp->audio_region()->set_fade_out_active (true); } - + XMLNode &after = alist->get_state(); - session->add_command(new MementoCommand(*alist, &before, &after)); + _session->add_command(new MementoCommand(*alist, &before, &after)); } commit_reversible_command (); @@ -5125,7 +5197,7 @@ Editor::set_fade_length (bool in) void Editor::toggle_fade_active (bool in) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5141,7 +5213,7 @@ Editor::toggle_fade_active (bool in) for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { AudioRegionView* tmp = dynamic_cast (*x); - + if (!tmp) { return; } @@ -5149,7 +5221,7 @@ Editor::toggle_fade_active (bool in) boost::shared_ptr region (tmp->audio_region()); /* make the behaviour consistent across all regions */ - + if (!have_switch) { if (in) { yn = region->fade_in_active(); @@ -5159,14 +5231,15 @@ Editor::toggle_fade_active (bool in) have_switch = true; } - XMLNode &before = region->get_state(); + region->clear_history (); + if (in) { region->set_fade_in_active (!yn); } else { region->set_fade_out_active (!yn); } - XMLNode &after = region->get_state(); - session->add_command(new MementoCommand(*region.get(), &before, &after)); + + _session->add_command(new StatefulDiffCommand (region)); } commit_reversible_command (); @@ -5175,7 +5248,7 @@ Editor::toggle_fade_active (bool in) void Editor::set_fade_in_shape (AudioRegion::FadeShape shape) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5196,19 +5269,19 @@ Editor::set_fade_in_shape (AudioRegion::FadeShape shape) XMLNode &before = alist->get_state(); tmp->audio_region()->set_fade_in_shape (shape); - + XMLNode &after = alist->get_state(); - session->add_command(new MementoCommand(*alist.get(), &before, &after)); + _session->add_command(new MementoCommand(*alist.get(), &before, &after)); } commit_reversible_command (); - + } void Editor::set_fade_out_shape (AudioRegion::FadeShape shape) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5229,9 +5302,9 @@ Editor::set_fade_out_shape (AudioRegion::FadeShape shape) XMLNode &before = alist->get_state(); tmp->audio_region()->set_fade_out_shape (shape); - + XMLNode &after = alist->get_state(); - session->add_command(new MementoCommand(*alist.get(), &before, &after)); + _session->add_command(new MementoCommand(*alist.get(), &before, &after)); } commit_reversible_command (); @@ -5240,7 +5313,7 @@ Editor::set_fade_out_shape (AudioRegion::FadeShape shape) void Editor::set_fade_in_active (bool yn) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5259,13 +5332,10 @@ Editor::set_fade_in_active (bool yn) boost::shared_ptr ar (tmp->audio_region()); - - XMLNode &before = ar->get_state(); - - ar->set_fade_in_active (yn); - XMLNode &after = ar->get_state(); - session->add_command(new MementoCommand(*ar, &before, &after)); + ar->clear_history (); + ar->set_fade_in_active (yn); + _session->add_command (new StatefulDiffCommand (ar)); } commit_reversible_command (); @@ -5274,7 +5344,7 @@ Editor::set_fade_in_active (bool yn) void Editor::set_fade_out_active (bool yn) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5293,12 +5363,9 @@ Editor::set_fade_out_active (bool yn) boost::shared_ptr ar (tmp->audio_region()); - XMLNode &before = ar->get_state(); - + ar->clear_history (); ar->set_fade_out_active (yn); - - XMLNode &after = ar->get_state(); - session->add_command(new MementoCommand(*ar, &before, &after)); + _session->add_command(new StatefulDiffCommand (ar)); } commit_reversible_command (); @@ -5313,7 +5380,7 @@ Editor::toggle_selected_region_fades (int dir) bool yn; get_regions_for_action (rs); - + if (rs.empty()) { return; } @@ -5354,7 +5421,7 @@ Editor::toggle_selected_region_fades (int dir) void Editor::update_region_fade_visibility () { - bool _fade_visibility = session->config.get_show_region_fades (); + bool _fade_visibility = _session->config.get_show_region_fades (); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { AudioTimeAxisView* v = dynamic_cast(*i); @@ -5372,8 +5439,8 @@ Editor::update_region_fade_visibility () void Editor::update_xfade_visibility () { - _xfade_visibility = session->config.get_xfades_visible (); - + _xfade_visibility = _session->config.get_xfades_visible (); + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { AudioTimeAxisView* v = dynamic_cast(*i); if (v) { @@ -5395,11 +5462,11 @@ Editor::set_edit_point () if (!mouse_frame (where, ignored)) { return; } - + snap_to (where); if (selection->markers.empty()) { - + mouse_add_new_marker (where); } else { @@ -5417,7 +5484,7 @@ void Editor::set_playhead_cursor () { if (entered_marker) { - session->request_locate (entered_marker->position(), session->transport_rolling()); + _session->request_locate (entered_marker->position(), _session->transport_rolling()); } else { nframes64_t where; bool ignored; @@ -5425,11 +5492,11 @@ Editor::set_playhead_cursor () if (!mouse_frame (where, ignored)) { return; } - + snap_to (where); - - if (session) { - session->request_locate (where, session->transport_rolling()); + + if (_session) { + _session->request_locate (where, _session->transport_rolling()); } } } @@ -5437,8 +5504,15 @@ Editor::set_playhead_cursor () void Editor::split () { - RegionSelection rs; - + if (((mouse_mode == MouseRange) || + (mouse_mode != MouseObject && _join_object_range_state == JOIN_OBJECT_RANGE_RANGE)) && + !selection->time.empty()) { + separate_regions_between (selection->time); + return; + } + + RegionSelection rs; + get_regions_for_action (rs, true); nframes64_t where = get_preferred_edit_position(); @@ -5571,31 +5645,31 @@ Editor::ensure_track_visible(TimeAxisView *track) void Editor::set_loop_from_selection (bool play) { - if (session == 0 || selection->time.empty()) { + if (_session == 0 || selection->time.empty()) { return; } nframes64_t start = selection->time[clicked_selection].start; nframes64_t end = selection->time[clicked_selection].end; - + set_loop_range (start, end, _("set loop range from selection")); if (play) { - session->request_play_loop (true); - session->request_locate (start, true); + _session->request_play_loop (true); + _session->request_locate (start, true); } } void Editor::set_loop_from_edit_range (bool play) { - if (session == 0) { + if (_session == 0) { return; } nframes64_t start; nframes64_t end; - + if (!get_edit_op_range (start, end)) { return; } @@ -5603,8 +5677,8 @@ Editor::set_loop_from_edit_range (bool play) set_loop_range (start, end, _("set loop range from edit range")); if (play) { - session->request_play_loop (true); - session->request_locate (start, true); + _session->request_play_loop (true); + _session->request_locate (start, true); } } @@ -5614,7 +5688,7 @@ Editor::set_loop_from_region (bool play) nframes64_t start = max_frames; nframes64_t end = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5634,34 +5708,34 @@ Editor::set_loop_from_region (bool play) set_loop_range (start, end, _("set loop range from region")); if (play) { - session->request_play_loop (true); - session->request_locate (start, true); + _session->request_play_loop (true); + _session->request_locate (start, true); } } void Editor::set_punch_from_selection () { - if (session == 0 || selection->time.empty()) { + if (_session == 0 || selection->time.empty()) { return; } nframes64_t start = selection->time[clicked_selection].start; nframes64_t end = selection->time[clicked_selection].end; - + set_punch_range (start, end, _("set punch range from selection")); } void Editor::set_punch_from_edit_range () { - if (session == 0) { + if (_session == 0) { return; } nframes64_t start; nframes64_t end; - + if (!get_edit_op_range (start, end)) { return; } @@ -5675,7 +5749,7 @@ Editor::set_punch_from_region () nframes64_t start = max_frames; nframes64_t end = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5698,25 +5772,25 @@ Editor::set_punch_from_region () void Editor::pitch_shift_regions () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); - + if (rs.empty()) { return; } pitch_shift (rs, 1.2); } - + void Editor::use_region_as_bar () { - if (!session) { + if (!_session) { return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5742,8 +5816,8 @@ void Editor::define_one_bar (nframes64_t start, nframes64_t end) { nframes64_t length = end - start; - - const Meter& m (session->tempo_map().meter_at (start)); + + const Meter& m (_session->tempo_map().meter_at (start)); /* length = 1 bar */ @@ -5752,24 +5826,24 @@ Editor::define_one_bar (nframes64_t start, nframes64_t end) */ double frames_per_beat = length / m.beats_per_bar(); - + /* beats per minute = */ - double beats_per_minute = (session->frame_rate() * 60.0) / frames_per_beat; + double beats_per_minute = (_session->frame_rate() * 60.0) / frames_per_beat; /* now decide whether to: - (a) set global tempo + (a) set global tempo (b) add a new tempo marker */ - const TempoSection& t (session->tempo_map().tempo_section_at (start)); + const TempoSection& t (_session->tempo_map().tempo_section_at (start)); bool do_global = false; - if ((session->tempo_map().n_tempos() == 1) && (session->tempo_map().n_meters() == 1)) { - + if ((_session->tempo_map().n_tempos() == 1) && (_session->tempo_map().n_meters() == 1)) { + /* only 1 tempo & 1 meter: ask if the user wants to set the tempo at the start, or create a new marker */ @@ -5778,8 +5852,13 @@ Editor::define_one_bar (nframes64_t start, nframes64_t end) options.push_back (_("Cancel")); options.push_back (_("Add new marker")); options.push_back (_("Set global tempo")); - Choice c (_("Do you want to set the global tempo or add new tempo marker?"), - options); + + Choice c ( + _("Define one bar"), + _("Do you want to set the global tempo or add a new tempo marker?"), + options + ); + c.set_default_response (2); switch (c.run()) { @@ -5798,24 +5877,24 @@ Editor::define_one_bar (nframes64_t start, nframes64_t end) /* more than 1 tempo and/or meter section already, go ahead do the "usual": if the marker is at the region starter, change it, otherwise add - a new tempo marker + a new tempo marker */ } begin_reversible_command (_("set tempo from region")); - XMLNode& before (session->tempo_map().get_state()); + XMLNode& before (_session->tempo_map().get_state()); if (do_global) { - session->tempo_map().change_initial_tempo (beats_per_minute, t.note_type()); + _session->tempo_map().change_initial_tempo (beats_per_minute, t.note_type()); } else if (t.frame() == start) { - session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type()); + _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type()); } else { - session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), start); + _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), start); } - XMLNode& after (session->tempo_map().get_state()); + XMLNode& after (_session->tempo_map().get_state()); - session->add_command (new MementoCommand(session->tempo_map(), &before, &after)); + _session->add_command (new MementoCommand(_session->tempo_map(), &before, &after)); commit_reversible_command (); } @@ -5824,11 +5903,11 @@ Editor::split_region_at_transients () { AnalysisFeatureList positions; - if (!session) { + if (!_session) { return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5836,7 +5915,7 @@ Editor::split_region_at_transients () return; } - session->begin_reversible_command (_("split regions")); + _session->begin_reversible_command (_("split regions")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ) { @@ -5846,16 +5925,16 @@ Editor::split_region_at_transients () ++tmp; boost::shared_ptr ar = boost::dynamic_pointer_cast ((*i)->region()); - + if (ar && (ar->get_transients (positions) == 0)) { split_region_at_points ((*i)->region(), positions, true); positions.clear (); } - + i = tmp; } - session->commit_reversible_command (); + _session->commit_reversible_command (); } @@ -5865,11 +5944,11 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList bool use_rhythmic_rodent = false; boost::shared_ptr pl = r->playlist(); - + if (!pl) { return; } - + if (positions.empty()) { return; } @@ -5894,6 +5973,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList int response = msg.run(); msg.hide (); + switch (response) { case RESPONSE_OK: break; @@ -5904,46 +5984,45 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList return; } } - + if (use_rhythmic_rodent) { show_rhythm_ferret (); return; } - AnalysisFeatureList::const_iterator x; - - nframes64_t pos = r->position(); + AnalysisFeatureList::const_iterator x; + + pl->clear_history (); - XMLNode& before (pl->get_state()); - x = positions.begin(); - - while (x != positions.end()) { - if ((*x) > pos) { - break; - } - ++x; - } - + if (x == positions.end()) { return; } - + pl->freeze (); pl->remove_region (r); - + + nframes64_t pos = 0; + while (x != positions.end()) { - - /* file start = original start + how far we from the initial position ? + + /* deal with positons that are out of scope of present region bounds */ + if (*x <= 0 || *x > r->length()){ + ++x; + continue; + } + + /* file start = original start + how far we from the initial position ? */ - - nframes64_t file_start = r->start() + (pos - r->position()); + + nframes64_t file_start = r->start() + pos; /* length = next position - current position */ - - nframes64_t len = (*x) - pos; + nframes64_t len = (*x) - pos; + /* XXX we do we really want to allow even single-sample regions? shouldn't we have some kind of lower limit on region size? */ @@ -5951,40 +6030,207 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList if (len <= 0) { break; } - + string new_name; - - if (session->region_name (new_name, r->name())) { + + if (RegionFactory::region_name (new_name, r->name())) { break; } - + /* do NOT announce new regions 1 by one, just wait till they are all done */ - boost::shared_ptr nr = RegionFactory::create (r->sources(), file_start, len, new_name, 0, Region::DefaultFlags, false); - pl->add_region (nr, pos); + PropertyList plist; + + plist.add (ARDOUR::Properties::start, file_start); + plist.add (ARDOUR::Properties::length, len); + plist.add (ARDOUR::Properties::name, new_name); + plist.add (ARDOUR::Properties::layer, 0); + + boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); + pl->add_region (nr, r->position() + pos); pos += len; ++x; + } - if (*x > r->last_frame()) { - - /* add final fragment */ - - file_start = r->start() + (pos - r->position()); - len = r->last_frame() - pos; + string new_name; - nr = RegionFactory::create (r->sources(), file_start, len, new_name, 0, Region::DefaultFlags); - pl->add_region (nr, pos); + RegionFactory::region_name (new_name, r->name()); + + /* Add the final region */ + PropertyList plist; + + plist.add (ARDOUR::Properties::start, r->start() + pos); + plist.add (ARDOUR::Properties::length, r->last_frame() - (r->position() + pos) + 1); + plist.add (ARDOUR::Properties::name, new_name); + plist.add (ARDOUR::Properties::layer, 0); - break; - } - } + boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); + pl->add_region (nr, r->position() + pos); + pl->thaw (); - XMLNode& after (pl->get_state()); + _session->add_command (new StatefulDiffCommand (pl)); +} + +void +Editor::place_transient() +{ + if (!_session) { + return; + } + + RegionSelection rs; + + get_regions_for_action (rs); + + if (rs.empty()) { + return; + } + + nframes64_t where = get_preferred_edit_position(); + + _session->begin_reversible_command (_("place transient")); + + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { + framepos_t position = (*r)->region()->position(); + (*r)->region()->add_transient(where - position); + } + + _session->commit_reversible_command (); +} + +void +Editor::remove_transient(ArdourCanvas::Item* item) +{ + if (!_session) { + return; + } + + ArdourCanvas::SimpleLine* _line = reinterpret_cast (item); + assert (_line); + + AudioRegionView* _arv = reinterpret_cast (item->get_data ("regionview")); + _arv->remove_transient(_line->property_x1()); +} + +void +Editor::snap_regions_to_grid() +{ + if (!_session) { + return; + } + + RegionSelection rs; + + get_regions_for_action (rs); + + if (rs.empty()) { + return; + } + + _session->begin_reversible_command (_("snap regions to grid")); + + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { + framepos_t start_frame = (*r)->region()->first_frame (); + snap_to (start_frame); + (*r)->region()->set_position (start_frame, this); + } + + _session->commit_reversible_command (); +} + +void +Editor::close_region_gaps() +{ + if (!_session) { + return; + } + + RegionSelection rs; + + get_regions_for_action (rs); + + if (rs.empty()) { + return; + } + + Dialog dialog (rs.size() > 1 ? _("Conform regions") : _("Conform region")); + + HBox hbox_crossfade; + hbox_crossfade.set_spacing (10); + //hbox_crossfade.set_border_width (3); + hbox_crossfade.pack_start (*manage (new Label (_("Crossfade length:")))); + + SpinButton spin_crossfade (1, 0); + spin_crossfade.set_range (0, 15); + spin_crossfade.set_increments (1, 1); + spin_crossfade.set_value (3); + + hbox_crossfade.pack_start (spin_crossfade); + hbox_crossfade.pack_start (*manage (new Label (_("ms")))); + hbox_crossfade.show_all (); + + HBox hbox_pullback; + + hbox_pullback.set_spacing (10); + //hbox_pullback.set_border_width (3); + hbox_pullback.pack_start (*manage (new Label (_("Pull-back length:")))); + + SpinButton spin_pullback (1, 0); + spin_pullback.set_range (0, 15); + spin_pullback.set_increments (1, 1); + spin_pullback.set_value (5); + + hbox_pullback.pack_start (spin_pullback); + hbox_pullback.pack_start (*manage (new Label (_("ms")))); + hbox_pullback.show_all (); + + dialog.get_vbox()->set_spacing (6); + dialog.get_vbox()->pack_start (hbox_crossfade); + dialog.get_vbox()->pack_start (hbox_pullback); + dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL); + dialog.add_button (_("Ok"), RESPONSE_ACCEPT); + + if (dialog.run () == RESPONSE_CANCEL) { + return; + } + + nframes64_t crossfade_len = spin_crossfade.get_value(); + nframes64_t pull_back_frames = spin_pullback.get_value(); + + crossfade_len = lrintf (crossfade_len * _session->frame_rate()/1000); + pull_back_frames = lrintf (pull_back_frames * _session->frame_rate()/1000); + + /* Iterate over the region list and make adjacent regions overlap by crossfade_len_ms */ + + _session->begin_reversible_command (_("close region gaps")); + + int idx = 0; + boost::shared_ptr last_region; + + rs.sort_by_position_and_track(); + + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { + + nframes64_t position = (*r)->region()->position(); + + if (idx == 0 || position < last_region->position()){ + last_region = (*r)->region(); + idx++; + continue; + } + + (*r)->region()->trim_front( (position - pull_back_frames), this ); + last_region->trim_end( (position - pull_back_frames + crossfade_len), this ); + + last_region = (*r)->region(); + + idx++; + } - session->add_command (new MementoCommand(*pl, &before, &after)); + _session->commit_reversible_command (); } void @@ -5992,11 +6238,11 @@ Editor::tab_to_transient (bool forward) { AnalysisFeatureList positions; - if (!session) { + if (!_session) { return; } - nframes64_t pos = session->audible_frame (); + nframes64_t pos = _session->audible_frame (); if (!selection->tracks.empty()) { @@ -6005,12 +6251,12 @@ Editor::tab_to_transient (bool forward) RouteTimeAxisView* rtv = dynamic_cast (*t); if (rtv) { - boost::shared_ptr ds = rtv->get_diskstream(); - if (ds) { - boost::shared_ptr pl = rtv->get_diskstream()->playlist (); + boost::shared_ptr tr = rtv->track(); + if (tr) { + boost::shared_ptr pl = tr->playlist (); if (pl) { nframes64_t result = pl->find_next_transient (pos, forward ? 1 : -1); - + if (result >= 0) { positions.push_back (result); } @@ -6020,21 +6266,21 @@ Editor::tab_to_transient (bool forward) } } else { - - RegionSelection rs; + + RegionSelection rs; get_regions_for_action (rs); - + if (rs.empty()) { return; } - + for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { (*r)->region()->get_transients (positions); } } - TransientDetector::cleanup_transients (positions, session->frame_rate(), 3.0); + TransientDetector::cleanup_transients (positions, _session->frame_rate(), 3.0); if (forward) { AnalysisFeatureList::iterator x; @@ -6046,7 +6292,7 @@ Editor::tab_to_transient (bool forward) } if (x != positions.end ()) { - session->request_locate (*x); + _session->request_locate (*x); } } else { @@ -6059,19 +6305,20 @@ Editor::tab_to_transient (bool forward) } if (x != positions.rend ()) { - session->request_locate (*x); + _session->request_locate (*x); } } } + void Editor::playhead_forward_to_grid () { - if (!session) return; + if (!_session) return; nframes64_t pos = playhead_cursor->current_frame; if (pos < max_frames - 1) { pos += 2; snap_to_internal (pos, 1, false); - session->request_locate (pos); + _session->request_locate (pos); } } @@ -6079,17 +6326,17 @@ Editor::playhead_forward_to_grid () void Editor::playhead_backward_to_grid () { - if (!session) return; + if (!_session) return; nframes64_t pos = playhead_cursor->current_frame; if (pos > 2) { pos -= 2; snap_to_internal (pos, -1, false); - session->request_locate (pos); + _session->request_locate (pos); } } void -Editor::set_track_height (uint32_t h) +Editor::set_track_height (Height h) { TrackSelection& ts (selection->tracks); @@ -6138,6 +6385,7 @@ Editor::remove_tracks () const char* trackstr; const char* busstr; vector > routes; + bool special_bus = false; for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { RouteTimeAxisView* rtv = dynamic_cast (*x); @@ -6149,8 +6397,30 @@ Editor::remove_tracks () } } routes.push_back (rtv->_route); - } - + + if (rtv->route()->is_master() || rtv->route()->is_monitor()) { + special_bus = true; + } + } + + if (special_bus && !Config->get_allow_special_bus_removal()) { + MessageDialog msg (_("That would be bad news ...."), + false, + Gtk::MESSAGE_INFO, + Gtk::BUTTONS_OK); + msg.set_secondary_text (string_compose (_( +"Removing the master or monitor bus is such a bad idea\n\ +that %1 is not going to allow it.\n\ +\n\ +If you really want to do this sort of thing\n\ +edit your ardour.rc file to set the\n\ +\"allow-special-bus-removal\" option to be \"yes\""), PROGRAM_NAME)); + + msg.present (); + msg.run (); + return; + } + if (ntracks + nbusses == 0) { return; } @@ -6191,14 +6461,21 @@ Editor::remove_tracks () choices.push_back (_("Yes, remove it.")); } - Choice prompter (prompt, choices); + string title; + if (ntracks) { + title = string_compose (_("Remove %1"), trackstr); + } else { + title = string_compose (_("Remove %1"), busstr); + } + + Choice prompter (title, prompt, choices); if (prompter.run () != 1) { return; } for (vector >::iterator x = routes.begin(); x != routes.end(); ++x) { - session->remove_route (*x); + _session->remove_route (*x); } } @@ -6212,7 +6489,7 @@ Editor::do_insert_time () ArdourDialog d (*this, _("Insert Time")); nframes64_t const pos = get_preferred_edit_position (); - + d.get_vbox()->set_border_width (12); d.get_vbox()->set_spacing (4); @@ -6222,10 +6499,10 @@ Editor::do_insert_time () Label time_label (_("Time to insert:")); time_label.set_alignment (1, 0.5); table.attach (time_label, 0, 1, 0, 1, FILL | EXPAND); - AudioClock clock ("insertTimeClock", true, X_("InsertTimeClock"), true, true, true); + AudioClock clock ("insertTimeClock", true, X_("InsertTimeClock"), true, false, true, true); clock.set (0); - clock.set_session (session); - clock.set_bbt_reference (pos); + clock.set_session (_session); + clock.set_bbt_reference (pos); table.attach (clock, 1, 2, 0, 1); Label intersected_label (_("Intersected regions should:")); @@ -6246,7 +6523,7 @@ Editor::do_insert_time () d.get_vbox()->pack_start (move_markers); CheckButton move_tempos (_("Move tempo and meter changes")); d.get_vbox()->pack_start (move_tempos); - + d.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); d.add_button (_("Insert time"), Gtk::RESPONSE_OK); d.show_all (); @@ -6263,7 +6540,8 @@ Editor::do_insert_time () return; } - InsertTimeOption opt; + /* only setting this to keep GCC quiet */ + InsertTimeOption opt = LeaveIntersected; switch (intersected_combo.get_active_row_number ()) { case 0: @@ -6281,7 +6559,7 @@ Editor::do_insert_time () } void -Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, +Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, bool ignore_music_glue, bool markers_too, bool tempo_too) { bool commit = false; @@ -6295,23 +6573,30 @@ Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, for (TrackSelection::iterator x = selection->tracks.begin(); x != selection->tracks.end(); ++x) { /* regions */ boost::shared_ptr pl = (*x)->playlist(); - + if (pl) { - XMLNode &before = pl->get_state(); - + pl->clear_history (); + pl->clear_owned_history (); + if (opt == SplitIntersected) { pl->split (pos); } - + pl->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue); - - XMLNode &after = pl->get_state(); - - session->add_command (new MementoCommand (*pl, &before, &after)); + + vector cmds; + + pl->rdiff (cmds); + + for (vector::iterator c = cmds.begin(); c != cmds.end(); ++c) { + _session->add_command (*c); + } + + _session->add_command (new StatefulDiffCommand (pl)); commit = true; } - + /* automation */ RouteTimeAxisView* rtav = dynamic_cast (*x); if (rtav) { @@ -6323,11 +6608,11 @@ Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, /* markers */ if (markers_too) { bool moved = false; - XMLNode& before (session->locations()->get_state()); - Locations::LocationList copy (session->locations()->list()); + XMLNode& before (_session->locations()->get_state()); + Locations::LocationList copy (_session->locations()->list()); for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) { - + Locations::LocationList::const_iterator tmp; if ((*i)->start() >= pos) { @@ -6340,13 +6625,13 @@ Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, } if (moved) { - XMLNode& after (session->locations()->get_state()); - session->add_command (new MementoCommand(*session->locations(), &before, &after)); + XMLNode& after (_session->locations()->get_state()); + _session->add_command (new MementoCommand(*_session->locations(), &before, &after)); } } if (tempo_too) { - session->tempo_map().insert_time (pos, frames); + _session->tempo_map().insert_time (pos, frames); } if (commit) { @@ -6361,7 +6646,7 @@ Editor::fit_selected_tracks () } void -Editor::fit_tracks (TrackSelection & tracks) +Editor::fit_tracks (TrackViewList & tracks) { if (tracks.empty()) { return; @@ -6381,16 +6666,16 @@ Editor::fit_tracks (TrackSelection & tracks) uint32_t h = (uint32_t) floor ((_canvas_height - child_heights - canvas_timebars_vsize) / tracks.size()); double first_y_pos = DBL_MAX; - if (h < TimeAxisView::hSmall) { + if (h < TimeAxisView::preset_height (HeightSmall)) { MessageDialog msg (*this, _("There are too many tracks to fit in the current window")); /* too small to be displayed */ return; } undo_visual_stack.push_back (current_visual_state()); - + /* operate on all tracks, hide unselected ones that are in the middle of selected ones */ - + bool prev_was_selected = false; bool is_selected = tracks.contains (track_views.front()); bool next_is_selected; @@ -6398,10 +6683,10 @@ Editor::fit_tracks (TrackSelection & tracks) for (TrackViewList::iterator t = track_views.begin(); t != track_views.end(); ++t) { TrackViewList::iterator next; - + next = t; ++next; - + if (next != track_views.end()) { next_is_selected = tracks.contains (*next); } else { @@ -6413,7 +6698,7 @@ Editor::fit_tracks (TrackSelection & tracks) first_y_pos = std::min ((*t)->y_position (), first_y_pos); } else { if (prev_was_selected && next_is_selected) { - hide_track_in_display (**t); + hide_track_in_display (*t); } } @@ -6421,10 +6706,10 @@ Editor::fit_tracks (TrackSelection & tracks) is_selected = next_is_selected; } - /* - set the controls_layout height now, because waiting for its size - request signal handler will cause the vertical adjustment setting to fail - */ + /* + set the controls_layout height now, because waiting for its size + request signal handler will cause the vertical adjustment setting to fail + */ controls_layout.property_height () = full_canvas_height - canvas_timebars_vsize; vertical_adjustment.set_value (first_y_pos); @@ -6462,10 +6747,8 @@ Editor::goto_visual_state (uint32_t n) void Editor::start_visual_state_op (uint32_t n) { - cerr << "Start visual op\n"; if (visual_state_op_connection.empty()) { - visual_state_op_connection = Glib::signal_timeout().connect (bind (mem_fun (*this, &Editor::end_visual_state_op), n), 1000); - cerr << "\tqueued new timeout\n"; + visual_state_op_connection = Glib::signal_timeout().connect (sigc::bind (sigc::mem_fun (*this, &Editor::end_visual_state_op), n), 1000); } } @@ -6473,11 +6756,13 @@ void Editor::cancel_visual_state_op (uint32_t n) { if (!visual_state_op_connection.empty()) { - cerr << "cancel visual op, time to goto\n"; visual_state_op_connection.disconnect(); goto_visual_state (n); - } else { - cerr << "cancel visual op, do nothing\n"; + } else { + //we land here if called from the menu OR if end_visual_state_op has been called + //so check if we are already in visual state n + // XXX not yet checking it at all, but redoing does not hurt + goto_visual_state (n); } } @@ -6486,7 +6771,7 @@ Editor::end_visual_state_op (uint32_t n) { visual_state_op_connection.disconnect(); save_visual_state (n); - + PopUp* pup = new PopUp (WIN_POS_MOUSE, 1000, true); char buf[32]; snprintf (buf, sizeof (buf), _("Saved view %u"), n+1);