X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=1ca4c1d2455d71c3ae1927fd04aafcb21b21954b;hb=157c2a866c166b94b65da442b8c54f5ffa8d6a53;hp=47ffd952d296939cd4eae6e58efc1debd01fd4d9;hpb=baf51996c4f152a0750c14a52f57ed1fcd04b8cc;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 47ffd952d2..1ca4c1d245 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 @@ -35,7 +35,6 @@ #include #include -#include #include #include "ardour/audioengine.h" @@ -45,7 +44,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" @@ -54,6 +52,8 @@ #include "ardour/transient_detector.h" #include "ardour/dB.h" #include "ardour/quantize.h" +#include "ardour/strip_silence.h" +#include "ardour/route_group.h" #include "ardour_ui.h" #include "editor.h" @@ -73,16 +73,21 @@ #include "gui_thread.h" #include "keyboard.h" #include "utils.h" +#include "editor_drag.h" +#include "strip_silence_dialog.h" +#include "editor_routes.h" +#include "editor_regions.h" +#include "quantize_dialog.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 @@ -91,34 +96,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 () -{ - split_region_at (get_preferred_edit_position()); -} - -void -Editor::split_region_at (nframes64_t where) -{ - RegionSelection rs; - - get_regions_for_action (rs); - split_regions_at (where, selection->regions); -} - void Editor::split_regions_at (nframes64_t where, RegionSelection& regions) { @@ -134,7 +124,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 +143,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; @@ -167,7 +157,7 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions) 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(); } @@ -176,12 +166,12 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions) if (arv) { _new_regionviews_show_envelope = arv->envelope_visible(); } - + if (pl) { XMLNode &before = pl->get_state(); pl->split_region ((*a)->region(), where); XMLNode &after = pl->get_state(); - session->add_command(new MementoCommand(*pl, &before, &after)); + _session->add_command(new MementoCommand(*pl, &before, &after)); } a = tmp; @@ -192,95 +182,27 @@ Editor::split_regions_at (nframes64_t where, RegionSelection& regions) (*i)->thaw(); used_playlists.pop_front(); } - - commit_reversible_command (); - _new_regionviews_show_envelope = false; -} - - -/** Remove `clicked_regionview' */ -void -Editor::remove_clicked_region () -{ - if (clicked_routeview == 0 || clicked_regionview == 0) { - return; - } - - boost::shared_ptr playlist = clicked_routeview->playlist(); - - begin_reversible_command (_("remove region")); - XMLNode &before = playlist->get_state(); - playlist->remove_region (clicked_regionview->region()); - XMLNode &after = playlist->get_state(); - session->add_command(new MementoCommand(*playlist, &before, &after)); - commit_reversible_command (); -} - - -/** Remove the selected regions */ -void -Editor::remove_selected_regions () -{ - RegionSelection rs; - get_regions_for_action (rs); - - if (!session) { - return; - } - - if (rs.empty()) { - return; - } - - begin_reversible_command (_("remove region")); - - 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; - } - - XMLNode &before = playlist->get_state(); - playlist->remove_region (*rl); - XMLNode &after = playlist->get_state(); - session->add_command(new MementoCommand(*playlist, &before, &after)); - } 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()) { @@ -296,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) { @@ -325,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 (); } @@ -354,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 (); } @@ -392,19 +304,19 @@ 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) { @@ -414,26 +326,26 @@ Editor::nudge_forward (bool next, bool force_playhead) XMLNode &before = r->playlist()->get_state(); 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 MementoCommand(*(r->playlist()), &before, &after)); } 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) { @@ -456,29 +368,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")); @@ -487,20 +399,20 @@ 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; } 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 MementoCommand(*(r->playlist()), &before, &after)); } commit_reversible_command (); @@ -514,11 +426,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) { @@ -531,33 +443,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(); } } } @@ -566,60 +478,60 @@ 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->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 MementoCommand(*(r->playlist()), &before, &after)); } 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(); - + 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 MementoCommand(*(r->playlist()), &before, &after)); } commit_reversible_command (); @@ -631,14 +543,14 @@ 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 @@ -652,30 +564,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; @@ -685,7 +597,7 @@ 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; @@ -707,25 +619,26 @@ Editor::build_region_boundary_cache () case End: rpos = r->last_frame(); - break; + break; case SyncPoint: - rpos = r->adjust_to_sync (r->first_frame()); + rpos = r->sync_position (); + //r->adjust_to_sync (r->first_frame()); break; 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(); } } - + rpos = track_frame_to_session_frame (rpos, speed); if (rpos < lpos) { @@ -736,8 +649,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; @@ -773,7 +686,7 @@ Editor::find_next_region (nframes64_t frame, RegionPoint point, int32_t dir, Tra nframes64_t distance; boost::shared_ptr r; - + track_speed = 1.0f; if ( (rtav = dynamic_cast(*i)) != 0 ) { if (rtav->get_diskstream()!=0) @@ -796,11 +709,12 @@ Editor::find_next_region (nframes64_t frame, RegionPoint point, int32_t dir, Tra break; case SyncPoint: - rpos = r->adjust_to_sync (r->first_frame()); + rpos = r->sync_position (); + // r->adjust_to_sync (r->first_frame()); 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) { @@ -826,6 +740,7 @@ Editor::find_next_region_boundary (nframes64_t pos, int32_t dir, const TrackView nframes64_t distance = max_frames; nframes64_t current_nearest = -1; + for (TrackViewList::const_iterator i = tracks.begin(); i != tracks.end(); ++i) { nframes64_t contender; nframes64_t d; @@ -847,17 +762,52 @@ 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) +{ + nframes64_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); + } else { + target = find_next_region_boundary (pos, dir, track_views); + } + } + + } else { + + if (only_onscreen || Config->get_region_boundaries_from_onscreen_tracks()) { + get_onscreen_tracks (tvl); + target = find_next_region_boundary (pos, dir, tvl); + } else { + target = find_next_region_boundary (pos, dir, track_views); + } + } + + return target; +} + void -Editor::cursor_to_region_boundary (Cursor* cursor, int32_t dir) +Editor::cursor_to_region_boundary (bool with_selection, int32_t dir) { - nframes64_t pos = cursor->current_frame; + nframes64_t pos = playhead_cursor->current_frame; nframes64_t target; - if (!session) { + if (!_session) { return; } @@ -866,46 +816,32 @@ Editor::cursor_to_region_boundary (Cursor* cursor, int32_t dir) pos += dir; } - if (!selection->tracks.empty()) { - - target = find_next_region_boundary (pos, dir, selection->tracks); - - } else { - - target = find_next_region_boundary (pos, dir, track_views); - } - - if (target < 0) { + if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) { return; } - - if (cursor == playhead_cursor) { - session->request_locate (target); - } else { - cursor->set_position (target); - } + _session->request_locate (target); } void -Editor::cursor_to_next_region_boundary (Cursor* cursor) +Editor::cursor_to_next_region_boundary (bool with_selection) { - cursor_to_region_boundary (cursor, 1); + cursor_to_region_boundary (with_selection, 1); } void -Editor::cursor_to_previous_region_boundary (Cursor* cursor) +Editor::cursor_to_previous_region_boundary (bool with_selection) { - cursor_to_region_boundary (cursor, -1); + cursor_to_region_boundary (with_selection, -1); } void -Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir) +Editor::cursor_to_region_point (EditorCursor* cursor, RegionPoint point, int32_t dir) { boost::shared_ptr r; nframes64_t pos = cursor->current_frame; - if (!session) { + if (!_session) { return; } @@ -916,25 +852,25 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir) 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 (); @@ -945,10 +881,11 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir) break; case SyncPoint: - pos = r->adjust_to_sync (r->first_frame()); - break; + pos = r->sync_position (); + // r->adjust_to_sync (r->first_frame()); + break; } - + float speed = 1.0f; RouteTimeAxisView *rtav; @@ -959,31 +896,31 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir) } 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); } } void -Editor::cursor_to_next_region_point (Cursor* cursor, RegionPoint point) +Editor::cursor_to_next_region_point (EditorCursor* cursor, RegionPoint point) { cursor_to_region_point (cursor, point, 1); } void -Editor::cursor_to_previous_region_point (Cursor* cursor, RegionPoint point) +Editor::cursor_to_previous_region_point (EditorCursor* cursor, RegionPoint point) { cursor_to_region_point (cursor, point, -1); } void -Editor::cursor_to_selection_start (Cursor *cursor) +Editor::cursor_to_selection_start (EditorCursor *cursor) { nframes64_t pos = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1005,17 +942,17 @@ Editor::cursor_to_selection_start (Cursor *cursor) } if (cursor == playhead_cursor) { - session->request_locate (pos); + _session->request_locate (pos); } else { cursor->set_position (pos); } } void -Editor::cursor_to_selection_end (Cursor *cursor) +Editor::cursor_to_selection_end (EditorCursor *cursor) { nframes64_t pos = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1037,20 +974,20 @@ Editor::cursor_to_selection_end (Cursor *cursor) } if (cursor == playhead_cursor) { - session->request_locate (pos); + _session->request_locate (pos); } else { cursor->set_position (pos); } } void -Editor::selected_marker_to_region_boundary (int32_t dir) +Editor::selected_marker_to_region_boundary (bool with_selection, int32_t dir) { nframes64_t target; Location* loc; bool ignored; - if (!session) { + if (!_session) { return; } @@ -1061,7 +998,7 @@ Editor::selected_marker_to_region_boundary (int32_t dir) if (!mouse_frame (mouse, ignored)) { return; } - + add_location_mark (mouse); } @@ -1076,16 +1013,7 @@ Editor::selected_marker_to_region_boundary (int32_t dir) pos += dir; } - if (!selection->tracks.empty()) { - - target = find_next_region_boundary (pos, dir, selection->tracks); - - } else { - - target = find_next_region_boundary (pos, dir, track_views); - } - - if (target < 0) { + if ((target = get_region_boundary (pos, dir, with_selection, false)) < 0) { return; } @@ -1093,15 +1021,15 @@ Editor::selected_marker_to_region_boundary (int32_t dir) } void -Editor::selected_marker_to_next_region_boundary () +Editor::selected_marker_to_next_region_boundary (bool with_selection) { - selected_marker_to_region_boundary (1); + selected_marker_to_region_boundary (with_selection, 1); } void -Editor::selected_marker_to_previous_region_boundary () +Editor::selected_marker_to_previous_region_boundary (bool with_selection) { - selected_marker_to_region_boundary (-1); + selected_marker_to_region_boundary (with_selection, -1); } void @@ -1112,7 +1040,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; } @@ -1129,18 +1057,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 (); @@ -1152,9 +1080,9 @@ 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; @@ -1188,7 +1116,7 @@ Editor::selected_marker_to_selection_start () Location* loc; bool ignored; - if (!session || selection->markers.empty()) { + if (!_session || selection->markers.empty()) { return; } @@ -1196,7 +1124,7 @@ Editor::selected_marker_to_selection_start () return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1227,7 +1155,7 @@ Editor::selected_marker_to_selection_end () Location* loc; bool ignored; - if (!session || selection->markers.empty()) { + if (!_session || selection->markers.empty()) { return; } @@ -1235,7 +1163,7 @@ Editor::selected_marker_to_selection_end () return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -1274,13 +1202,13 @@ Editor::scroll_playhead (bool forward) pos += delta ; } else { pos = max_frames; - } + } } else { if (pos == 0) { return; - } + } if (pos > delta) { pos -= delta; @@ -1289,7 +1217,7 @@ Editor::scroll_playhead (bool forward) } } - session->request_locate (pos); + _session->request_locate (pos); } void @@ -1304,7 +1232,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; } @@ -1317,13 +1245,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 @@ -1338,26 +1266,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; } @@ -1366,17 +1294,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 { @@ -1399,7 +1327,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; } @@ -1414,7 +1342,7 @@ Editor::edit_cursor_backward () } else { pos -= cnt; } - + // EDIT CURSOR edit_cursor->set_position (pos); } @@ -1430,7 +1358,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); } @@ -1452,28 +1380,28 @@ 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 Editor::scroll_backward (float pages) { nframes64_t frame; - nframes64_t one_page = (nframes64_t) rint (canvas_width * frames_per_unit); + nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit); 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); } @@ -1492,16 +1420,16 @@ void Editor::scroll_forward (float pages) { nframes64_t frame; - nframes64_t one_page = (nframes64_t) rint (canvas_width * frames_per_unit); + nframes64_t one_page = (nframes64_t) rint (_canvas_width * frames_per_unit); 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); } @@ -1531,8 +1459,8 @@ Editor::scroll_tracks_down () double vert_value = vertical_adjustment.get_value() + (cnt * vertical_adjustment.get_page_size()); - if (vert_value > vertical_adjustment.get_upper() - canvas_height) { - vert_value = vertical_adjustment.get_upper() - canvas_height; + if (vert_value > vertical_adjustment.get_upper() - _canvas_height) { + vert_value = vertical_adjustment.get_upper() - _canvas_height; } vertical_adjustment.set_value (vert_value); } @@ -1556,48 +1484,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; @@ -1617,15 +1558,15 @@ Editor::temporal_zoom (gdouble fpu) } nfpu = fpu; - - new_page_size = (nframes64_t) floor (canvas_width * nfpu); + + new_page_size = (nframes64_t) floor (_canvas_width * nfpu); half_page_size = new_page_size / 2; switch (zoom_focus) { case ZoomFocusLeft: leftmost_after_zoom = current_leftmost; break; - + case ZoomFocusRight: current_rightmost = leftmost_frame + current_page; if (current_rightmost < new_page_size) { @@ -1634,26 +1575,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; @@ -1679,7 +1617,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; @@ -1698,7 +1636,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; @@ -1709,13 +1647,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) @@ -1723,7 +1661,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); @@ -1761,14 +1699,14 @@ Editor::temporal_zoom_region (bool both_axes) } nframes64_t range = end - start; - double new_fpu = (double)range / (double)canvas_width; + double new_fpu = (double)range / (double)_canvas_width; nframes64_t extra_samples = (nframes64_t) floor (one_centimeter_in_pixels * new_fpu); if (start > extra_samples) { start -= extra_samples; } else { start = 0; - } + } if (max_frames - extra_samples > end) { end += extra_samples; @@ -1787,17 +1725,17 @@ Editor::temporal_zoom_region (bool both_axes) temporal_zoom_by_frame (start, end, "zoom to region"); if (both_axes) { - uint32_t per_track_height = (uint32_t) floor ((canvas_height - canvas_timebars_vsize - 10.0) / tracks.size()); - + 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 */ - - no_route_list_redisplay = true; + + _routes->suspend_redisplay (); for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { if (find (tracks.begin(), tracks.end(), (*i)) == tracks.end()) { @@ -1805,32 +1743,26 @@ Editor::temporal_zoom_region (bool both_axes) } } - no_route_list_redisplay = false; - redisplay_route_list (); + _routes->resume_redisplay (); vertical_adjustment.set_value (0.0); 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; } @@ -1844,17 +1776,17 @@ 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) { + temporal_zoom_by_frame (_session->current_start_frame(), _session->current_end_frame(), "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; @@ -1862,9 +1794,9 @@ 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); + 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)); @@ -1875,21 +1807,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; } @@ -1904,8 +1836,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); @@ -1924,10 +1856,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); @@ -1944,7 +1873,7 @@ Editor::choose_new_marker_name(string &name) { default: return false; } - + dialog.get_result(name); return true; @@ -1960,22 +1889,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"); + _session->locations()->next_available_name(rangename,"selection"); Location *location = new Location (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 @@ -1985,29 +1914,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 (); + _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); @@ -2015,29 +1944,29 @@ Editor::add_locations_from_audio_region () return; } - session->begin_reversible_command (rs.size () > 1 ? _("add markers") : _("add marker")); - XMLNode &before = session->locations()->get_state(); - + _session->begin_reversible_command (rs.size () > 1 ? _("add markers") : _("add marker")); + XMLNode &before = _session->locations()->get_state(); + cerr << "Add locations\n"; 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); + + _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); @@ -2045,32 +1974,32 @@ 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 + // single range spanning all selected Location *location = new Location (rs.start(), rs.end_frame(), markername, Location::IsRangeMarker); - session->locations()->add (location, true); + _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 @@ -2091,7 +2020,7 @@ Editor::amplitude_zoom_step (bool in) #ifdef FIX_FOR_CANVAS /* XXX DO SOMETHING */ #endif -} +} /* DELETION */ @@ -2131,32 +2060,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 (); } } @@ -2169,66 +2098,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 (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 @@ -2247,7 +2176,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); } } @@ -2263,7 +2192,7 @@ 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(); @@ -2272,7 +2201,7 @@ Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) 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()) { @@ -2284,7 +2213,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; } @@ -2292,13 +2221,13 @@ 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->add_region (RegionFactory::create (region), where, 1.0); - session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); commit_reversible_command (); } @@ -2330,13 +2259,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; @@ -2367,29 +2296,17 @@ Editor::insert_region_list_selection (float times) if ((playlist = tv->playlist()) == 0) { return; } - - Glib::RefPtr selected = region_list_display.get_selection(); - - if (selected->count_selected_rows() != 1) { + + boost::shared_ptr region = _regions->get_single_selection (); + if (region == 0) { return; } - - TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows (); - - /* only one row selected, so rows.begin() is it */ - - TreeIter iter; - - if ((iter = region_list_model->get_iter (*rows.begin()))) { - boost::shared_ptr region = (*iter)[region_list_columns.region]; - - begin_reversible_command (_("insert region")); - XMLNode &before = playlist->get_state(); - playlist->add_region ((RegionFactory::create (region)), get_preferred_edit_position(), times); - session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); - commit_reversible_command (); - } + begin_reversible_command (_("insert region")); + XMLNode &before = playlist->get_state(); + playlist->add_region ((RegionFactory::create (region)), get_preferred_edit_position(), times); + _session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); + commit_reversible_command (); } /* BUILT-IN EFFECTS */ @@ -2412,68 +2329,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 @@ -2484,19 +2371,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); } } @@ -2507,13 +2394,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); @@ -2524,12 +2411,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); } } } @@ -2541,7 +2428,7 @@ Editor::play_location (Location& location) return; } - session->request_bounded_roll (location.start(), location.end()); + _session->request_bounded_roll (location.start(), location.end()); } void @@ -2557,8 +2444,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); } } @@ -2593,10 +2480,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); @@ -2604,10 +2498,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; @@ -2628,10 +2519,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(); @@ -2643,7 +2534,7 @@ Editor::rename_region() strip_whitespace_edges (str); if (!str.empty()) { rs.front()->region()->set_name (str); - redisplay_regions (); + _regions->redisplay (); } } } @@ -2651,9 +2542,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 @@ -2661,9 +2552,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 ? */ } @@ -2674,7 +2565,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); } } @@ -2683,10 +2574,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; } @@ -2700,14 +2591,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); + _session->audition_region (region); } void @@ -2716,7 +2606,7 @@ 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); @@ -2728,7 +2618,7 @@ Editor::build_interthread_progress_window () // 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)); + b->signal_clicked().connect (sigc::mem_fun(*this, &Editor::interthread_cancel_clicked)); interthread_cancel_button.add (interthread_cancel_label); @@ -2757,9 +2647,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; @@ -2774,11 +2666,11 @@ Editor::region_from_selection () } internal_start = start - current->position(); - session->region_name (new_name, current->name(), true); + _session->region_name (new_name, current->name(), true); boost::shared_ptr region (RegionFactory::create (current, internal_start, selection_cnt, new_name)); } -} +} void Editor::create_region_from_selection (vector >& new_regions) @@ -2789,7 +2681,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) { @@ -2807,8 +2699,8 @@ Editor::create_region_from_selection (vector >& new_re } internal_start = start - current->position(); - session->region_name (new_name, current->name(), true); - + _session->region_name (new_name, current->name(), true); + new_regions.push_back (RegionFactory::create (current, internal_start, end - start + 1, new_name)); } @@ -2817,7 +2709,7 @@ Editor::create_region_from_selection (vector >& new_re void Editor::split_multichannel_region () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -2828,7 +2720,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); } } @@ -2850,41 +2742,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) { @@ -2900,7 +2803,7 @@ Editor::separate_regions_between (const TimeSelection& ts) if (rtv->track()->diskstream()->destructive()) { continue; } - + if ((playlist = rtv->playlist()) != 0) { XMLNode *before; @@ -2917,7 +2820,7 @@ Editor::separate_regions_between (const TimeSelection& ts) 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), @@ -2926,21 +2829,21 @@ Editor::separate_regions_between (const TimeSelection& ts) 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( + + _session->add_command(new MementoCommand( *playlist, before, &playlist->get_state())); - } + } } if (!got_some) { @@ -2959,6 +2862,10 @@ Editor::separate_regions_between (const TimeSelection& ts) } } +/** 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 () { @@ -2975,9 +2882,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); @@ -2990,7 +2897,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); } @@ -2999,7 +2906,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); } @@ -3036,15 +2943,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; @@ -3052,17 +2959,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 ((playlist = rtv->playlist()) != 0) { playlists.push_back (playlist); } @@ -3073,27 +2980,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; @@ -3102,39 +3009,35 @@ 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->trim_to (the_start, cnt, this); XMLNode &after = (*i)->get_state(); - session->add_command (new MementoCommand(*(*i), &before, &after)); + _session->add_command (new MementoCommand(*(*i), &before, &after)); } - + 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(); @@ -3149,8 +3052,8 @@ Editor::region_fill_track () } 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->add_region (RegionFactory::create (region), region->last_frame(), times); + _session->add_command (new MementoCommand(*pl, &before, &pl->get_state())); } commit_reversible_command (); @@ -3159,7 +3062,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; } @@ -3167,20 +3070,15 @@ Editor::region_fill_selection () return; } - - Glib::RefPtr selected = region_list_display.get_selection(); - - if (selected->count_selected_rows() != 1) { + boost::shared_ptr region = _regions->get_single_selection (); + if (region == 0) { return; } - TreeModel::iterator i = region_list_display.get_selection()->get_selected(); - boost::shared_ptr region = (*i)[region_list_columns.region]; - 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; @@ -3188,21 +3086,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->add_region (RegionFactory::create (region), start, times); - session->add_command (new MementoCommand(*playlist, &before, &playlist->get_state())); + _session->add_command (new MementoCommand(*playlist, &before, &playlist->get_state())); } - - commit_reversible_command (); + + commit_reversible_command (); } void @@ -3220,7 +3118,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; } @@ -3233,9 +3131,9 @@ Editor::set_sync_point (nframes64_t where, const RegionSelection& rs) } XMLNode &before = region->playlist()->get_state(); - region->set_sync_position (get_preferred_edit_position()); + region->set_sync_position (where); XMLNode &after = region->playlist()->get_state(); - session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); + _session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); } if (in_command) { @@ -3247,7 +3145,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); @@ -3261,7 +3159,7 @@ Editor::remove_region_sync () XMLNode &before = (*i)->region()->playlist()->get_state(); (*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 MementoCommand(*((*i)->region()->playlist()), &before, &after)); } commit_reversible_command (); } @@ -3269,7 +3167,7 @@ Editor::remove_region_sync () void Editor::naturalize () { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -3282,7 +3180,7 @@ Editor::naturalize () XMLNode &before = (*i)->region()->get_state(); (*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 MementoCommand(*((*i)->region().get()), &before, &after)); } commit_reversible_command (); } @@ -3290,7 +3188,7 @@ Editor::naturalize () void Editor::align (RegionPoint what) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); nframes64_t where = get_preferred_edit_position(); @@ -3309,13 +3207,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 { @@ -3350,7 +3248,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(); @@ -3370,7 +3268,7 @@ Editor::align_selection_relative (RegionPoint point, nframes64_t position, const distance = r->position() - pos; dir = -1; } - break; + break; } if (pos == r->position()) { @@ -3384,18 +3282,18 @@ Editor::align_selection_relative (RegionPoint point, nframes64_t position, const XMLNode &before = r->playlist()->get_state(); r->set_position (pos, this); XMLNode &after = r->playlist()->get_state(); - session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); + _session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); /* 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(); - + if (dir > 0) { region->set_position (region->position() + distance, this); } else { @@ -3403,7 +3301,7 @@ Editor::align_selection_relative (RegionPoint point, nframes64_t position, const } XMLNode &after = region->playlist()->get_state(); - session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); + _session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); } @@ -3456,16 +3354,59 @@ Editor::align_region_internal (boost::shared_ptr region, RegionPoint poi } XMLNode &after = region->playlist()->get_state(); - session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); -} + _session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); +} -/** Trim the end of the selected regions to the position of the edit cursor */ void -Editor::trim_region_to_loop () +Editor::trim_region_front () { - Location* loc = session->locations()->auto_loop_location(); - if (!loc) { - return; + trim_region (true); +} + +void +Editor::trim_region_back () +{ + trim_region (false); +} + +void +Editor::trim_region (bool front) +{ + nframes64_t where = get_preferred_edit_position(); + RegionSelection rs; + + get_regions_for_action (rs); + + if (rs.empty()) { + return; + } + + begin_reversible_command (front ? _("trim front") : _("trim back")); + + 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(); + if (front) { + (*i)->region()->trim_front (where, this); + } else { + (*i)->region()->trim_end (where, this); + } + XMLNode &after = pl->get_state(); + _session->add_command(new MementoCommand(*pl.get(), &before, &after)); + } + } + + commit_reversible_command (); +} + +/** Trim the end of the selected regions to the position of the edit cursor */ +void +Editor::trim_region_to_loop () +{ + Location* loc = _session->locations()->auto_loop_location(); + if (!loc) { + return; } trim_region_to_location (*loc, _("trim to loop")); } @@ -3473,7 +3414,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; } @@ -3498,7 +3439,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; @@ -3511,14 +3452,14 @@ Editor::trim_region_to_location (const Location& loc, const char* str) if (tav->get_diskstream() != 0) { speed = tav->get_diskstream()->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()->trim_to (start, (end - start), this); XMLNode &after = rv->region()->playlist()->get_state(); - session->add_command(new MementoCommand( + _session->add_command(new MementoCommand( *(rv->region()->playlist()), &before, &after)); } @@ -3529,7 +3470,7 @@ void Editor::trim_region_to_edit_point () { RegionSelection rs; - + get_regions_for_action (rs); nframes64_t where = get_preferred_edit_position(); @@ -3556,12 +3497,12 @@ Editor::trim_region_to_edit_point () } XMLNode &before = rv->region()->playlist()->get_state(); - rv->region()->trim_end( session_frame_to_track_frame(where, speed), this); + rv->region()->trim_end (session_frame_to_track_frame(where, speed), this); XMLNode &after = rv->region()->playlist()->get_state(); - session->add_command(new MementoCommand( + _session->add_command(new MementoCommand( *(rv->region()->playlist()), &before, &after)); } - + commit_reversible_command (); } @@ -3596,12 +3537,91 @@ Editor::trim_region_from_edit_point () } XMLNode &before = rv->region()->playlist()->get_state(); - rv->region()->trim_front ( session_frame_to_track_frame(where, speed), this); + rv->region()->trim_front (session_frame_to_track_frame(where, speed), this); XMLNode &after = rv->region()->playlist()->get_state(); - session->add_command(new MementoCommand( + _session->add_command(new MementoCommand( *(rv->region()->playlist()), &before, &after)); } - + + commit_reversible_command (); +} + +void +Editor::trim_region_to_previous_region_end () +{ + return trim_to_region(false); +} + +void +Editor::trim_region_to_next_region_start () +{ + return trim_to_region(true); +} + +void +Editor::trim_to_region(bool forward) +{ + RegionSelection rs; + + get_regions_for_action (rs); + + begin_reversible_command (_("trim to region")); + + boost::shared_ptr next_region; + + for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { + + AudioRegionView* arv = dynamic_cast (*x); + + if (!arv) { + continue; + } + + AudioTimeAxisView* atav = dynamic_cast (&arv->get_time_axis_view()); + + if (!atav) { + return; + } + + float speed = 1.0; + + if (atav->get_diskstream() != 0) { + speed = atav->get_diskstream()->speed(); + } + + + boost::shared_ptr region = arv->region(); + boost::shared_ptr playlist (region->playlist()); + + XMLNode &before = playlist->get_state(); + + if(forward){ + + next_region = playlist->find_next_region (region->first_frame(), Start, 1); + + if(!next_region){ + continue; + } + + region->trim_end((nframes64_t) (next_region->first_frame() * speed), this); + arv->region_changed (Change (LengthChanged)); + } + else { + + next_region = playlist->find_next_region (region->first_frame(), Start, 0); + + if(!next_region){ + continue; + } + + region->trim_front((nframes64_t) ((next_region->last_frame() + 1) * speed), this); + arv->region_changed (Change (LengthChanged|PositionChanged|StartChanged)); + } + + XMLNode &after = playlist->get_state(); + _session->add_command(new MementoCommand(*playlist, &before, &after)); + } + commit_reversible_command (); } @@ -3611,14 +3631,15 @@ 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 (); } @@ -3631,9 +3652,9 @@ Editor::freeze_thread () } gint -Editor::freeze_progress_timeout (void *arg) +Editor::freeze_progress_timeout (void */*arg*/) { - interthread_progress_bar.set_fraction (current_interthread_info->progress/100); + interthread_progress_bar.set_fraction (current_interthread_info->progress); return !(current_interthread_info->done || current_interthread_info->cancel); } @@ -3643,16 +3664,14 @@ 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_title (_("Freeze")); interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); interthread_progress_window->show_all (); interthread_progress_bar.set_fraction (0.0f); @@ -3660,20 +3679,14 @@ Editor::freeze_route () interthread_cancel_label.set_text (_("Cancel Freeze")); current_interthread_info = &itt; - interthread_progress_connection = - Glib::signal_timeout().connect (bind (mem_fun(*this, &Editor::freeze_progress_timeout), (gpointer) 0), 100); + interthread_progress_connection = + Glib::signal_timeout().connect (sigc::bind (sigc::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 (&itt.thread, &attr, _freeze_thread, this); - - 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)); @@ -3688,7 +3701,7 @@ Editor::freeze_route () } void -Editor::bounce_range_selection (bool replace) +Editor::bounce_range_selection (bool replace, bool enable_processing) { if (selection->time.empty()) { return; @@ -3709,22 +3722,22 @@ Editor::bounce_range_selection (bool replace) 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); - + 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)); @@ -3733,9 +3746,9 @@ Editor::bounce_range_selection (bool replace) } XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand (*playlist, &before, &after)); + _session->add_command (new MementoCommand (*playlist, &before, &after)); } - + commit_reversible_command (); } @@ -3759,19 +3772,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; } @@ -3783,7 +3796,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.*/ @@ -3809,12 +3822,11 @@ Editor::cut_copy (CutCopyOp op) */ if (op == Cut || op == Clear) { - if (drag_info.item) { - drag_info.item->ungrab (0); - drag_info.item = 0; + if (_drags->active ()) { + _drags->abort (); } } - + cut_buffer->clear (); if (entered_marker) { @@ -3824,80 +3836,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 (); - + _drags->break_drag (); return; } - RegionSelection rs; + if (internal_editing()) { + + switch (current_mouse_mode()) { + case MouseObject: + case MouseRange: + cut_copy_midi (op); + break; + default: + break; + } + + } else { - /* we only want to cut regions if some are selected */ + RegionSelection rs; - if (!selection->regions.empty()) { - get_regions_for_action (rs); - } + /* we only want to cut regions if some are selected */ - switch (current_mouse_mode()) { - case MouseObject: - if (!rs.empty() || !selection->points.empty()) { + if (!selection->regions.empty()) { + get_regions_for_action (rs, false, false); + } + + switch (current_mouse_mode()) { + case MouseObject: + if (!rs.empty() || !selection->points.empty()) { - begin_reversible_command (opname + _(" objects")); + begin_reversible_command (opname + _(" objects")); - if (!rs.empty()) { - cut_copy_regions (op, rs); - - if (op == Cut) { - selection->clear_regions (); + 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 (); + _drags->break_drag (); } } @@ -3909,11 +3933,23 @@ 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); - } + } + } +} + +/** 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); } } @@ -3927,21 +3963,114 @@ struct lt_playlist { return a.playlist < b.playlist; } }; - -struct PlaylistMapping { + +struct PlaylistMapping { TimeAxisView* tv; boost::shared_ptr pl; PlaylistMapping (TimeAxisView* tvp) : tv (tvp) {} }; +/** Remove `clicked_regionview' */ +void +Editor::remove_clicked_region () +{ + if (clicked_routeview == 0 || clicked_regionview == 0) { + return; + } + + boost::shared_ptr playlist = clicked_routeview->playlist(); + + begin_reversible_command (_("remove region")); + XMLNode &before = playlist->get_state(); + playlist->remove_region (clicked_regionview->region()); + XMLNode &after = playlist->get_state(); + _session->add_command(new MementoCommand(*playlist, &before, &after)); + commit_reversible_command (); +} + + +/** Remove the selected regions */ +void +Editor::remove_selected_regions () +{ + RegionSelection rs; + get_regions_for_action (rs); + + if (!_session) { + return; + } + + if (rs.empty()) { + return; + } + + begin_reversible_command (_("remove region")); + + 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()); + } + + vector playlists; + + 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); + } + + playlist->remove_region (*rl); + } + + 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 (); +} /** Cut, copy or clear selected regions. * @param op Operation (Cut, Copy or Clear) */ void Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) -{ +{ /* we can't use a std::map here because the ordering is important, and we can't trivially sort a map when we want ordered access to both elements. i think. */ @@ -3949,12 +4078,12 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) vector pmap; nframes64_t first_position = max_frames; - + set freezelist; pair::iterator,bool> insert_result; - + /* get ordering correct before we cut/copy */ - + rs.sort_by_position_and_track (); for (RegionSelection::iterator x = rs.begin(); x != rs.end(); ++x) { @@ -3965,15 +4094,21 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) boost::shared_ptr pl = (*x)->region()->playlist(); if (pl) { + set::iterator fl; + + //only take state if this is a new playlist. + for (fl = freezelist.begin(); fl != freezelist.end(); ++fl) { + if ((*fl).playlist == pl) { + break; + } + } - PlaylistState before; - before.playlist = pl; - before.before = &pl->get_state(); - - insert_result = freezelist.insert (before); - - if (insert_result.second) { + if (fl == freezelist.end()) { + PlaylistState before; + before.playlist = pl; + before.before = &pl->get_state(); pl->freeze (); + insert_result = freezelist.insert (before); } } } @@ -3986,7 +4121,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) break; } } - + if (z == pmap.end()) { pmap.push_back (PlaylistMapping (tv)); } @@ -3995,7 +4130,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; @@ -4004,28 +4139,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; @@ -4037,12 +4172,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; @@ -4050,16 +4185,16 @@ 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); @@ -4067,15 +4202,15 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) 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())); + _session->add_command (new MementoCommand(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state())); } } void Editor::cut_copy_ranges (CutCopyOp op) { - TrackSelection* ts; - TrackSelection entered; + TrackViewList* ts; + TrackViewList entered; if (selection->tracks.empty()) { if (!entered_track) { @@ -4117,8 +4252,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) { @@ -4127,13 +4268,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; @@ -4143,81 +4283,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(); + /* undo/redo is handled by individual tracks/regions */ - if (selected->count_selected_rows() != 1 || selection->tracks.empty()) { - return; - } + if (internal_editing()) { - TreeModel::iterator i = selected->get_selected(); - NamedSelection* ns = (*i)[named_selection_columns.selection]; + RegionSelection rs; + RegionSelection::iterator r; + MidiNoteSelection::iterator cb; - list >::iterator chunk; - list >::iterator tmp; + get_regions_at (rs, position, ts); - chunk = ns->playlists.begin(); - - begin_reversible_command (_("paste chunk")); - - sort_track_selection (); - - for (t = selection->tracks.begin(); t != selection->tracks.end(); ++t) { - - RouteTimeAxisView* rtv; - boost::shared_ptr pl; - boost::shared_ptr apl; - - 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 (); @@ -4229,15 +4336,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->duplicate (r, end_frame + (r->first_frame() - start_frame) + 1, times); + _session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); c.disconnect (); - + foo.insert (foo.end(), latest_regionviews.begin(), latest_regionviews.end()); } @@ -4255,16 +4362,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(); @@ -4276,7 +4383,7 @@ Editor::duplicate_selection (float times) XMLNode &before = playlist->get_state(); 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 MementoCommand(*playlist, &before, &after)); ++ri; if (ri == new_regions.end()) { @@ -4293,26 +4400,26 @@ 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); - } + } } } void Editor::center_playhead () { - float page = canvas_width * frames_per_unit; + float page = _canvas_width * frames_per_unit; center_screen_internal (playhead_cursor->current_frame, page); } void Editor::center_edit_point () { - float page = canvas_width * frames_per_unit; + float page = _canvas_width * frames_per_unit; center_screen_internal (get_preferred_edit_position(), page); } @@ -4323,14 +4430,14 @@ Editor::clear_playlist (boost::shared_ptr playlist) XMLNode &before = playlist->get_state(); playlist->clear (); XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand(*playlist.get(), &before, &after)); + _session->add_command (new MementoCommand(*playlist.get(), &before, &after)); 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; @@ -4344,26 +4451,26 @@ 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->nudge_after (start, distance, forwards); XMLNode &after = playlist->get_state(); - session->add_command (new MementoCommand(*playlist, &before, &after)); + _session->add_command (new MementoCommand(*playlist, &before, &after)); } - - commit_reversible_command (); + + commit_reversible_command (); } void @@ -4371,8 +4478,8 @@ Editor::remove_last_capture () { vector choices; string prompt; - - if (!session) { + + if (!_session) { return; } @@ -4382,30 +4489,48 @@ 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 (); } } else { - session->remove_last_capture(); + _session->remove_last_capture(); } } void Editor::normalize_region () { - RegionSelection rs; + if (!_session) { + return; + } + RegionSelection rs; get_regions_for_action (rs); - - if (!session) { + + if (rs.empty()) { return; } - if (rs.empty()) { + Dialog dialog (rs.size() > 1 ? _("Normalize regions") : _("Normalize region")); + HBox hbox; + hbox.pack_start (*manage (new Label (_("Normalize to:")))); + SpinButton spin (0.2, 2); + spin.set_range (-112, 0); + spin.set_increments (0.1, 1); + spin.set_value (0); + hbox.pack_start (spin); + spin.set_value (_last_normalization_value); + hbox.pack_start (*manage (new Label (_("dbFS")))); + hbox.show_all (); + dialog.get_vbox()->pack_start (hbox); + dialog.add_button (Stock::CANCEL, RESPONSE_CANCEL); + dialog.add_button (_("Normalize"), RESPONSE_ACCEPT); + + if (dialog.run () == RESPONSE_CANCEL) { return; } @@ -4419,23 +4544,25 @@ Editor::normalize_region () if (!arv) continue; XMLNode &before = arv->region()->get_state(); - arv->audio_region()->normalize_to (0.0f); - session->add_command (new MementoCommand(*(arv->region().get()), &before, &arv->region()->get_state())); + arv->audio_region()->normalize_to (spin.get_value()); + _session->add_command (new MementoCommand(*(arv->region().get()), &before, &arv->region()->get_state())); } commit_reversible_command (); track_canvas->get_window()->set_cursor (*current_canvas_cursor); + + _last_normalization_value = spin.get_value (); } void -Editor::denormalize_region () +Editor::reset_region_scale_amplitude () { - if (!session) { + if (!_session) { return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -4443,7 +4570,7 @@ 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); @@ -4451,7 +4578,7 @@ Editor::denormalize_region () continue; XMLNode &before = arv->region()->get_state(); 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 MementoCommand(*(arv->region().get()), &before, &arv->region()->get_state())); } commit_reversible_command (); @@ -4460,11 +4587,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); @@ -4479,9 +4606,9 @@ Editor::adjust_region_scale_amplitude (bool up) if (!arv) continue; XMLNode &before = arv->region()->get_state(); - + double fraction = gain_to_slider_position (arv->audio_region()->scale_amplitude ()); - + if (up) { fraction += 0.05; fraction = min (fraction, 1.0); @@ -4495,15 +4622,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 MementoCommand(*(arv->region().get()), &before, &arv->region()->get_state())); } commit_reversible_command (); @@ -4513,31 +4638,120 @@ 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) { + return; + } + + RegionSelection rs; + get_regions_for_action (rs); + + if (rs.empty()) { + return; + } + + 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); + int const r = d.run (); + + if (r == Gtk::RESPONSE_OK) { + 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); + + vector::Notes> v; + v.push_back (selected); + + return op (mrv.midi_region()->model(), v); +} + +void +Editor::apply_midi_note_edit_op (MidiOperator& op) +{ + RegionSelection rs; + Command* cmd; + + get_regions_for_action (rs); + + if (rs.empty()) { + return; + } + + 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::quantize_region () { - if (!session) { + if (!_session) { return; } - // FIXME: varying meter? - Quantize quant (*session, snap_length_beats(0)); - apply_filter (quant, _("quantize regions")); + 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; + RegionSelection rs; get_regions_for_action (rs); @@ -4554,13 +4768,6 @@ Editor::apply_filter (Filter& filter, string command) RegionSelection::iterator tmp = r; ++tmp; - MidiRegionView* const mrv = dynamic_cast(*r); - if (mrv) { - if (mrv->midi_region()->apply(filter) == 0) { - mrv->redisplay_model(); - } - } - AudioRegionView* const arv = dynamic_cast(*r); if (arv) { boost::shared_ptr playlist = arv->region()->playlist(); @@ -4568,9 +4775,30 @@ Editor::apply_filter (Filter& filter, string command) if (arv->audio_region()->apply (filter) == 0) { XMLNode &before = playlist->get_state(); - playlist->replace_region (arv->region(), filter.results.front(), arv->region()->position()); + + if (filter.results.empty ()) { + + /* no regions returned; remove the old one */ + playlist->remove_region (arv->region ()); + + } else { + + std::vector >::iterator res = filter.results.begin (); + + /* first region replaces the old one */ + playlist->replace_region (arv->region(), *res, (*res)->position()); + ++res; + + /* add the rest */ + while (res != filter.results.end()) { + playlist->add_region (*res, (*res)->position()); + ++res; + } + + } + XMLNode &after = playlist->get_state(); - session->add_command(new MementoCommand(*playlist, &before, &after)); + _session->add_command(new MementoCommand(*playlist, &before, &after)); } else { goto out; } @@ -4624,7 +4852,7 @@ void Editor::brush (nframes64_t pos) { RegionSelection sel; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -4642,15 +4870,13 @@ Editor::brush (nframes64_t pos) void Editor::reset_region_gain_envelopes () { - RegionSelection rs; - - get_regions_for_action (rs); + RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); - 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); @@ -4659,90 +4885,144 @@ 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; + RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); - get_regions_for_action (rs); + if (!_session || rs.empty()) { + return; + } + + _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->set_envelope_visible (!arv->envelope_visible()); + XMLNode &after = arv->region()->get_state (); + _session->add_command (new MementoCommand (*(arv->region().get()), &before, &after)); } } + + _session->commit_reversible_command (); } void Editor::toggle_gain_envelope_active () { - RegionSelection rs; + RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); - get_regions_for_action (rs); + if (!_session || rs.empty()) { + return; + } + + _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->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->commit_reversible_command (); } void Editor::toggle_region_lock () { - RegionSelection rs; + RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); - get_regions_for_action (rs); + if (!_session || rs.empty()) { + return; + } + + _session->begin_reversible_command (_("region lock")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + XMLNode &before = (*i)->region()->get_state (); (*i)->region()->set_locked (!(*i)->region()->locked()); + XMLNode &after = (*i)->region()->get_state (); + _session->add_command (new MementoCommand (*((*i)->region().get()), &before, &after)); } + + _session->commit_reversible_command (); } void Editor::set_region_lock_style (Region::PositionLockStyle ps) { - RegionSelection rs; + RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); - get_regions_for_action (rs); + if (!_session || rs.empty()) { + return; + } + + _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)); } + + _session->commit_reversible_command (); } void Editor::toggle_region_mute () { - RegionSelection rs; + RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); - get_regions_for_action (rs); + if (!_session || rs.empty()) { + return; + } + + _session->begin_reversible_command (_("region mute")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + XMLNode &before = (*i)->region()->get_state (); (*i)->region()->set_muted (!(*i)->region()->muted()); + XMLNode &after = (*i)->region()->get_state (); + _session->add_command (new MementoCommand (*((*i)->region().get()), &before, &after)); } + + _session->commit_reversible_command (); } void Editor::toggle_region_opaque () { - RegionSelection rs; + RegionSelection rs = get_equivalent_regions (selection->regions, RouteGroup::Edit); - get_regions_for_action (rs); + if (!_session || rs.empty()) { + return; + } + + _session->begin_reversible_command (_("region opacity")); for (RegionSelection::iterator i = rs.begin(); i != rs.end(); ++i) { + XMLNode &before = (*i)->region()->get_state (); (*i)->region()->set_opaque (!(*i)->region()->opaque()); + XMLNode &after = (*i)->region()->get_state (); + _session->add_command (new MementoCommand (*((*i)->region().get()), &before, &after)); } + + _session->commit_reversible_command (); } void @@ -4770,26 +5050,22 @@ Editor::toggle_record_enable () void Editor::set_fade_length (bool in) { - RegionSelection rs; - - get_regions_for_action (rs); - - /* we need a region to measure the offset from the start */ + RegionSelection rs; - RegionView* rv; + get_regions_for_action (rs, true); - if (!rs.empty()) { - rv = rs.front(); - } else if (entered_regionview) { - rv = entered_regionview; - } else { + if (rs.empty()) { return; } + /* we need a region to measure the offset from the start */ + + RegionView* rv = rs.front (); + nframes64_t pos = get_preferred_edit_position(); nframes64_t len; char* cmd; - + if (pos > rv->region()->last_frame() || pos < rv->region()->first_frame()) { /* edit point is outside the relevant region */ return; @@ -4836,9 +5112,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 (); @@ -4847,7 +5123,7 @@ Editor::set_fade_length (bool in) void Editor::toggle_fade_active (bool in) { - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -4863,7 +5139,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; } @@ -4871,7 +5147,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(); @@ -4888,7 +5164,7 @@ Editor::toggle_fade_active (bool in) region->set_fade_out_active (!yn); } XMLNode &after = region->get_state(); - session->add_command(new MementoCommand(*region.get(), &before, &after)); + _session->add_command(new MementoCommand(*region.get(), &before, &after)); } commit_reversible_command (); @@ -4897,7 +5173,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); @@ -4918,19 +5194,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); @@ -4951,9 +5227,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 (); @@ -4962,7 +5238,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); @@ -4985,9 +5261,9 @@ Editor::set_fade_in_active (bool yn) XMLNode &before = ar->get_state(); ar->set_fade_in_active (yn); - + XMLNode &after = ar->get_state(); - session->add_command(new MementoCommand(*ar, &before, &after)); + _session->add_command(new MementoCommand(*ar, &before, &after)); } commit_reversible_command (); @@ -4996,7 +5272,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); @@ -5018,9 +5294,9 @@ Editor::set_fade_out_active (bool yn) XMLNode &before = ar->get_state(); ar->set_fade_out_active (yn); - + XMLNode &after = ar->get_state(); - session->add_command(new MementoCommand(*ar, &before, &after)); + _session->add_command(new MementoCommand(*ar, &before, &after)); } commit_reversible_command (); @@ -5035,7 +5311,7 @@ Editor::toggle_selected_region_fades (int dir) bool yn; get_regions_for_action (rs); - + if (rs.empty()) { return; } @@ -5076,7 +5352,7 @@ Editor::toggle_selected_region_fades (int dir) void Editor::update_region_fade_visibility () { - bool _fade_visibility = 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); @@ -5094,8 +5370,8 @@ Editor::update_region_fade_visibility () void Editor::update_xfade_visibility () { - _xfade_visibility = 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) { @@ -5117,11 +5393,11 @@ Editor::set_edit_point () if (!mouse_frame (where, ignored)) { return; } - + snap_to (where); if (selection->markers.empty()) { - + mouse_add_new_marker (where); } else { @@ -5139,7 +5415,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; @@ -5147,11 +5423,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()); } } } @@ -5159,9 +5435,9 @@ Editor::set_playhead_cursor () void Editor::split () { - RegionSelection rs; - - get_regions_for_action (rs); + RegionSelection rs; + + get_regions_for_action (rs, true); nframes64_t where = get_preferred_edit_position(); @@ -5190,49 +5466,6 @@ Editor::ensure_entered_track_selected (bool op_really_wants_one_track_if_none_ar } } -void -Editor::trim_region_front () -{ - trim_region (true); -} - -void -Editor::trim_region_back () -{ - trim_region (false); -} - -void -Editor::trim_region (bool front) -{ - nframes64_t where = get_preferred_edit_position(); - RegionSelection rs; - - get_regions_for_action (rs); - - if (rs.empty()) { - return; - } - - begin_reversible_command (front ? _("trim front") : _("trim back")); - - 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(); - if (front) { - (*i)->region()->trim_front (where, this); - } else { - (*i)->region()->trim_end (where, this); - } - XMLNode &after = pl->get_state(); - session->add_command(new MementoCommand(*pl.get(), &before, &after)); - } - } - - commit_reversible_command (); -} - struct EditorOrderRouteSorter { bool operator() (boost::shared_ptr a, boost::shared_ptr b) { /* use of ">" forces the correct sort order */ @@ -5336,31 +5569,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; } @@ -5368,8 +5601,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); } } @@ -5379,7 +5612,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); @@ -5399,34 +5632,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; } @@ -5440,7 +5673,7 @@ Editor::set_punch_from_region () nframes64_t start = max_frames; nframes64_t end = 0; - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5463,25 +5696,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); @@ -5507,8 +5740,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 */ @@ -5517,24 +5750,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 */ @@ -5543,8 +5776,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()) { @@ -5563,24 +5801,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 (); } @@ -5589,11 +5827,11 @@ Editor::split_region_at_transients () { AnalysisFeatureList positions; - if (!session) { + if (!_session) { return; } - RegionSelection rs; + RegionSelection rs; get_regions_for_action (rs); @@ -5601,7 +5839,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(); ) { @@ -5611,16 +5849,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 (); } @@ -5630,11 +5868,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; } @@ -5669,44 +5907,44 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList return; } } - + if (use_rhythmic_rodent) { show_rhythm_ferret (); return; } - AnalysisFeatureList::const_iterator x; - + AnalysisFeatureList::const_iterator x; + nframes64_t pos = r->position(); 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); - + while (x != positions.end()) { - - /* file start = original start + how far we from the initial position ? + + /* file start = original start + how far we from the initial position ? */ - + nframes64_t file_start = r->start() + (pos - r->position()); /* length = next position - current position */ - + nframes64_t len = (*x) - pos; /* XXX we do we really want to allow even single-sample regions? @@ -5716,13 +5954,13 @@ 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 (_session->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); @@ -5734,7 +5972,7 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList if (*x > r->last_frame()) { /* add final fragment */ - + file_start = r->start() + (pos - r->position()); len = r->last_frame() - pos; @@ -5743,13 +5981,13 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList break; } - } + } pl->thaw (); XMLNode& after (pl->get_state()); - - session->add_command (new MementoCommand(*pl, &before, &after)); + + _session->add_command (new MementoCommand(*pl, &before, &after)); } void @@ -5757,11 +5995,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()) { @@ -5775,7 +6013,7 @@ Editor::tab_to_transient (bool forward) boost::shared_ptr pl = rtv->get_diskstream()->playlist (); if (pl) { nframes64_t result = pl->find_next_transient (pos, forward ? 1 : -1); - + if (result >= 0) { positions.push_back (result); } @@ -5785,21 +6023,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; @@ -5811,7 +6049,7 @@ Editor::tab_to_transient (bool forward) } if (x != positions.end ()) { - session->request_locate (*x); + _session->request_locate (*x); } } else { @@ -5824,19 +6062,19 @@ 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); } } @@ -5844,12 +6082,12 @@ 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); } } @@ -5858,10 +6096,6 @@ Editor::set_track_height (uint32_t h) { TrackSelection& ts (selection->tracks); - if (ts.empty()) { - return; - } - for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { (*x)->set_height (h); } @@ -5919,7 +6153,7 @@ Editor::remove_tracks () } routes.push_back (rtv->_route); } - + if (ntracks + nbusses == 0) { return; } @@ -5960,34 +6194,24 @@ 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); } } -void -Editor::set_waveform_scale (WaveformScale ws) -{ - TrackSelection& ts (selection->tracks); - - if (ts.empty()) { - return; - } - - for (TrackSelection::iterator x = ts.begin(); x != ts.end(); ++x) { - AudioTimeAxisView* atv = dynamic_cast (*x); - if (atv) { - atv->set_waveform_scale (ws); - } - } -} - void Editor::do_insert_time () { @@ -5995,61 +6219,54 @@ Editor::do_insert_time () return; } - nframes64_t pos = get_preferred_edit_position (); ArdourDialog d (*this, _("Insert Time")); - VButtonBox button_box; - VBox option_box; - RadioButtonGroup group; - RadioButton leave_button (group, _("Stay in position")); - RadioButton move_button (group, _("Move")); - RadioButton split_button (group, _("Split & Later Section Moves")); - Label intersect_option_label (_("Intersected regions should:")); - CheckButton glue_button (_("Move Glued Regions")); - CheckButton marker_button (_("Move Markers")); - AudioClock clock ("insertTimeClock", true, X_("InsertTimeClock"), true, true, true); - HBox clock_box; - clock.set (0); - clock.set_session (session); - clock.set_bbt_reference (pos); + nframes64_t const pos = get_preferred_edit_position (); - clock_box.pack_start (clock, false, true); + d.get_vbox()->set_border_width (12); + d.get_vbox()->set_spacing (4); - option_box.set_spacing (6); - option_box.pack_start (intersect_option_label, false, false); - option_box.pack_start (button_box, false, false); - option_box.pack_start (glue_button, false, false); - option_box.pack_start (marker_button, false, false); + Table table (2, 2); + table.set_spacings (4); - button_box.pack_start (leave_button, false, false); - button_box.pack_start (move_button, false, false); - button_box.pack_start (split_button, false, false); - - d.get_vbox()->set_border_width (12); - d.get_vbox()->pack_start (clock_box, false, false); - d.get_vbox()->pack_start (option_box, false, false); - - leave_button.show (); - move_button.show (); - split_button.show (); - intersect_option_label.show (); - option_box.show (); - button_box.show (); - glue_button.show (); - clock.show_all(); - clock_box.show (); - marker_button.show (); + 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, false, true, true); + clock.set (0); + clock.set_session (_session); + clock.set_bbt_reference (pos); + table.attach (clock, 1, 2, 0, 1); + + Label intersected_label (_("Intersected regions should:")); + intersected_label.set_alignment (1, 0.5); + table.attach (intersected_label, 0, 1, 1, 2, FILL | EXPAND); + ComboBoxText intersected_combo; + intersected_combo.append_text (_("stay in position")); + intersected_combo.append_text (_("move")); + intersected_combo.append_text (_("be split")); + intersected_combo.set_active (0); + table.attach (intersected_combo, 1, 2, 1, 2); + + d.get_vbox()->pack_start (table); + + CheckButton move_glued (_("Move glued regions")); + d.get_vbox()->pack_start (move_glued); + CheckButton move_markers (_("Move markers")); + 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 (Gtk::Stock::OK, Gtk::RESPONSE_OK); - d.show (); + d.add_button (_("Insert time"), Gtk::RESPONSE_OK); + d.show_all (); int response = d.run (); if (response != RESPONSE_OK) { return; } - + nframes64_t distance = clock.current_duration (pos); if (distance == 0) { @@ -6058,20 +6275,24 @@ Editor::do_insert_time () InsertTimeOption opt; - if (leave_button.get_active()) { + switch (intersected_combo.get_active_row_number ()) { + case 0: opt = LeaveIntersected; - } else if (move_button.get_active()) { + break; + case 1: opt = MoveIntersected; - } else { + break; + case 2: opt = SplitIntersected; + break; } - insert_time (pos, distance, opt, glue_button.get_active(), marker_button.get_active()); + insert_time (pos, distance, opt, move_glued.get_active(), move_markers.get_active(), move_tempos.get_active()); } void -Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, - bool ignore_music_glue, bool markers_too) +Editor::insert_time (nframes64_t pos, nframes64_t frames, InsertTimeOption opt, + bool ignore_music_glue, bool markers_too, bool tempo_too) { bool commit = false; @@ -6084,23 +6305,23 @@ 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(); - + 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)); + + _session->add_command (new MementoCommand (*pl, &before, &after)); commit = true; } - + /* automation */ RouteTimeAxisView* rtav = dynamic_cast (*x); if (rtav) { @@ -6112,11 +6333,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) { @@ -6129,26 +6350,36 @@ 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); + } + if (commit) { commit_reversible_command (); } } void -Editor::fit_tracks () +Editor::fit_selected_tracks () { - if (selection->tracks.empty()) { + fit_tracks (selection->tracks); +} + +void +Editor::fit_tracks (TrackViewList & tracks) +{ + if (tracks.empty()) { return; } uint32_t child_heights = 0; - for (TrackSelection::iterator t = selection->tracks.begin(); t != selection->tracks.end(); ++t) { + for (TrackSelection::iterator t = tracks.begin(); t != tracks.end(); ++t) { if (!(*t)->marked_for_display()) { continue; @@ -6157,32 +6388,32 @@ Editor::fit_tracks () child_heights += (*t)->effective_height() - (*t)->current_height(); } - uint32_t h = (uint32_t) floor ((canvas_height - child_heights - canvas_timebars_vsize)/selection->tracks.size()); + 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) { - MessageDialog msg (*this, _("There are too many selected tracks to fit in the current window")); + 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 = selection->selected (track_views.front()); + bool is_selected = tracks.contains (track_views.front()); bool next_is_selected; 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 = selection->selected (*next); + next_is_selected = tracks.contains (*next); } else { next_is_selected = false; } @@ -6200,10 +6431,10 @@ Editor::fit_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); @@ -6241,10 +6472,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); } } @@ -6252,11 +6481,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); } } @@ -6265,7 +6496,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);