X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=280804c94f93a690034476d8996f392daa07a701;hb=bcd511aa3fec59e1527c8b7ab80dabda4db1a6f9;hp=e7c81e694e2f68a990e8fff5a8d5fd6d578582b3;hpb=fe83d9b77e0aff0af45d8c9ef4f1d8187b8f600e;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index e7c81e694e..280804c94f 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -25,11 +25,10 @@ #include #include -#include - #include #include #include +#include #include #include @@ -38,9 +37,7 @@ #include #include #include -#include -#include -#include +#include #include #include #include @@ -55,18 +52,20 @@ #include "audio_time_axis.h" #include "automation_time_axis.h" #include "streamview.h" -#include "regionview.h" +#include "audio_region_view.h" #include "rgb_macros.h" #include "selection_templates.h" #include "selection.h" #include "sfdb_ui.h" #include "editing.h" #include "gtk-custom-hruler.h" +#include "gui_thread.h" #include "i18n.h" using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace sigc; using namespace Gtk; using namespace Editing; @@ -92,7 +91,7 @@ Editor::redo (uint32_t n) } int -Editor::ensure_cursor (jack_nframes_t *pos) +Editor::ensure_cursor (nframes_t *pos) { *pos = edit_cursor->current_frame; return 0; @@ -105,32 +104,35 @@ Editor::split_region () } void -Editor::split_region_at (jack_nframes_t where) +Editor::split_region_at (nframes_t where) { - split_regions_at (where, selection->audio_regions); + split_regions_at (where, selection->regions); } void -Editor::split_regions_at (jack_nframes_t where, AudioRegionSelection& regions) +Editor::split_regions_at (nframes_t where, RegionSelection& regions) { begin_reversible_command (_("split")); snap_to (where); - for (AudioRegionSelection::iterator a = regions.begin(); a != regions.end(); ) { + for (RegionSelection::iterator a = regions.begin(); a != regions.end(); ) { - AudioRegionSelection::iterator tmp; + RegionSelection::iterator tmp; tmp = a; ++tmp; - Playlist* pl = (*a)->region.playlist(); + Playlist* pl = (*a)->region()->playlist(); - _new_regionviews_show_envelope = (*a)->envelope_visible(); + AudioRegionView* const arv = dynamic_cast(*a); + if (arv) + _new_regionviews_show_envelope = arv->envelope_visible(); if (pl) { - session->add_undo (pl->get_memento()); - pl->split_region ((*a)->region, where); - session->add_redo_no_execute (pl->get_memento()); + XMLNode &before = pl->get_state(); + pl->split_region ((*a)->region(), where); + XMLNode &after = pl->get_state(); + session->add_command(new MementoCommand(*pl, &before, &after)); } a = tmp; @@ -150,16 +152,17 @@ Editor::remove_clicked_region () Playlist* playlist = clicked_audio_trackview->playlist(); begin_reversible_command (_("remove region")); - session->add_undo (playlist->get_memento()); - playlist->remove_region (&clicked_regionview->region); - session->add_redo_no_execute (playlist->get_memento()); + 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 (); } void Editor::destroy_clicked_region () { - int32_t selected = selection->audio_regions.size(); + int32_t selected = selection->regions.size(); if (!session || clicked_regionview == 0 && selected == 0) { return; @@ -174,78 +177,71 @@ Do you really want to destroy %1 ?"), (selected > 1 ? _("these regions") : _("this region"))); + choices.push_back (_("No, do nothing.")); + if (selected > 1) { choices.push_back (_("Yes, destroy them.")); } else { choices.push_back (_("Yes, destroy it.")); } - choices.push_back (_("No, do nothing.")); - Gtkmm2ext::Choice prompter (prompt, choices); - - prompter.chosen.connect (Gtk::Main::quit.slot()); - prompter.show_all (); - - Gtk::Main::run (); - - if (prompter.get_choice() != 0) { + + if (prompter.run() == 0) { /* first choice */ return; } if (selected > 0) { - list r; + list > r; - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - r.push_back (&(*i)->region); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + r.push_back ((*i)->region()); } session->destroy_regions (r); } else if (clicked_regionview) { - session->destroy_region (&clicked_regionview->region); + session->destroy_region (clicked_regionview->region()); } } -AudioRegion * +boost::shared_ptr Editor::select_region_for_operation (int dir, TimeAxisView **tv) { - AudioRegionView* rv; - AudioRegion *region; - jack_nframes_t start = 0; + RegionView* rv; + boost::shared_ptr region; + nframes_t start = 0; if (selection->time.start () == selection->time.end_frame ()) { /* no current selection-> is there a selected regionview? */ - if (selection->audio_regions.empty()) { - return 0; + if (selection->regions.empty()) { + return region; } } - region = 0; - - if (!selection->audio_regions.empty()) { + if (!selection->regions.empty()) { - rv = *(selection->audio_regions.begin()); + rv = *(selection->regions.begin()); (*tv) = &rv->get_time_axis_view(); - region = &rv->region; + region = rv->region(); } else if (!selection->tracks.empty()) { (*tv) = selection->tracks.front(); - AudioTimeAxisView* atv; + RouteTimeAxisView* rtv; - if ((atv = dynamic_cast (*tv)) != 0) { + if ((rtv = dynamic_cast (*tv)) != 0) { Playlist *pl; - if ((pl = atv->playlist()) == 0) { - return 0; + if ((pl = rtv->playlist()) == 0) { + return region; } - region = dynamic_cast (pl->top_region_at (start)); + region = pl->top_region_at (start); } } @@ -256,8 +252,8 @@ void Editor::extend_selection_to_end_of_region (bool next) { TimeAxisView *tv; - Region *region; - jack_nframes_t start; + boost::shared_ptr region; + nframes_t start; if ((region = select_region_for_operation (next ? 1 : 0, &tv)) == 0) { return; @@ -284,8 +280,8 @@ void Editor::extend_selection_to_start_of_region (bool previous) { TimeAxisView *tv; - Region *region; - jack_nframes_t end; + boost::shared_ptr region; + nframes_t end; if ((region = select_region_for_operation (previous ? -1 : 0, &tv)) == 0) { return; @@ -312,27 +308,28 @@ Editor::extend_selection_to_start_of_region (bool previous) void Editor::nudge_forward (bool next) { - jack_nframes_t distance; - jack_nframes_t next_distance; + nframes_t distance; + nframes_t next_distance; if (!session) return; - if (!selection->audio_regions.empty()) { + if (!selection->regions.empty()) { begin_reversible_command (_("nudge forward")); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - AudioRegion& r ((*i)->region); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + boost::shared_ptr r ((*i)->region()); - distance = get_nudge_distance (r.position(), next_distance); + distance = get_nudge_distance (r->position(), next_distance); if (next) { distance = next_distance; } - session->add_undo (r.playlist()->get_memento()); - r.set_position (r.position() + distance, this); - session->add_redo_no_execute (r.playlist()->get_memento()); + 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)); } commit_reversible_command (); @@ -346,32 +343,33 @@ Editor::nudge_forward (bool next) void Editor::nudge_backward (bool next) { - jack_nframes_t distance; - jack_nframes_t next_distance; + nframes_t distance; + nframes_t next_distance; if (!session) return; - if (!selection->audio_regions.empty()) { + if (!selection->regions.empty()) { begin_reversible_command (_("nudge forward")); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - AudioRegion& r ((*i)->region); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + boost::shared_ptr r ((*i)->region()); - distance = get_nudge_distance (r.position(), next_distance); + distance = get_nudge_distance (r->position(), next_distance); if (next) { distance = next_distance; } - session->add_undo (r.playlist()->get_memento()); + XMLNode &before = r->playlist()->get_state(); - if (r.position() > distance) { - r.set_position (r.position() - distance, this); + if (r->position() > distance) { + r->set_position (r->position() - distance, this); } else { - r.set_position (0, this); + r->set_position (0, this); } - session->add_redo_no_execute (r.playlist()->get_memento()); + XMLNode &after = r->playlist()->get_state(); + session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); } commit_reversible_command (); @@ -383,7 +381,7 @@ Editor::nudge_backward (bool next) if (playhead_cursor->current_frame > distance) { session->request_locate (playhead_cursor->current_frame - distance); } else { - session->request_locate (0); + session->goto_start(); } } } @@ -391,22 +389,23 @@ Editor::nudge_backward (bool next) void Editor::nudge_forward_capture_offset () { - jack_nframes_t distance; + nframes_t distance; if (!session) return; - if (!selection->audio_regions.empty()) { + if (!selection->regions.empty()) { begin_reversible_command (_("nudge forward")); distance = session->worst_output_latency(); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - AudioRegion& r ((*i)->region); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + boost::shared_ptr r ((*i)->region()); - session->add_undo (r.playlist()->get_memento()); - r.set_position (r.position() + distance, this); - session->add_redo_no_execute (r.playlist()->get_memento()); + 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)); } commit_reversible_command (); @@ -417,27 +416,28 @@ Editor::nudge_forward_capture_offset () void Editor::nudge_backward_capture_offset () { - jack_nframes_t distance; + nframes_t distance; if (!session) return; - if (!selection->audio_regions.empty()) { + if (!selection->regions.empty()) { begin_reversible_command (_("nudge forward")); distance = session->worst_output_latency(); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - AudioRegion& r ((*i)->region); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + boost::shared_ptr r ((*i)->region()); - session->add_undo (r.playlist()->get_memento()); + XMLNode &before = r->playlist()->get_state(); - if (r.position() > distance) { - r.set_position (r.position() - distance, this); + if (r->position() > distance) { + r->set_position (r->position() - distance, this); } else { - r.set_position (0, this); + r->set_position (0, this); } - session->add_redo_no_execute (r.playlist()->get_memento()); + XMLNode &after = r->playlist()->get_state(); + session->add_command(new MementoCommand(*(r->playlist()), &before, &after)); } commit_reversible_command (); @@ -449,7 +449,7 @@ Editor::nudge_backward_capture_offset () void Editor::move_to_start () { - session->request_locate (0); + session->goto_start (); } void @@ -462,9 +462,9 @@ Editor::move_to_end () void Editor::build_region_boundary_cache () { - jack_nframes_t pos = 0; + nframes_t pos = 0; RegionPoint point; - Region *r; + boost::shared_ptr r; TrackViewList tracks; region_boundary_cache.clear (); @@ -518,7 +518,7 @@ Editor::build_region_boundary_cache () } } - jack_nframes_t rpos; + nframes_t rpos; switch (snap_type) { case SnapToRegionStart: @@ -547,7 +547,7 @@ Editor::build_region_boundary_cache () } } - rpos = (jack_nframes_t) floor ( (float) rpos / speed ); + rpos = track_frame_to_session_frame(rpos, speed); if (region_boundary_cache.empty() || rpos != region_boundary_cache.back()) { if (snap_type == SnapToRegionBoundary) { @@ -560,30 +560,30 @@ Editor::build_region_boundary_cache () } } -Region* -Editor::find_next_region (jack_nframes_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack) +boost::shared_ptr +Editor::find_next_region (nframes_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack) { TrackViewList::iterator i; - jack_nframes_t closest = max_frames; - Region* ret = 0; - jack_nframes_t rpos = 0; + nframes_t closest = max_frames; + boost::shared_ptr ret; + nframes_t rpos = 0; float track_speed; - jack_nframes_t track_frame; + nframes_t track_frame; AudioTimeAxisView *atav; for (i = tracks.begin(); i != tracks.end(); ++i) { - jack_nframes_t distance; - Region* r; - + nframes_t distance; + boost::shared_ptr r; + track_speed = 1.0f; if ( (atav = dynamic_cast(*i)) != 0 ) { if (atav->get_diskstream()!=0) track_speed = atav->get_diskstream()->speed(); } - track_frame = (jack_nframes_t) floor ( (float) frame * track_speed ); + track_frame = session_frame_to_track_frame(frame, track_speed); if ((r = (*i)->find_next_region (track_frame, point, dir)) == 0) { continue; @@ -602,8 +602,8 @@ Editor::find_next_region (jack_nframes_t frame, RegionPoint point, int32_t dir, rpos = r->adjust_to_sync (r->first_frame()); break; } - // rpos is a "track frame", converting it to "time frame" - rpos = (jack_nframes_t) floor ( (float) rpos / track_speed ); + // rpos is a "track frame", converting it to "session frame" + rpos = track_frame_to_session_frame(rpos, track_speed); if (rpos > frame) { distance = rpos - frame; @@ -625,8 +625,8 @@ Editor::find_next_region (jack_nframes_t frame, RegionPoint point, int32_t dir, void Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir) { - Region* r; - jack_nframes_t pos = cursor->current_frame; + boost::shared_ptr r; + nframes_t pos = cursor->current_frame; if (!session) { return; @@ -681,8 +681,7 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir) } } - pos = (jack_nframes_t) floor ( (float) pos / speed ); - + pos = track_frame_to_session_frame(pos, speed); if (cursor == playhead_cursor) { session->request_locate (pos); @@ -706,11 +705,11 @@ Editor::cursor_to_previous_region_point (Cursor* cursor, RegionPoint point) void Editor::cursor_to_selection_start (Cursor *cursor) { - jack_nframes_t pos = 0; + nframes_t pos = 0; switch (mouse_mode) { case MouseObject: - if (!selection->audio_regions.empty()) { - pos = selection->audio_regions.start(); + if (!selection->regions.empty()) { + pos = selection->regions.start(); } break; @@ -734,12 +733,12 @@ Editor::cursor_to_selection_start (Cursor *cursor) void Editor::cursor_to_selection_end (Cursor *cursor) { - jack_nframes_t pos = 0; + nframes_t pos = 0; switch (mouse_mode) { case MouseObject: - if (!selection->audio_regions.empty()) { - pos = selection->audio_regions.end_frame(); + if (!selection->regions.empty()) { + pos = selection->regions.end_frame(); } break; @@ -763,8 +762,8 @@ Editor::cursor_to_selection_end (Cursor *cursor) void Editor::playhead_backward () { - jack_nframes_t pos; - jack_nframes_t cnt; + nframes_t pos; + nframes_t cnt; float prefix; bool was_floating; @@ -772,15 +771,15 @@ Editor::playhead_backward () cnt = 1; } else { if (was_floating) { - cnt = (jack_nframes_t) floor (prefix * session->frame_rate ()); + cnt = (nframes_t) floor (prefix * session->frame_rate ()); } else { - cnt = (jack_nframes_t) prefix; + cnt = (nframes_t) prefix; } } pos = playhead_cursor->current_frame; - if ((jack_nframes_t) pos < cnt) { + if ((nframes_t) pos < cnt) { pos = 0; } else { pos -= cnt; @@ -797,8 +796,8 @@ Editor::playhead_backward () void Editor::playhead_forward () { - jack_nframes_t pos; - jack_nframes_t cnt; + nframes_t pos; + nframes_t cnt; bool was_floating; float prefix; @@ -806,9 +805,9 @@ Editor::playhead_forward () cnt = 1; } else { if (was_floating) { - cnt = (jack_nframes_t) floor (prefix * session->frame_rate ()); + cnt = (nframes_t) floor (prefix * session->frame_rate ()); } else { - cnt = (jack_nframes_t) floor (prefix); + cnt = (nframes_t) floor (prefix); } } @@ -837,8 +836,8 @@ Editor::cursor_align (bool playhead_to_edit) void Editor::edit_cursor_backward () { - jack_nframes_t pos; - jack_nframes_t cnt; + nframes_t pos; + nframes_t cnt; float prefix; bool was_floating; @@ -846,15 +845,15 @@ Editor::edit_cursor_backward () cnt = 1; } else { if (was_floating) { - cnt = (jack_nframes_t) floor (prefix * session->frame_rate ()); + cnt = (nframes_t) floor (prefix * session->frame_rate ()); } else { - cnt = (jack_nframes_t) prefix; + cnt = (nframes_t) prefix; } } pos = edit_cursor->current_frame; - if ((jack_nframes_t) pos < cnt) { + if ((nframes_t) pos < cnt) { pos = 0; } else { pos -= cnt; @@ -866,8 +865,8 @@ Editor::edit_cursor_backward () void Editor::edit_cursor_forward () { - jack_nframes_t pos; - jack_nframes_t cnt; + nframes_t pos; + nframes_t cnt; bool was_floating; float prefix; @@ -875,9 +874,9 @@ Editor::edit_cursor_forward () cnt = 1; } else { if (was_floating) { - cnt = (jack_nframes_t) floor (prefix * session->frame_rate ()); + cnt = (nframes_t) floor (prefix * session->frame_rate ()); } else { - cnt = (jack_nframes_t) floor (prefix); + cnt = (nframes_t) floor (prefix); } } @@ -890,16 +889,16 @@ Editor::goto_frame () { float prefix; bool was_floating; - jack_nframes_t frame; + nframes_t frame; if (get_prefix (prefix, was_floating)) { return; } if (was_floating) { - frame = (jack_nframes_t) floor (prefix * session->frame_rate()); + frame = (nframes_t) floor (prefix * session->frame_rate()); } else { - frame = (jack_nframes_t) floor (prefix); + frame = (nframes_t) floor (prefix); } session->request_locate (frame); @@ -908,19 +907,19 @@ Editor::goto_frame () void Editor::scroll_backward (float pages) { - jack_nframes_t frame; - jack_nframes_t one_page = (jack_nframes_t) rint (canvas_width * frames_per_unit); + nframes_t frame; + nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit); bool was_floating; float prefix; - jack_nframes_t cnt; + nframes_t cnt; if (get_prefix (prefix, was_floating)) { - cnt = (jack_nframes_t) floor (pages * one_page); + cnt = (nframes_t) floor (pages * one_page); } else { if (was_floating) { - cnt = (jack_nframes_t) floor (prefix * session->frame_rate()); + cnt = (nframes_t) floor (prefix * session->frame_rate()); } else { - cnt = (jack_nframes_t) floor (prefix * one_page); + cnt = (nframes_t) floor (prefix * one_page); } } @@ -936,24 +935,24 @@ Editor::scroll_backward (float pages) void Editor::scroll_forward (float pages) { - jack_nframes_t frame; - jack_nframes_t one_page = (jack_nframes_t) rint (canvas_width * frames_per_unit); + nframes_t frame; + nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit); bool was_floating; float prefix; - jack_nframes_t cnt; + nframes_t cnt; if (get_prefix (prefix, was_floating)) { - cnt = (jack_nframes_t) floor (pages * one_page); + cnt = (nframes_t) floor (pages * one_page); } else { if (was_floating) { - cnt = (jack_nframes_t) floor (prefix * session->frame_rate()); + cnt = (nframes_t) floor (prefix * session->frame_rate()); } else { - cnt = (jack_nframes_t) floor (prefix * one_page); + cnt = (nframes_t) floor (prefix * one_page); } } - if (ULONG_MAX - cnt < leftmost_frame) { - frame = ULONG_MAX - cnt; + if (max_frames - cnt < leftmost_frame) { + frame = max_frames - cnt; } else { frame = leftmost_frame + cnt; } @@ -974,8 +973,12 @@ Editor::scroll_tracks_down () cnt = (int) floor (prefix); } - Gtk::Adjustment *adj = track_canvas_scroller.get_vadjustment(); - adj->set_value (adj->get_value() + (cnt * adj->get_page_size())); + 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; + } + vertical_adjustment.set_value (vert_value); } void @@ -991,20 +994,27 @@ Editor::scroll_tracks_up () cnt = (int) floor (prefix); } - Gtk::Adjustment *adj = track_canvas_scroller.get_vadjustment(); - adj->set_value (adj->get_value() - (cnt * adj->get_page_size())); + vertical_adjustment.set_value (vertical_adjustment.get_value() - (cnt * vertical_adjustment.get_page_size())); } void Editor::scroll_tracks_down_line () { - edit_vscrollbar.default_vmotion (0, 10); + + Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); + double vert_value = adj->get_value() + 20; + + if (vert_value>adj->get_upper() - canvas_height) { + vert_value = adj->get_upper() - canvas_height; + } + adj->set_value (vert_value); } void Editor::scroll_tracks_up_line () { - edit_vscrollbar.default_vmotion (0, -10); + Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); + adj->set_value (adj->get_value() - 20); } /* ZOOM */ @@ -1012,14 +1022,16 @@ Editor::scroll_tracks_up_line () void Editor::temporal_zoom_step (bool coarser) { + ENSURE_GUI_THREAD (bind (mem_fun (*this, &Editor::temporal_zoom_step), coarser)); + double nfpu; nfpu = frames_per_unit; if (coarser) { - nfpu *= 2.0; + nfpu *= 1.61803399; } else { - nfpu = max(1.0,(nfpu/2.0)); + nfpu = max(1.0,(nfpu/1.61803399)); } temporal_zoom (nfpu); @@ -1030,17 +1042,17 @@ Editor::temporal_zoom (gdouble fpu) { if (!session) return; - jack_nframes_t current_page = current_page_frames(); - jack_nframes_t current_leftmost = leftmost_frame; - jack_nframes_t current_rightmost; - jack_nframes_t current_center; - jack_nframes_t new_page; - jack_nframes_t leftmost_after_zoom = 0; + nframes_t current_page = current_page_frames(); + nframes_t current_leftmost = leftmost_frame; + nframes_t current_rightmost; + nframes_t current_center; + nframes_t new_page; + nframes_t leftmost_after_zoom = 0; double nfpu; nfpu = fpu; - new_page = (jack_nframes_t) floor (canvas_width * nfpu); + new_page = (nframes_t) floor (canvas_width * nfpu); switch (zoom_focus) { case ZoomFocusLeft: @@ -1104,8 +1116,8 @@ Editor::temporal_zoom_selection () return; } - jack_nframes_t start = selection->time[clicked_selection].start; - jack_nframes_t end = selection->time[clicked_selection].end; + nframes_t start = selection->time[clicked_selection].start; + nframes_t end = selection->time[clicked_selection].end; temporal_zoom_by_frame (start, end, "zoom to selection"); } @@ -1113,13 +1125,15 @@ Editor::temporal_zoom_selection () void Editor::temporal_zoom_session () { + ENSURE_GUI_THREAD (mem_fun (*this, &Editor::temporal_zoom_session)); + if (session) { - temporal_zoom_by_frame (0, session->current_end_frame(), "zoom to session"); + temporal_zoom_by_frame (session->current_start_frame(), session->current_end_frame(), "zoom to session"); } } void -Editor::temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string op) +Editor::temporal_zoom_by_frame (nframes_t start, nframes_t end, const string & op) { if (!session) return; @@ -1127,7 +1141,7 @@ Editor::temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string return; } - jack_nframes_t range = end - start; + nframes_t range = end - start; double new_fpu = (double)range / (double)canvas_width; // double p2 = 1.0; @@ -1137,9 +1151,9 @@ Editor::temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string // } // new_fpu = p2; - jack_nframes_t new_page = (jack_nframes_t) floor (canvas_width * new_fpu); - jack_nframes_t middle = (jack_nframes_t) floor( (double)start + ((double)range / 2.0f )); - jack_nframes_t new_leftmost = (jack_nframes_t) floor( (double)middle - ((double)new_page/2.0f)); + nframes_t new_page = (nframes_t) floor (canvas_width * new_fpu); + nframes_t middle = (nframes_t) floor( (double)start + ((double)range / 2.0f )); + nframes_t new_leftmost = (nframes_t) floor( (double)middle - ((double)new_page/2.0f)); if (new_leftmost > middle) new_leftmost = 0; @@ -1152,26 +1166,26 @@ Editor::temporal_zoom_by_frame (jack_nframes_t start, jack_nframes_t end, string } void -Editor::temporal_zoom_to_frame (bool coarser, jack_nframes_t frame) +Editor::temporal_zoom_to_frame (bool coarser, nframes_t frame) { if (!session) return; - jack_nframes_t range_before = frame - leftmost_frame; + double range_before = frame - leftmost_frame; double new_fpu; new_fpu = frames_per_unit; if (coarser) { - new_fpu *= 2.0; - range_before *= 2; + new_fpu *= 1.61803399; + range_before *= 1.61803399; } else { - new_fpu = max(1.0,(new_fpu/2.0)); - range_before /= 2; + new_fpu = max(1.0,(new_fpu/1.61803399)); + range_before /= 1.61803399; } if (new_fpu == frames_per_unit) return; - jack_nframes_t new_leftmost = frame - range_before; + nframes_t new_leftmost = frame - (nframes_t)range_before; if (new_leftmost > frame) new_leftmost = 0; @@ -1184,7 +1198,64 @@ Editor::temporal_zoom_to_frame (bool coarser, jack_nframes_t frame) } void -Editor::select_all_in_track (bool add) +Editor::add_location_from_selection () +{ + if (selection->time.empty()) { + return; + } + + if (session == 0 || clicked_trackview == 0) { + return; + } + + nframes_t start = selection->time[clicked_selection].start; + nframes_t end = selection->time[clicked_selection].end; + + Location *location = new Location (start, end, "selection"); + + 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 () +{ + nframes_t where = session->audible_frame(); + + Location *location = new Location (where, where, "mark", Location::IsMark); + session->begin_reversible_command (_("add marker")); + XMLNode &before = session->locations()->get_state(); + session->locations()->add (location, true); + XMLNode &after = session->locations()->get_state(); + session->add_command(new MementoCommand(*(session->locations()), &before, &after)); + session->commit_reversible_command (); +} + +void +Editor::add_location_from_audio_region () +{ + if (selection->regions.empty()) { + return; + } + + RegionView* rv = *(selection->regions.begin()); + boost::shared_ptr region = rv->region(); + + Location *location = new Location (region->position(), region->last_frame(), region->name()); + 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::select_all_in_track (Selection::Operation op) { list touched; @@ -1194,15 +1265,21 @@ Editor::select_all_in_track (bool add) clicked_trackview->get_selectables (0, max_frames, 0, DBL_MAX, touched); - if (add) { + switch (op) { + case Selection::Toggle: selection->add (touched); - } else { + break; + case Selection::Set: selection->set (touched); + break; + case Selection::Extend: + /* not defined yet */ + break; } } void -Editor::select_all (bool add) +Editor::select_all (Selection::Operation op) { list touched; @@ -1212,13 +1289,19 @@ Editor::select_all (bool add) } (*iter)->get_selectables (0, max_frames, 0, DBL_MAX, touched); } - - if (add) { + begin_reversible_command (_("select all")); + switch (op) { + case Selection::Toggle: selection->add (touched); - } else { + break; + case Selection::Set: selection->set (touched); + break; + case Selection::Extend: + /* not defined yet */ + break; } - + commit_reversible_command (); } void @@ -1250,7 +1333,7 @@ Editor::invert_selection () } bool -Editor::select_all_within (jack_nframes_t start, jack_nframes_t end, double top, double bot, bool add) +Editor::select_all_within (nframes_t start, nframes_t end, double top, double bot, Selection::Operation op) { list touched; @@ -1261,15 +1344,47 @@ Editor::select_all_within (jack_nframes_t start, jack_nframes_t end, double top, (*iter)->get_selectables (start, end, top, bot, touched); } - if (add) { + cerr << "select all within found " << touched.size() << endl; + + begin_reversible_command (_("select all within")); + switch (op) { + case Selection::Toggle: + cerr << "toggle\n"; selection->add (touched); - } else { + break; + case Selection::Set: + cerr << "set\n"; selection->set (touched); + break; + case Selection::Extend: + cerr << "extend\n"; + /* not defined yet */ + break; } + cerr << "selection now has " << selection->points.size() << endl; + + commit_reversible_command (); return !touched.empty(); } +void +Editor::set_selection_from_audio_region () +{ + if (selection->regions.empty()) { + return; + } + + RegionView* rv = *(selection->regions.begin()); + boost::shared_ptr region = rv->region(); + + begin_reversible_command (_("set selection from region")); + selection->set (0, region->position(), region->last_frame()); + commit_reversible_command (); + + set_mouse_mode (Editing::MouseRange, false); +} + void Editor::set_selection_from_punch() { @@ -1290,19 +1405,152 @@ Editor::set_selection_from_loop() if ((location = session->locations()->auto_loop_location()) == 0) { return; } - set_selection_from_range (*location); } void -Editor::set_selection_from_range (Location& range) +Editor::set_selection_from_range (Location& loc) { - if (clicked_trackview == 0) { + begin_reversible_command (_("set selection from range")); + selection->set (0, loc.start(), loc.end()); + commit_reversible_command (); + + set_mouse_mode (Editing::MouseRange, false); +} + +void +Editor::select_all_selectables_using_time_selection () +{ + list touched; + + if (selection->time.empty()) { + return; + } + + nframes_t start = selection->time[clicked_selection].start; + nframes_t end = selection->time[clicked_selection].end; + + if (end - start < 1) { + return; + } + + for (TrackViewList::iterator iter = selection->tracks.begin(); iter != selection->tracks.end(); ++iter) { + if ((*iter)->hidden()) { + continue; + } + (*iter)->get_selectables (start, end - 1, 0, DBL_MAX, touched); + } + + begin_reversible_command (_("select all from range")); + selection->set (touched); + commit_reversible_command (); +} + + +void +Editor::select_all_selectables_using_punch() +{ + Location* location = session->locations()->auto_punch_location(); + list touched; + + if (location == 0 || (location->end() - location->start() <= 1)) { + return; + } + + for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { + if ((*iter)->hidden()) { + continue; + } + (*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched); + } + begin_reversible_command (_("select all from punch")); + selection->set (touched); + commit_reversible_command (); + +} + +void +Editor::select_all_selectables_using_loop() +{ + Location* location = session->locations()->auto_loop_location(); + list touched; + + if (location == 0 || (location->end() - location->start() <= 1)) { + return; + } + + for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { + if ((*iter)->hidden()) { + continue; + } + (*iter)->get_selectables (location->start(), location->end() - 1, 0, DBL_MAX, touched); + } + begin_reversible_command (_("select all from loop")); + selection->set (touched); + commit_reversible_command (); + +} + +void +Editor::select_all_selectables_using_cursor (Cursor *cursor, bool after) +{ + nframes_t start; + nframes_t end; + list touched; + + if (after) { + begin_reversible_command (_("select all after cursor")); + start = cursor->current_frame ; + end = session->current_end_frame(); + } else { + if (cursor->current_frame > 0) { + begin_reversible_command (_("select all before cursor")); + start = 0; + end = cursor->current_frame - 1; + } else { + return; + } + } + + for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { + if ((*iter)->hidden()) { + continue; + } + (*iter)->get_selectables (start, end, 0, DBL_MAX, touched); + } + selection->set (touched); + commit_reversible_command (); +} + +void +Editor::select_all_selectables_between_cursors (Cursor *cursor, Cursor *other_cursor) +{ + nframes_t start; + nframes_t end; + list touched; + bool other_cursor_is_first = cursor->current_frame > other_cursor->current_frame; + + if (cursor->current_frame == other_cursor->current_frame) { return; } + + begin_reversible_command (_("select all between cursors")); + if (other_cursor_is_first) { + start = other_cursor->current_frame; + end = cursor->current_frame - 1; + + } else { + start = cursor->current_frame; + end = other_cursor->current_frame - 1; + } - begin_reversible_command (_("set selection from range")); - selection->set (0, range.start(), range.end()); + for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { + if ((*iter)->hidden()) { + continue; + } + (*iter)->get_selectables (start, end, 0, DBL_MAX, touched); + } + selection->set (touched); commit_reversible_command (); } @@ -1389,14 +1637,14 @@ Editor::jump_backward_to_mark () if (location) { session->request_locate (location->start(), session->transport_rolling()); } else { - session->request_locate (0); + session->goto_start (); } } void Editor::set_mark () { - jack_nframes_t pos; + nframes_t pos; float prefix; bool was_floating; @@ -1404,9 +1652,9 @@ Editor::set_mark () pos = session->audible_frame (); } else { if (was_floating) { - pos = (jack_nframes_t) floor (prefix * session->frame_rate ()); + pos = (nframes_t) floor (prefix * session->frame_rate ()); } else { - pos = (jack_nframes_t) floor (prefix); + pos = (nframes_t) floor (prefix); } } @@ -1418,9 +1666,10 @@ Editor::clear_markers () { if (session) { session->begin_reversible_command (_("clear markers")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); session->locations()->clear_markers (); - session->add_redo_no_execute (session->locations()->get_memento()); + XMLNode &after = session->locations()->get_state(); + session->add_command(new MementoCommand(*(session->locations()), &before, &after)); session->commit_reversible_command (); } } @@ -1430,7 +1679,7 @@ Editor::clear_ranges () { if (session) { session->begin_reversible_command (_("clear ranges")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); Location * looploc = session->locations()->auto_loop_location(); Location * punchloc = session->locations()->auto_punch_location(); @@ -1440,7 +1689,8 @@ Editor::clear_ranges () if (looploc) session->locations()->add (looploc); if (punchloc) session->locations()->add (punchloc); - session->add_redo_no_execute (session->locations()->get_memento()); + XMLNode &after = session->locations()->get_state(); + session->add_command(new MementoCommand(*(session->locations()), &before, &after)); session->commit_reversible_command (); } } @@ -1449,9 +1699,10 @@ void Editor::clear_locations () { session->begin_reversible_command (_("clear locations")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); session->locations()->clear (); - session->add_redo_no_execute (session->locations()->get_memento()); + XMLNode &after = session->locations()->get_state(); + session->add_command(new MementoCommand(*(session->locations()), &before, &after)); session->commit_reversible_command (); session->locations()->clear (); } @@ -1459,20 +1710,19 @@ Editor::clear_locations () /* INSERT/REPLACE */ void -Editor::insert_region_list_drag (AudioRegion& region) +Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) { - gint x, y; double wx, wy; double cx, cy; TimeAxisView *tv; - jack_nframes_t where; + nframes_t where; AudioTimeAxisView *atv = 0; Playlist *playlist; - track_canvas->get_pointer (x, y); + track_canvas.window_to_world (x, y, wx, wy); + wx += horizontal_adjustment.get_value(); + wy += vertical_adjustment.get_value(); - gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), x, y, &wx, &wy); - GdkEvent event; event.type = GDK_BUTTON_RELEASE; event.button.x = wx; @@ -1500,22 +1750,22 @@ Editor::insert_region_list_drag (AudioRegion& region) snap_to (where); begin_reversible_command (_("insert dragged region")); - session->add_undo (playlist->get_memento()); - playlist->add_region (*(new AudioRegion (region)), where, 1.0); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &before = playlist->get_state(); + playlist->add_region (RegionFactory::create (region), where, 1.0); + session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); commit_reversible_command (); } void Editor::insert_region_list_selection (float times) { - AudioTimeAxisView *tv = 0; + RouteTimeAxisView *tv = 0; Playlist *playlist; if (clicked_audio_trackview != 0) { tv = clicked_audio_trackview; } else if (!selection->tracks.empty()) { - if ((tv = dynamic_cast(selection->tracks.front())) == 0) { + if ((tv = dynamic_cast(selection->tracks.front())) == 0) { return; } } else { @@ -1526,21 +1776,29 @@ Editor::insert_region_list_selection (float times) return; } - Gtk::CTree_Helpers::SelectionList& selected = region_list_display.selection(); + Glib::RefPtr selected = region_list_display.get_selection(); - if (selected.empty()) { + if (selected->count_selected_rows() != 1) { return; } - Region* region = reinterpret_cast (selected.front().get_data ()); + TreeView::Selection::ListHandle_Path rows = selected->get_selected_rows (); - begin_reversible_command (_("insert region")); - session->add_undo (playlist->get_memento()); - playlist->add_region (*(createRegion (*region)), edit_cursor->current_frame, times); - session->add_redo_no_execute (playlist->get_memento()); - commit_reversible_command (); -} + /* 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)), edit_cursor->current_frame, times); + session->add_command(new MementoCommand(*playlist, &before, &playlist->get_state())); + commit_reversible_command (); + } +} /* BUILT-IN EFFECTS */ @@ -1566,9 +1824,9 @@ Editor::toggle_playback (bool with_abort) return; } - switch (session->slave_source()) { - case Session::None: - case Session::JACK: + switch (Config->get_slave_source()) { + case None: + case JACK: break; default: /* transport controlled by the master */ @@ -1582,8 +1840,8 @@ Editor::toggle_playback (bool with_abort) if (session->transport_rolling()) { session->request_stop (with_abort); - if (session->get_auto_loop()) { - session->request_auto_loop (false); + if (Config->get_auto_loop()) { + session->request_play_loop (false); } } else { session->request_transport_speed (1.0f); @@ -1593,7 +1851,7 @@ Editor::toggle_playback (bool with_abort) void Editor::play_from_start () { - session->request_locate (0, true); + session->request_locate (session->current_start_frame(), true); } void @@ -1609,35 +1867,27 @@ Editor::play_selection () void Editor::play_selected_region () { - if (!selection->audio_regions.empty()) { - AudioRegionView *rv = *(selection->audio_regions.begin()); - - session->request_bounded_roll (rv->region.position(), rv->region.last_frame()); - } -} + if (!selection->regions.empty()) { + RegionView *rv = *(selection->regions.begin()); -void -Editor::toggle_loop_playback () -{ - if (session) { - session->request_auto_loop (true); + session->request_bounded_roll (rv->region()->position(), rv->region()->last_frame()); } } void Editor::loop_selected_region () { - if (!selection->audio_regions.empty()) { - AudioRegionView *rv = *(selection->audio_regions.begin()); + if (!selection->regions.empty()) { + RegionView *rv = *(selection->regions.begin()); Location* tll; if ((tll = transport_loop_location()) != 0) { - tll->set (rv->region.position(), rv->region.last_frame()); + tll->set (rv->region()->position(), rv->region()->last_frame()); // enable looping, reposition and start rolling - session->request_auto_loop (true); + session->request_play_loop (true); session->request_locate (tll->start(), false); session->request_transport_speed (1.0f); } @@ -1667,7 +1917,7 @@ Editor::loop_location (Location& location) tll->set (location.start(), location.end()); // enable looping, reposition and start rolling - session->request_auto_loop (true); + session->request_play_loop (true); session->request_locate (tll->start(), true); } } @@ -1676,10 +1926,10 @@ void Editor::toggle_region_mute () { if (clicked_regionview) { - clicked_regionview->region.set_muted (!clicked_regionview->region.muted()); - } else if (!selection->audio_regions.empty()) { - bool yn = ! (*selection->audio_regions.begin())->region.muted(); - selection->foreach_audio_region (&AudioRegion::set_muted, yn); + clicked_regionview->region()->set_muted (!clicked_regionview->region()->muted()); + } else if (!selection->regions.empty()) { + bool yn = ! (*selection->regions.begin())->region()->muted(); + selection->foreach_region (&Region::set_muted, yn); } } @@ -1687,35 +1937,35 @@ void Editor::toggle_region_opaque () { if (clicked_regionview) { - clicked_regionview->region.set_opaque (!clicked_regionview->region.opaque()); - } else if (!selection->audio_regions.empty()) { - bool yn = ! (*selection->audio_regions.begin())->region.opaque(); - selection->foreach_audio_region (&Region::set_opaque, yn); + clicked_regionview->region()->set_opaque (!clicked_regionview->region()->opaque()); + } else if (!selection->regions.empty()) { + bool yn = ! (*selection->regions.begin())->region()->opaque(); + selection->foreach_region (&Region::set_opaque, yn); } } void Editor::raise_region () { - selection->foreach_audio_region (&Region::raise); + selection->foreach_region (&Region::raise); } void Editor::raise_region_to_top () { - selection->foreach_audio_region (&Region::raise_to_top); + selection->foreach_region (&Region::raise_to_top); } void Editor::lower_region () { - selection->foreach_audio_region (&Region::lower); + selection->foreach_region (&Region::lower); } void Editor::lower_region_to_bottom () { - selection->foreach_audio_region (&Region::lower_to_bottom); + selection->foreach_region (&Region::lower_to_bottom); } void @@ -1736,7 +1986,7 @@ Editor::rename_region () Button ok_button (_("OK")); Button cancel_button (_("Cancel")); - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } @@ -1764,12 +2014,10 @@ Editor::rename_region () /* recurse */ dialog.show_all (); - ARDOUR_UI::instance()->allow_focus (true); Main::run (); - ARDOUR_UI::instance()->allow_focus (false); if (region_renamed) { - (*selection->audio_regions.begin())->region.set_name (entry.get_text()); + (*selection->regions.begin())->region()->set_name (entry.get_text()); redisplay_regions (); } } @@ -1783,7 +2031,7 @@ Editor::rename_region_finished (bool status) } void -Editor::audition_playlist_region_via_route (AudioRegion& region, Route& route) +Editor::audition_playlist_region_via_route (boost::shared_ptr region, Route& route) { if (session->is_auditioning()) { session->cancel_audition (); @@ -1796,7 +2044,7 @@ Editor::audition_playlist_region_via_route (AudioRegion& region, Route& route) 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 ? */ } @@ -1804,14 +2052,14 @@ Editor::audition_playlist_region_via_route (AudioRegion& region, Route& route) void Editor::audition_selected_region () { - if (!selection->audio_regions.empty()) { - AudioRegionView* rv = *(selection->audio_regions.begin()); - session->audition_region (rv->region); + if (!selection->regions.empty()) { + RegionView* rv = *(selection->regions.begin()); + session->audition_region (rv->region()); } } void -Editor::audition_playlist_region_standalone (AudioRegion& region) +Editor::audition_playlist_region_standalone (boost::shared_ptr region) { session->audition_region (region); } @@ -1819,23 +2067,21 @@ Editor::audition_playlist_region_standalone (AudioRegion& region) void Editor::build_interthread_progress_window () { - interthread_progress_window = new ArdourDialog (X_("interthread progress")); + interthread_progress_window = new ArdourDialog (X_("interthread progress"), true); interthread_progress_bar.set_orientation (Gtk::PROGRESS_LEFT_TO_RIGHT); - interthread_progress_vbox.set_border_width (10); - interthread_progress_vbox.set_spacing (5); - interthread_progress_vbox.pack_start (interthread_progress_label, false, false); - interthread_progress_vbox.pack_start (interthread_progress_bar,false, false); - interthread_progress_vbox.pack_start (interthread_cancel_button,false, false); + interthread_progress_window->get_vbox()->pack_start (interthread_progress_label, false, false); + interthread_progress_window->get_vbox()->pack_start (interthread_progress_bar,false, false); + + // GTK2FIX: this button needs a modifiable label + + Button* b = interthread_progress_window->add_button (Stock::CANCEL, RESPONSE_CANCEL); + b->signal_clicked().connect (mem_fun(*this, &Editor::interthread_cancel_clicked)); interthread_cancel_button.add (interthread_cancel_label); - interthread_cancel_button.signal_clicked().connect (mem_fun(*this, &Editor::interthread_cancel_clicked)); - - interthread_progress_window->set_modal (true); interthread_progress_window->set_default_size (200, 100); - interthread_progress_window->add (interthread_progress_vbox); } void @@ -1846,607 +2092,172 @@ Editor::interthread_cancel_clicked () } } -void * -Editor::_import_thread (void *arg) +void +Editor::region_from_selection () { - PBD::ThreadCreated (pthread_self(), X_("Import")); + if (clicked_trackview == 0) { + return; + } - Editor *ed = (Editor *) arg; - return ed->import_thread (); -} + if (selection->time.empty()) { + return; + } -void * -Editor::import_thread () -{ - session->import_audiofile (import_status); - return 0; -} + nframes_t start = selection->time[clicked_selection].start; + nframes_t end = selection->time[clicked_selection].end; -gint -Editor::import_progress_timeout (void *arg) -{ - interthread_progress_label.set_text (import_status.doing_what); + nframes_t selection_cnt = end - start + 1; + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + boost::shared_ptr current; + boost::shared_ptr current_r; + Playlist *pl; - if (import_status.freeze) { - interthread_cancel_button.set_sensitive(false); - } else { - interthread_cancel_button.set_sensitive(true); - } + nframes_t internal_start; + string new_name; - if (import_status.doing_what == "building peak files") { - interthread_progress_bar.set_activity_mode (true); - return FALSE; - } else { - interthread_progress_bar.set_fraction (import_status.progress/100); - } + if ((pl = (*i)->playlist()) == 0) { + continue; + } - return !(import_status.done || import_status.cancel); -} + if ((current_r = pl->top_region_at (start)) == 0) { + continue; + } + + current = boost::dynamic_pointer_cast (current_r); + // FIXME: audio only + if (current != 0) { + internal_start = start - current->position(); + session->region_name (new_name, current->name(), true); + boost::shared_ptr region (RegionFactory::create (current, internal_start, selection_cnt, new_name)); + } + } +} void -Editor::import_audio (bool as_tracks) +Editor::create_region_from_selection (vector >& new_regions) { - if (session == 0) { - warning << _("You can't import an audiofile until you have a session loaded.") << endmsg; + if (selection->time.empty() || selection->tracks.empty()) { return; } - string str; + nframes_t start = selection->time[clicked_selection].start; + nframes_t end = selection->time[clicked_selection].end; + + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - if (as_tracks) { - str =_("Import selected as tracks"); - } else { - str = _("Import selected to region list"); - } + boost::shared_ptr current; + boost::shared_ptr current_r; + Playlist* playlist; + nframes_t internal_start; + string new_name; - SoundFileOmega sfdb (str); - sfdb.Imported.connect (bind (mem_fun (*this, &Editor::do_import), as_tracks)); + if ((playlist = (*i)->playlist()) == 0) { + continue; + } - sfdb.run(); -} + if ((current_r = playlist->top_region_at(start)) == 0) { + continue; + } -void -Editor::catch_new_audio_region (AudioRegion* ar) -{ - last_audio_region = ar; + if ((current = boost::dynamic_pointer_cast(current_r)) == 0) { + continue; + } + + internal_start = start - current->position(); + session->region_name (new_name, current->name(), true); + + new_regions.push_back (boost::dynamic_pointer_cast (RegionFactory::create (current, internal_start, end - start + 1, new_name))); + } } void -Editor::do_import (vector paths, bool split, bool as_tracks) +Editor::split_multichannel_region () { - sigc::connection c; - - /* SFDB sets "multichan" to true to indicate "split channels" - so reverse the setting to match the way libardour - interprets it. - */ - - import_status.multichan = !split; - - if (interthread_progress_window == 0) { - build_interthread_progress_window (); - } - - interthread_progress_window->set_title (_("ardour: audio import in progress")); - interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); - interthread_progress_window->show_all (); - interthread_progress_bar.set_fraction (0.0f); - interthread_cancel_label.set_text (_("Cancel Import")); - current_interthread_info = &import_status; - - c = session->AudioRegionAdded.connect (mem_fun(*this, &Editor::catch_new_audio_region)); - - for (vector::iterator i = paths.begin(); i != paths.end(); ++i ) { - - interthread_progress_window->set_title (string_compose (_("ardour: importing %1"), (*i))); - - import_status.pathname = (*i); - import_status.done = false; - import_status.cancel = false; - import_status.freeze = false; - import_status.done = 0.0; - - interthread_progress_connection = - Glib::signal_timeout().connect (bind (mem_fun(*this, &Editor::import_progress_timeout), (gpointer) 0), 100); - - last_audio_region = 0; - - pthread_create_and_store ("import", &import_status.thread, 0, _import_thread, this); - pthread_detach (import_status.thread); - - while (!(import_status.done || import_status.cancel)) { - gtk_main_iteration (); - } - - import_status.done = true; - interthread_progress_connection.disconnect (); - - if (as_tracks && last_audio_region != 0) { - uint32_t channels = last_audio_region->n_channels(); - - AudioTrack* at = session->new_audio_track (channels, channels); - AudioRegion* copy = new AudioRegion (*last_audio_region); - at->disk_stream().playlist()->add_region (*copy, 0); - } - } - - c.disconnect (); - interthread_progress_window->hide_all (); -} - -int -Editor::reject_because_rate_differs (string path, SF_INFO& finfo, string action, bool multiple_pending) -{ - if (!session) { - return 1; - } - - if (finfo.samplerate != (int) session->frame_rate()) { - vector choices; - - choices.push_back (string_compose (_("%1 it anyway"), action)); - - if (multiple_pending) { - /* XXX assumptions about sentence structure - here for translators. Sorry. - */ - choices.push_back (string_compose (_("Don't %1 it"), action)); - choices.push_back (string_compose (_("%1 all without questions"), action)); - choices.push_back (_("Cancel entire import")); - } else { - choices.push_back (_("Cancel")); - } - - Gtkmm2ext::Choice rate_choice ( - string_compose (_("%1\nThis audiofile's sample rate doesn't match the session sample rate!"), path), - choices); - - rate_choice.chosen.connect (Main::quit.slot()); - rate_choice.show_all (); - - Main::run (); - - switch (rate_choice.get_choice()) { - case 0: /* do it anyway */ - return 0; - case 1: /* don't import this one */ - return 1; - case 2: /* do the rest without asking */ - return -1; - case 3: /* stop a multi-file import */ - default: - return -2; - } - } - - return 0; -} - -void -Editor::embed_audio () -{ - if (session == 0) { - warning << _("You can't embed an audiofile until you have a session loaded.") << endmsg; - return; - } - - SoundFileOmega sfdb (_("Add to External Region list")); - sfdb.Embedded.connect (mem_fun (*this, &Editor::do_embed_sndfiles)); - - sfdb.run (); -} - -void -Editor::do_embed_sndfiles (vector paths, bool split) -{ - bool multiple_files = paths.size() > 1; - bool check_sample_rate = true; - - for (vector::iterator i = paths.begin(); i != paths.end(); ++i) { - embed_sndfile (*i, split, multiple_files, check_sample_rate); - } - - session->save_state (""); -} - -void -Editor::embed_sndfile (string path, bool split, bool multiple_files, bool& check_sample_rate) -{ - SndFileSource *source = 0; /* keep g++ quiet */ - AudioRegion::SourceList sources; - string idspec; - string linked_path; - SNDFILE *sf; - SF_INFO finfo; - - /* lets see if we can link it into the session */ - - linked_path = session->sound_dir(); - linked_path += PBD::basename (path); - - if (link (path.c_str(), linked_path.c_str()) == 0) { - - /* there are many reasons why link(2) might have failed. - but if it succeeds, we now have a link in the - session sound dir that will protect against - unlinking of the original path. nice. - */ - - path = linked_path; - } - - memset (&finfo, 0, sizeof(finfo)); + vector v; - /* note that we temporarily truncated _id at the colon */ + AudioRegionView* clicked_arv = dynamic_cast(clicked_regionview); - if ((sf = sf_open (path.c_str(), SFM_READ, &finfo)) == 0) { - char errbuf[256]; - sf_error_str (0, errbuf, sizeof (errbuf) - 1); - error << string_compose(_("Editor: cannot open file \"%1\" (%2)"), selection, errbuf) << endmsg; + if (!clicked_arv || clicked_arv->audio_region()->n_channels() < 2) { return; } - sf_close (sf); - sf = 0; - - if (check_sample_rate) { - switch (reject_because_rate_differs (path, finfo, "Embed", multiple_files)) { - case 0: - break; - case 1: - return; - case -1: - check_sample_rate = false; - break; - - case -2: - default: - return; - } - } - - track_canvas_scroller.get_window()->set_cursor (GDK_WATCH); - ARDOUR_UI::instance()->flush_pending (); - - /* make the proper number of channels in the region */ - - for (int n=0; n < finfo.channels; ++n) - { - idspec = path; - idspec += string_compose(":%1", n); - - try { - source = new SndFileSource (idspec.c_str()); - sources.push_back(source); - } - - catch (failed_constructor& err) { - error << string_compose(_("could not open %1"), path) << endmsg; - goto out; - } - - ARDOUR_UI::instance()->flush_pending (); - } - - if (sources.size() > 0) { - - string region_name = PBD::basename_nosuffix (path); - region_name += "-0"; - - /* The created region isn't dropped. It emits a signal - that is picked up by the session. - */ - - new AudioRegion (sources, 0, sources[0]->length(), region_name, 0, - Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)); - - /* make sure we can see it in the list */ - - Gtk::CTree_Helpers::RowList::iterator external_node; - external_node = region_list_display.rows().begin(); - ++external_node; /* its the second node, always */ - external_node->expand_recursive (); - - ARDOUR_UI::instance()->flush_pending (); - } - - out: - track_canvas_scroller.get_window()->set_cursor (current_canvas_cursor); -} - -void -Editor::insert_sndfile (bool as_tracks) -{ -// SoundFileSelector& sfdb (ARDOUR_UI::instance()->get_sfdb_window()); - sigc::connection c; - string str; - - if (as_tracks) { - -// c = sfdb.Action.connect (mem_fun(*this, &Editor::insert_paths_as_new_tracks)); - str = _("Insert selected as new tracks"); - - } else { - - jack_nframes_t pos; - - if (clicked_audio_trackview == 0) { - return; - } - - if (ensure_cursor (&pos)) { - return; - } - -// c = sfdb.Action.connect (bind (mem_fun(*this, &Editor::do_insert_sndfile), pos)); - str = _("Insert selected"); - } - -// sfdb.run (str, false); -// c.disconnect (); -} - -void -Editor::insert_paths_as_new_tracks (vector paths, bool split) -{ - SNDFILE *sf; - SF_INFO finfo; - bool multiple_files; - bool check_sample_rate = true; - - multiple_files = paths.size() > 1; - - for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - - memset (&finfo, 0, sizeof(finfo)); - - if ((sf = sf_open ((*p).c_str(), SFM_READ, &finfo)) == 0) { - char errbuf[256]; - sf_error_str (0, errbuf, sizeof (errbuf) - 1); - error << string_compose(_("Editor: cannot open file \"%1\" (%2)"), (*p), errbuf) << endmsg; - continue; - } - - sf_close (sf); - sf = 0; - - /* add a new track */ - - if (check_sample_rate) { - switch (reject_because_rate_differs (*p, finfo, "Insert", multiple_files)) { - case 0: - break; - case 1: - continue; - case -1: - check_sample_rate = false; - break; - - case -2: - return; - } - } - - uint32_t input_chan = finfo.channels; - uint32_t output_chan; - - if (session->get_output_auto_connect() & Session::AutoConnectMaster) { - output_chan = (session->master_out() ? session->master_out()->n_inputs() : input_chan); - } else { - output_chan = input_chan; - } - - (void) session->new_audio_track (input_chan, output_chan); + clicked_arv->audio_region()->separate_by_channel (*session, v); - /* get the last (most recently added) track view */ - - AudioTimeAxisView* tv; - - if ((tv = dynamic_cast(track_views.back())) == 0) { - fatal << _("programming error: ") - << X_("last trackview after new_audio_track is not an audio track!") - << endmsg; - /*NOTREACHED*/ - } - - jack_nframes_t pos = 0; - insert_sndfile_into (*p, true, tv, pos, false); - } -} - -void -Editor::do_insert_sndfile (vector paths, bool split, jack_nframes_t pos) -{ - for (vector::iterator x = paths.begin(); x != paths.end(); ++x) { - insert_sndfile_into (*x, !split, clicked_audio_trackview, pos); - } + /* nothing else to do, really */ } void -Editor::insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& pos, bool prompt) +Editor::new_region_from_selection () { - SndFileSource *source = 0; /* keep g++ quiet */ - AudioRegion::SourceList sources; - string idspec; - SNDFILE *sf; - SF_INFO finfo; - - memset (&finfo, 0, sizeof(finfo)); - - /* note that we temporarily truncated _id at the colon */ - - if ((sf = sf_open (path.c_str(), SFM_READ, &finfo)) == 0) { - char errbuf[256]; - sf_error_str (0, errbuf, sizeof (errbuf) - 1); - error << string_compose(_("Editor: cannot open file \"%1\" (%2)"), path, errbuf) << endmsg; - return; - } - sf_close (sf); - sf = 0; - - if (prompt && (reject_because_rate_differs (path, finfo, "Insert", false) != 0)) { - return; - } - - track_canvas_scroller.get_window()->set_cursor (GDK_WATCH); - ARDOUR_UI::instance()->flush_pending (); - - /* make the proper number of channels in the region */ - - for (int n=0; n < finfo.channels; ++n) - { - idspec = path; - idspec += string_compose(":%1", n); - - try { - source = new SndFileSource (idspec.c_str()); - sources.push_back(source); - } - - catch (failed_constructor& err) { - error << string_compose(_("could not open %1"), path) << endmsg; - goto out; - } - - ARDOUR_UI::instance()->flush_pending (); - } - - if (sources.size() > 0) { - - string region_name = region_name_from_path (PBD::basename (path)); - - AudioRegion *region = new AudioRegion (sources, 0, sources[0]->length(), region_name, - 0, /* irrelevant these days */ - Region::Flag (Region::DefaultFlags|Region::WholeFile|Region::External)); - - begin_reversible_command (_("insert sndfile")); - session->add_undo (tv->playlist()->get_memento()); - tv->playlist()->add_region (*region, pos); - session->add_redo_no_execute (tv->playlist()->get_memento()); - commit_reversible_command (); - - pos += sources[0]->length(); - - ARDOUR_UI::instance()->flush_pending (); - } - - out: - track_canvas_scroller.get_window()->set_cursor (current_canvas_cursor); - return; + region_from_selection (); + cancel_selection (); } void -Editor::region_from_selection () +Editor::separate_region_from_selection () { - if (clicked_trackview == 0) { - return; - } + bool doing_undo = false; if (selection->time.empty()) { return; } - jack_nframes_t start = selection->time[clicked_selection].start; - jack_nframes_t end = selection->time[clicked_selection].end; - - jack_nframes_t selection_cnt = end - start + 1; - + Playlist *playlist; + for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - AudioRegion *region; - AudioRegion *current; - Region* current_r; - Playlist *pl; - - jack_nframes_t internal_start; - string new_name; - - if ((pl = (*i)->playlist()) == 0) { - continue; - } - - if ((current_r = pl->top_region_at (start)) == 0) { - continue; - } - - if ((current = dynamic_cast (current_r)) != 0) { - internal_start = start - current->position(); - session->region_name (new_name, current->name(), true); - region = new AudioRegion (*current, internal_start, selection_cnt, new_name); - } - } -} - -void -Editor::create_region_from_selection (vector& new_regions) -{ - if (selection->time.empty() || selection->tracks.empty()) { - return; - } + AudioTimeAxisView* atv; - jack_nframes_t start = selection->time[clicked_selection].start; - jack_nframes_t end = selection->time[clicked_selection].end; - - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + if ((atv = dynamic_cast ((*i))) != 0) { - AudioRegion* current; - Region* current_r; - Playlist* playlist; - jack_nframes_t internal_start; - string new_name; + if (atv->is_audio_track()) { + + if ((playlist = atv->playlist()) != 0) { + if (!doing_undo) { + begin_reversible_command (_("separate")); + doing_undo = true; + } + XMLNode *before; + if (doing_undo) + before = &(playlist->get_state()); + + /* XXX need to consider musical time selections here at some point */ - if ((playlist = (*i)->playlist()) == 0) { - continue; - } + double speed = atv->get_diskstream()->speed(); - if ((current_r = playlist->top_region_at(start)) == 0) { - continue; - } + for (list::iterator t = selection->time.begin(); t != selection->time.end(); ++t) { + playlist->partition ((nframes_t)((*t).start * speed), (nframes_t)((*t).end * speed), true); + } - if ((current = dynamic_cast(current_r)) == 0) { - continue; + if (doing_undo) + session->add_command(new MementoCommand(*playlist, before, &playlist->get_state())); + } + } } - - internal_start = start - current->position(); - session->region_name (new_name, current->name(), true); - - new_regions.push_back (new AudioRegion (*current, internal_start, end - start + 1, new_name)); - } -} - -void -Editor::split_multichannel_region () -{ - vector v; - - if (!clicked_regionview || clicked_regionview->region.n_channels() < 2) { - return; } - clicked_regionview->region.separate_by_channel (*session, v); - - /* nothing else to do, really */ -} - -void -Editor::new_region_from_selection () -{ - region_from_selection (); - cancel_selection (); + if (doing_undo) commit_reversible_command (); } void -Editor::separate_region_from_selection () +Editor::separate_regions_using_location (Location& loc) { bool doing_undo = false; - if (selection->time.empty()) { + if (loc.is_mark()) { return; } Playlist *playlist; - - for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + + /* XXX i'm unsure as to whether this should operate on selected tracks only + or the entire enchillada. uncomment the below line to correct the behaviour + (currently set for all tracks) + */ + + for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + //for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { AudioTimeAxisView* atv; @@ -2455,21 +2266,23 @@ Editor::separate_region_from_selection () if (atv->is_audio_track()) { if ((playlist = atv->playlist()) != 0) { + XMLNode *before; if (!doing_undo) { begin_reversible_command (_("separate")); doing_undo = true; } - if (doing_undo) session->add_undo ((playlist)->get_memento()); + if (doing_undo) + before = &(playlist->get_state()); + /* XXX need to consider musical time selections here at some point */ double speed = atv->get_diskstream()->speed(); - for (list::iterator t = selection->time.begin(); t != selection->time.end(); ++t) { - playlist->partition ((jack_nframes_t)((*t).start * speed), (jack_nframes_t)((*t).end * speed), true); - } - if (doing_undo) session->add_redo_no_execute (playlist->get_memento()); + playlist->partition ((nframes_t)(loc.start() * speed), (nframes_t)(loc.end() * speed), true); + if (doing_undo) + session->add_command(new MementoCommand(*playlist, before, &playlist->get_state())); } } } @@ -2516,15 +2329,15 @@ Editor::crop_region_to_selection () if (!playlists.empty()) { - jack_nframes_t start; - jack_nframes_t end; - jack_nframes_t cnt; + nframes_t start; + nframes_t end; + nframes_t cnt; begin_reversible_command (_("trim to selection")); for (vector::iterator i = playlists.begin(); i != playlists.end(); ++i) { - Region *region; + boost::shared_ptr region; start = selection->time.start(); @@ -2540,9 +2353,10 @@ Editor::crop_region_to_selection () end = min (selection->time.end_frame(), start + region->length() - 1); cnt = end - start + 1; - session->add_undo ((*i)->get_memento()); + XMLNode &before = (*i)->get_state(); region->trim_to (start, cnt, this); - session->add_redo_no_execute ((*i)->get_memento()); + XMLNode &after = (*i)->get_state(); + session->add_command (new MementoCommand(*(*i), &before, &after)); } commit_reversible_command (); @@ -2552,9 +2366,9 @@ Editor::crop_region_to_selection () void Editor::region_fill_track () { - jack_nframes_t end; + nframes_t end; - if (!session || selection->audio_regions.empty()) { + if (!session || selection->regions.empty()) { return; } @@ -2562,24 +2376,30 @@ Editor::region_fill_track () begin_reversible_command (_("region fill")); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + + boost::shared_ptr region ((*i)->region()); + + // FIXME + boost::shared_ptr ar = boost::dynamic_pointer_cast(region); + if (!ar) + continue; - AudioRegion& region ((*i)->region); - Playlist* pl = region.playlist(); + Playlist* pl = region->playlist(); - if (end <= region.last_frame()) { + if (end <= region->last_frame()) { return; } - double times = (double) (end - region.last_frame()) / (double) region.length(); + double times = (double) (end - region->last_frame()) / (double) region->length(); if (times == 0) { return; } - session->add_undo (pl->get_memento()); - pl->add_region (*(new AudioRegion (region)), region.last_frame(), times); - session->add_redo_no_execute (pl->get_memento()); + 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())); } commit_reversible_command (); @@ -2596,18 +2416,18 @@ Editor::region_fill_selection () return; } - Region *region; - Gtk::CTree_Helpers::SelectionList& selected = region_list_display.selection(); - - if (selected.empty()) { + Glib::RefPtr selected = region_list_display.get_selection(); + + if (selected->count_selected_rows() != 1) { return; } - region = reinterpret_cast (selected.front().get_data()); + TreeModel::iterator i = region_list_display.get_selection()->get_selected(); + boost::shared_ptr region = (*i)[region_list_columns.region]; - jack_nframes_t start = selection->time[clicked_selection].start; - jack_nframes_t end = selection->time[clicked_selection].end; + nframes_t start = selection->time[clicked_selection].start; + nframes_t end = selection->time[clicked_selection].end; Playlist *playlist; @@ -2615,7 +2435,7 @@ Editor::region_fill_selection () return; } - jack_nframes_t selection_length = end - start; + nframes_t selection_length = end - start; float times = (float)selection_length / region->length(); begin_reversible_command (_("fill selection")); @@ -2626,14 +2446,30 @@ Editor::region_fill_selection () continue; } - session->add_undo (playlist->get_memento()); - playlist->add_region (*(createRegion (*region)), start, times); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &before = playlist->get_state(); + playlist->add_region (RegionFactory::create (region), start, times); + session->add_command (new MementoCommand(*playlist, &before, &playlist->get_state())); } commit_reversible_command (); } - + +void +Editor::set_a_regions_sync_position (boost::shared_ptr region, nframes_t position) +{ + + if (!region->covers (position)) { + error << _("Programming error. that region doesn't cover that position") << __FILE__ << " +" << __LINE__ << endmsg; + return; + } + begin_reversible_command (_("set region sync position")); + XMLNode &before = region->playlist()->get_state(); + region->set_sync_position (position); + XMLNode &after = region->playlist()->get_state(); + session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); + commit_reversible_command (); +} + void Editor::set_region_sync_from_edit_cursor () { @@ -2641,17 +2477,17 @@ Editor::set_region_sync_from_edit_cursor () return; } - if (!clicked_regionview->region.covers (edit_cursor->current_frame)) { + if (!clicked_regionview->region()->covers (edit_cursor->current_frame)) { error << _("Place the edit cursor at the desired sync point") << endmsg; return; } - Region& region (clicked_regionview->region); - + boost::shared_ptr region (clicked_regionview->region()); begin_reversible_command (_("set sync from edit cursor")); - session->add_undo (region.playlist()->get_memento()); - region.set_sync_position (edit_cursor->current_frame); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &before = region->playlist()->get_state(); + region->set_sync_position (edit_cursor->current_frame); + XMLNode &after = region->playlist()->get_state(); + session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); commit_reversible_command (); } @@ -2659,11 +2495,12 @@ void Editor::remove_region_sync () { if (clicked_regionview) { - Region& region (clicked_regionview->region); + boost::shared_ptr region (clicked_regionview->region()); begin_reversible_command (_("remove sync")); - session->add_undo (region.playlist()->get_memento()); - region.clear_sync_position (); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &before = region->playlist()->get_state(); + region->clear_sync_position (); + XMLNode &after = region->playlist()->get_state(); + session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); commit_reversible_command (); } } @@ -2671,14 +2508,15 @@ Editor::remove_region_sync () void Editor::naturalize () { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } begin_reversible_command (_("naturalize")); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - session->add_undo ((*i)->region.get_memento()); - (*i)->region.move_to_natural_position (this); - session->add_redo_no_execute ((*i)->region.get_memento()); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + 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)); } commit_reversible_command (); } @@ -2697,36 +2535,36 @@ Editor::align_relative (RegionPoint what) struct RegionSortByTime { bool operator() (const AudioRegionView* a, const AudioRegionView* b) { - return a->region.position() < b->region.position(); + return a->region()->position() < b->region()->position(); } }; void -Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) +Editor::align_selection_relative (RegionPoint point, nframes_t position) { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } - jack_nframes_t distance; - jack_nframes_t pos = 0; + nframes_t distance; + nframes_t pos = 0; int dir; - list sorted; - selection->audio_regions.by_position (sorted); - Region& r ((*sorted.begin())->region); + list sorted; + selection->regions.by_position (sorted); + boost::shared_ptr r ((*sorted.begin())->region()); switch (point) { case Start: - pos = r.first_frame (); + pos = r->first_frame (); break; case End: - pos = r.last_frame(); + pos = r->last_frame(); break; case SyncPoint: - pos = r.adjust_to_sync (r.first_frame()); + pos = r->adjust_to_sync (r->first_frame()); break; } @@ -2740,19 +2578,20 @@ Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) begin_reversible_command (_("align selection (relative)")); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - Region& region ((*i)->region); + boost::shared_ptr region ((*i)->region()); - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region->playlist()->get_state(); if (dir > 0) { - region.set_position (region.position() + distance, this); + region->set_position (region->position() + distance, this); } else { - region.set_position (region.position() - distance, this); + region->set_position (region->position() - distance, this); } - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &after = region->playlist()->get_state(); + session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); } @@ -2760,23 +2599,23 @@ Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) } void -Editor::align_selection (RegionPoint point, jack_nframes_t position) +Editor::align_selection (RegionPoint point, nframes_t position) { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } begin_reversible_command (_("align selection")); - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - align_region_internal ((*i)->region, point, position); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + align_region_internal ((*i)->region(), point, position); } commit_reversible_command (); } void -Editor::align_region (Region& region, RegionPoint point, jack_nframes_t position) +Editor::align_region (boost::shared_ptr region, RegionPoint point, nframes_t position) { begin_reversible_command (_("align region")); align_region_internal (region, point, position); @@ -2784,27 +2623,28 @@ Editor::align_region (Region& region, RegionPoint point, jack_nframes_t position } void -Editor::align_region_internal (Region& region, RegionPoint point, jack_nframes_t position) +Editor::align_region_internal (boost::shared_ptr region, RegionPoint point, nframes_t position) { - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region->playlist()->get_state(); switch (point) { case SyncPoint: - region.set_position (region.adjust_to_sync (position), this); + region->set_position (region->adjust_to_sync (position), this); break; case End: - if (position > region.length()) { - region.set_position (position - region.length(), this); + if (position > region->length()) { + region->set_position (position - region->length(), this); } break; case Start: - region.set_position (position, this); + region->set_position (position, this); break; } - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &after = region->playlist()->get_state(); + session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); } void @@ -2814,7 +2654,7 @@ Editor::trim_region_to_edit_cursor () return; } - Region& region (clicked_regionview->region); + boost::shared_ptr region (clicked_regionview->region()); float speed = 1.0f; AudioTimeAxisView *atav; @@ -2826,9 +2666,10 @@ Editor::trim_region_to_edit_cursor () } begin_reversible_command (_("trim to edit")); - session->add_undo (region.playlist()->get_memento()); - region.trim_end ( (jack_nframes_t) floor( (float)edit_cursor->current_frame * speed), this); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &before = region->playlist()->get_state(); + region->trim_end( session_frame_to_track_frame(edit_cursor->current_frame, speed), this); + XMLNode &after = region->playlist()->get_state(); + session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); commit_reversible_command (); } @@ -2839,7 +2680,7 @@ Editor::trim_region_from_edit_cursor () return; } - Region& region (clicked_regionview->region); + boost::shared_ptr region (clicked_regionview->region()); float speed = 1.0f; AudioTimeAxisView *atav; @@ -2851,9 +2692,10 @@ Editor::trim_region_from_edit_cursor () } begin_reversible_command (_("trim to edit")); - session->add_undo (region.playlist()->get_memento()); - region.trim_front ( (jack_nframes_t) floor( (float)edit_cursor->current_frame * speed), this); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &before = region->playlist()->get_state(); + region->trim_front ( session_frame_to_track_frame(edit_cursor->current_frame, speed), this); + XMLNode &after = region->playlist()->get_state(); + session->add_command(new MementoCommand(*(region->playlist()), &before, &after)); commit_reversible_command (); } @@ -2904,7 +2746,7 @@ Editor::freeze_route () interthread_progress_window->set_title (_("ardour: freeze")); interthread_progress_window->set_position (Gtk::WIN_POS_MOUSE); interthread_progress_window->show_all (); - interthread_progress_bar.set_percentage (0.0f); + interthread_progress_bar.set_fraction (0.0f); interthread_progress_label.set_text (""); interthread_cancel_label.set_text (_("Cancel Freeze")); current_interthread_info = &itt; @@ -2918,7 +2760,7 @@ Editor::freeze_route () pthread_create (&itt.thread, 0, _freeze_thread, this); - track_canvas_scroller.get_window()->set_cursor (GDK_WATCH); + track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); while (!itt.done && !itt.cancel) { gtk_main_iteration (); @@ -2927,7 +2769,7 @@ Editor::freeze_route () interthread_progress_connection.disconnect (); interthread_progress_window->hide_all (); current_interthread_info = 0; - track_canvas_scroller.get_window()->set_cursor (current_canvas_cursor); + track_canvas.get_window()->set_cursor (*current_canvas_cursor); } void @@ -2939,9 +2781,9 @@ Editor::bounce_range_selection () TrackViewList *views = get_valid_views (selection->time.track, selection->time.group); - jack_nframes_t start = selection->time[clicked_selection].start; - jack_nframes_t end = selection->time[clicked_selection].end; - jack_nframes_t cnt = end - start + 1; + nframes_t start = selection->time[clicked_selection].start; + nframes_t end = selection->time[clicked_selection].end; + nframes_t cnt = end - start + 1; begin_reversible_command (_("bounce range")); @@ -2965,9 +2807,10 @@ Editor::bounce_range_selection () itt.cancel = false; itt.progress = false; - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); atv->audio_track()->bounce_range (start, cnt, itt); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &after = playlist->get_state(); + session->add_command (new MementoCommand (*playlist, &before, &after)); } commit_reversible_command (); @@ -3010,16 +2853,16 @@ Editor::cut_copy (CutCopyOp op) switch (current_mouse_mode()) { case MouseObject: - if (!selection->audio_regions.empty() || !selection->points.empty()) { + if (!selection->regions.empty() || !selection->points.empty()) { begin_reversible_command (opname + _(" objects")); - if (!selection->audio_regions.empty()) { + if (!selection->regions.empty()) { cut_copy_regions (op); if (op == Cut) { - selection->clear_audio_regions (); + selection->clear_regions (); } } @@ -3067,35 +2910,52 @@ Editor::cut_copy_points (CutCopyOp op) } } +struct PlaylistState { + Playlist* playlist; + XMLNode* before; +}; + +struct lt_playlist { + bool operator () (const PlaylistState& a, const PlaylistState& b) { + return a.playlist < b.playlist; + } +}; + void Editor::cut_copy_regions (CutCopyOp op) { - typedef map PlaylistMapping; + typedef std::map PlaylistMapping; PlaylistMapping pmap; - jack_nframes_t first_position = max_frames; - set freezelist; - pair::iterator,bool> insert_result; + nframes_t first_position = max_frames; + + set freezelist; + pair::iterator,bool> insert_result; - for (AudioRegionSelection::iterator x = selection->audio_regions.begin(); x != selection->audio_regions.end(); ++x) { - first_position = min ((*x)->region.position(), first_position); + for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) { + first_position = min ((*x)->region()->position(), first_position); if (op == Cut || op == Clear) { - AudioPlaylist *pl = dynamic_cast((*x)->region.playlist()); + AudioPlaylist *pl = dynamic_cast((*x)->region()->playlist()); if (pl) { - insert_result = freezelist.insert (pl); + + PlaylistState before; + before.playlist = pl; + before.before = &pl->get_state(); + + insert_result = freezelist.insert (before); + if (insert_result.second) { pl->freeze (); - session->add_undo (pl->get_memento()); } } } } - for (AudioRegionSelection::iterator x = selection->audio_regions.begin(); x != selection->audio_regions.end(); ) { + for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ) { - AudioPlaylist *pl = dynamic_cast((*x)->region.playlist()); + AudioPlaylist *pl = dynamic_cast((*x)->region()->playlist()); AudioPlaylist* npl; - AudioRegionSelection::iterator tmp; + RegionSelection::iterator tmp; tmp = x; ++tmp; @@ -3112,18 +2972,24 @@ Editor::cut_copy_regions (CutCopyOp op) npl = pi->second; } + // FIXME + boost::shared_ptr ar = boost::dynamic_pointer_cast((*x)->region()); switch (op) { case Cut: - npl->add_region (*(new AudioRegion ((*x)->region)), (*x)->region.position() - first_position); - pl->remove_region (&((*x)->region)); + if (!ar) break; + + npl->add_region (RegionFactory::create (ar), (*x)->region()->position() - first_position); + pl->remove_region (((*x)->region())); break; case Copy: - npl->add_region (*(new AudioRegion ((*x)->region)), (*x)->region.position() - first_position); + if (!ar) break; + + npl->add_region (RegionFactory::create (ar), (*x)->region()->position() - first_position); break; case Clear: - pl->remove_region (&((*x)->region)); + pl->remove_region (((*x)->region())); break; } } @@ -3141,9 +3007,9 @@ Editor::cut_copy_regions (CutCopyOp op) cut_buffer->set (foo); } - for (set::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) { - (*pl)->thaw (); - session->add_redo_no_execute ((*pl)->get_memento()); + 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())); } } @@ -3164,24 +3030,26 @@ Editor::paste (float times) void Editor::mouse_paste () { - gint x, y; + int x, y; double wx, wy; - track_canvas->get_pointer (x, y); - gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), x, y, &wx, &wy); - + track_canvas.get_pointer (x, y); + track_canvas.window_to_world (x, y, wx, wy); + wx += horizontal_adjustment.get_value(); + wy += vertical_adjustment.get_value(); + GdkEvent event; event.type = GDK_BUTTON_RELEASE; event.button.x = wx; event.button.y = wy; - jack_nframes_t where = event_frame (&event, 0, 0); + nframes_t where = event_frame (&event, 0, 0); snap_to (where); paste_internal (where, 1); } void -Editor::paste_internal (jack_nframes_t position, float times) +Editor::paste_internal (nframes_t position, float times) { bool commit = false; @@ -3215,14 +3083,17 @@ Editor::paste_internal (jack_nframes_t position, float times) void Editor::paste_named_selection (float times) { - Gtk::CList_Helpers::SelectionList& selected = named_selection_display.selection(); - TrackSelection::iterator i; + TrackSelection::iterator t; + + Glib::RefPtr selected = named_selection_display.get_selection(); - if (selected.empty() || selection->tracks.empty()) { + if (selected->count_selected_rows() != 1 || selection->tracks.empty()) { return; } - NamedSelection* ns = static_cast (selected.front()->get_data ()); + TreeModel::iterator i = selected->get_selected(); + NamedSelection* ns = (*i)[named_selection_columns.selection]; + list::iterator chunk; list::iterator tmp; @@ -3230,13 +3101,13 @@ Editor::paste_named_selection (float times) begin_reversible_command (_("paste chunk")); - for (i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { + for (t = selection->tracks.begin(); t != selection->tracks.end(); ++t) { AudioTimeAxisView* atv; Playlist* pl; AudioPlaylist* apl; - if ((atv = dynamic_cast (*i)) == 0) { + if ((atv = dynamic_cast (*t)) == 0) { continue; } @@ -3251,9 +3122,9 @@ Editor::paste_named_selection (float times) tmp = chunk; ++tmp; - session->add_undo (apl->get_memento()); + XMLNode &before = apl->get_state(); apl->paste (**chunk, edit_cursor->current_frame, times); - session->add_redo_no_execute (apl->get_memento()); + session->add_command(new MementoCommand(*apl, &before, &apl->get_state())); if (tmp != ns->playlists.end()) { chunk = tmp; @@ -3264,22 +3135,35 @@ Editor::paste_named_selection (float times) } void -Editor::duplicate_some_regions (AudioRegionSelection& regions, float times) +Editor::duplicate_some_regions (RegionSelection& regions, float times) { Playlist *playlist; - + RegionSelection sel = regions; // clear (below) will clear the argument list + begin_reversible_command (_("duplicate region")); - for (AudioRegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { + selection->clear_regions (); - Region& r ((*i)->region); + for (RegionSelection::iterator i = sel.begin(); i != sel.end(); ++i) { + + boost::shared_ptr r ((*i)->region()); + + TimeAxisView& tv = (*i)->get_time_axis_view(); + AudioTimeAxisView* atv = dynamic_cast (&tv); + sigc::connection c = atv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view)); - playlist = (*i)->region.playlist(); - session->add_undo (playlist->get_memento()); - playlist->duplicate (r, r.last_frame(), times); - session->add_redo_no_execute (playlist->get_memento()); + 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())); + + c.disconnect (); + if (latest_regionview) { + selection->add (latest_regionview); + } } + commit_reversible_command (); } @@ -3292,8 +3176,8 @@ Editor::duplicate_selection (float times) } Playlist *playlist; - vector new_regions; - vector::iterator ri; + vector > new_regions; + vector >::iterator ri; create_region_from_selection (new_regions); @@ -3309,9 +3193,10 @@ Editor::duplicate_selection (float times) if ((playlist = (*i)->playlist()) == 0) { continue; } - session->add_undo (playlist->get_memento()); - playlist->duplicate (**ri, selection->time[clicked_selection].end, times); - session->add_redo_no_execute (playlist->get_memento()); + 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)); ++ri; if (ri == new_regions.end()) { @@ -3322,6 +3207,23 @@ Editor::duplicate_selection (float times) commit_reversible_command (); } +void +Editor::reset_point_selection () +{ + /* reset all selected points to the relevant default value */ + + cerr << "point selection has " << selection->points.size() << " entries\n"; + + for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { + + AutomationTimeAxisView* atv = dynamic_cast(&(*i).track); + + if (atv) { + atv->reset_objects (selection->points); + } + } +} + void Editor::center_playhead () { @@ -3342,9 +3244,10 @@ void Editor::clear_playlist (Playlist& playlist) { begin_reversible_command (_("clear playlist")); - session->add_undo (playlist.get_memento()); + XMLNode &before = playlist.get_state(); playlist.clear (); - session->add_redo_no_execute (playlist.get_memento()); + XMLNode &after = playlist.get_state(); + session->add_command (new MementoCommand(playlist, &before, &after)); commit_reversible_command (); } @@ -3352,9 +3255,9 @@ void Editor::nudge_track (bool use_edit_cursor, bool forwards) { Playlist *playlist; - jack_nframes_t distance; - jack_nframes_t next_distance; - jack_nframes_t start; + nframes_t distance; + nframes_t next_distance; + nframes_t start; if (use_edit_cursor) { start = edit_cursor->current_frame; @@ -3378,40 +3281,15 @@ Editor::nudge_track (bool use_edit_cursor, bool forwards) continue; } - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->nudge_after (start, distance, forwards); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &after = playlist->get_state(); + session->add_command (new MementoCommand(*playlist, &before, &after)); } commit_reversible_command (); } -void -Editor::toggle_xfades_active () -{ - if (session) { - session->set_crossfades_active (!session->get_crossfades_active()); - } -} - -void -Editor::toggle_follow_playhead () -{ - set_follow_playhead (!_follow_playhead); -} - -void -Editor::set_xfade_visibility (bool yn) -{ - -} - -void -Editor::toggle_xfade_visibility () -{ - set_xfade_visibility (!xfade_visibility()); -} - void Editor::remove_last_capture () { @@ -3426,19 +3304,15 @@ Editor::remove_last_capture () prompt = _("Do you really want to destroy the last capture?" "\n(This is destructive and cannot be undone)"); - choices.push_back (_("Yes, destroy it.")); choices.push_back (_("No, do nothing.")); - + choices.push_back (_("Yes, destroy it.")); + Gtkmm2ext::Choice prompter (prompt, choices); - - prompter.chosen.connect (Gtk::Main::quit.slot()); - prompter.show_all (); - - Gtk::Main::run (); - - if (prompter.get_choice() == 0) { + + if (prompter.run () == 1) { session->remove_last_capture (); } + } else { session->remove_last_capture(); } @@ -3451,23 +3325,26 @@ Editor::normalize_region () return; } - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } begin_reversible_command (_("normalize")); - track_canvas_scroller.get_window()->set_cursor (wait_cursor); + track_canvas.get_window()->set_cursor (*wait_cursor); gdk_flush (); - for (AudioRegionSelection::iterator r = selection->audio_regions.begin(); r != selection->audio_regions.end(); ++r) { - session->add_undo ((*r)->region.get_memento()); - (*r)->region.normalize_to (0.0f); - session->add_redo_no_execute ((*r)->region.get_memento()); + for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) { + AudioRegionView* const arv = dynamic_cast(*r); + 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())); } commit_reversible_command (); - gdk_window_set_cursor (track_canvas_scroller.get_window()->gobj(), current_canvas_cursor); + track_canvas.get_window()->set_cursor (*current_canvas_cursor); } @@ -3478,16 +3355,19 @@ Editor::denormalize_region () return; } - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } begin_reversible_command ("denormalize"); - for (AudioRegionSelection::iterator r = selection->audio_regions.begin(); r != selection->audio_regions.end(); ++r) { - session->add_undo ((*r)->region.get_memento()); - (*r)->region.set_scale_amplitude (1.0f); - session->add_redo_no_execute ((*r)->region.get_memento()); + for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ++r) { + AudioRegionView* const arv = dynamic_cast(*r); + if (!arv) + 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())); } commit_reversible_command (); @@ -3508,30 +3388,33 @@ Editor::reverse_region () void Editor::apply_filter (AudioFilter& filter, string command) { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } begin_reversible_command (command); - track_canvas_scroller.get_window()->set_cursor (wait_cursor); + track_canvas.get_window()->set_cursor (*wait_cursor); gdk_flush (); - for (AudioRegionSelection::iterator r = selection->audio_regions.begin(); r != selection->audio_regions.end(); ) { + for (RegionSelection::iterator r = selection->regions.begin(); r != selection->regions.end(); ) { + AudioRegionView* const arv = dynamic_cast(*r); + if (!arv) + continue; - AudioRegion& region ((*r)->region); - Playlist* playlist = region.playlist(); + Playlist* playlist = arv->region()->playlist(); - AudioRegionSelection::iterator tmp; + RegionSelection::iterator tmp; tmp = r; ++tmp; - if (region.apply (filter) == 0) { + if (arv->audio_region()->apply (filter) == 0) { - session->add_undo (playlist->get_memento()); - playlist->replace_region (region, *(filter.results.front()), region.position()); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &before = playlist->get_state(); + playlist->replace_region (arv->region(), filter.results.front(), arv->region()->position()); + XMLNode &after = playlist->get_state(); + session->add_command(new MementoCommand(*playlist, &before, &after)); } else { goto out; } @@ -3540,17 +3423,18 @@ Editor::apply_filter (AudioFilter& filter, string command) } commit_reversible_command (); - selection->audio_regions.clear (); + selection->regions.clear (); out: - gdk_window_set_cursor (track_canvas_scroller.get_window()->gobj(), current_canvas_cursor); + track_canvas.get_window()->set_cursor (*current_canvas_cursor); } void Editor::region_selection_op (void (Region::*pmf)(void)) { - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - ((*i)->region.*pmf)(); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + Region* region = (*i)->region().get(); + (region->*pmf)(); } } @@ -3558,16 +3442,18 @@ Editor::region_selection_op (void (Region::*pmf)(void)) void Editor::region_selection_op (void (Region::*pmf)(void*), void *arg) { - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - ((*i)->region.*pmf)(arg); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + Region* region = (*i)->region().get(); + (region->*pmf)(arg); } } void Editor::region_selection_op (void (Region::*pmf)(bool), bool yn) { - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - ((*i)->region.*pmf)(yn); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + Region* region = (*i)->region().get(); + (region->*pmf)(yn); } } @@ -3582,22 +3468,22 @@ Editor::external_edit_region () } void -Editor::brush (jack_nframes_t pos) +Editor::brush (nframes_t pos) { - AudioRegionSelection sel; + RegionSelection sel; snap_to (pos); - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { /* XXX get selection from region list */ } else { - sel = selection->audio_regions; + sel = selection->regions; } if (sel.empty()) { return; } - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { mouse_brush_insert_region ((*i), pos); } } @@ -3605,18 +3491,19 @@ Editor::brush (jack_nframes_t pos) void Editor::toggle_gain_envelope_visibility () { - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - (*i)->set_envelope_visible (!(*i)->envelope_visible()); + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + AudioRegionView* const arv = dynamic_cast(*i); + if (arv) + arv->set_envelope_visible (!arv->envelope_visible()); } } void Editor::toggle_gain_envelope_active () { - for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { - AudioRegion* ar = dynamic_cast(&(*i)->region); - if (ar) { - ar->set_envelope_active (true); - } + for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { + AudioRegionView* const arv = dynamic_cast(*i); + if (arv) + arv->audio_region()->set_envelope_active (true); } }