X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Feditor_ops.cc;h=7d262503f83d0bef14a2cdd6a1e7b06ebcfad805;hb=5169a66f35508dfeee8e5f9486788843d229295a;hp=39b284375634eb7e587c74ffd1d980a0fc570a2c;hpb=b5db1f624d347c8865c27fdae23bf4595be372d2;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 39b2843756..7d262503f8 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -51,7 +52,7 @@ #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" @@ -64,6 +65,7 @@ using namespace std; using namespace ARDOUR; +using namespace PBD; using namespace sigc; using namespace Gtk; using namespace Editing; @@ -138,27 +140,27 @@ Editor::set_meter_falloff (int intval) Config->set_meter_falloff_off(true); break; case 1: - val = 0.266f; + val = 0.125f; Config->set_meter_falloff_slowest(true); break; case 2: - val = 0.342f; + val = 0.250f; Config->set_meter_falloff_slow(true); break; case 3: - val = 0.7f; + val = 0.375f; Config->set_meter_falloff_medium(true); break; case 4: - val = 1.1f; + val = 0.500f; Config->set_meter_falloff_fast(true); break; case 5: - val = 1.5f; + val = 0.750f; Config->set_meter_falloff_faster(true); break; case 6: - val = 2.5f; + val = 0.875f; Config->set_meter_falloff_fastest(true); break; } @@ -185,30 +187,33 @@ Editor::split_region () void Editor::split_region_at (jack_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 (jack_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; @@ -221,23 +226,24 @@ Editor::split_regions_at (jack_nframes_t where, AudioRegionSelection& regions) void Editor::remove_clicked_region () { - if (clicked_audio_trackview == 0 || clicked_regionview == 0) { + if (clicked_routeview == 0 || clicked_regionview == 0) { return; } - Playlist* playlist = clicked_audio_trackview->playlist(); + Playlist* playlist = clicked_routeview->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; @@ -267,58 +273,56 @@ Do you really want to destroy %1 ?"), } 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; + RegionView* rv; + boost::shared_ptr region; jack_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->regions.empty()) { - if (!selection->audio_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); } } @@ -329,7 +333,7 @@ void Editor::extend_selection_to_end_of_region (bool next) { TimeAxisView *tv; - Region *region; + boost::shared_ptr region; jack_nframes_t start; if ((region = select_region_for_operation (next ? 1 : 0, &tv)) == 0) { @@ -357,7 +361,7 @@ void Editor::extend_selection_to_start_of_region (bool previous) { TimeAxisView *tv; - Region *region; + boost::shared_ptr region; jack_nframes_t end; if ((region = select_region_for_operation (previous ? -1 : 0, &tv)) == 0) { @@ -390,22 +394,23 @@ Editor::nudge_forward (bool next) 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 (); @@ -424,27 +429,28 @@ Editor::nudge_backward (bool next) 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 (); @@ -468,18 +474,19 @@ Editor::nudge_forward_capture_offset () 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 (); @@ -494,23 +501,24 @@ Editor::nudge_backward_capture_offset () 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 (); @@ -537,7 +545,7 @@ Editor::build_region_boundary_cache () { jack_nframes_t pos = 0; RegionPoint point; - Region *r; + boost::shared_ptr r; TrackViewList tracks; region_boundary_cache.clear (); @@ -575,10 +583,10 @@ Editor::build_region_boundary_cache () break; } - } else if (clicked_trackview) { + } else if (clicked_axisview) { TrackViewList t; - t.push_back (clicked_trackview); + t.push_back (clicked_axisview); if ((r = find_next_region (pos, point, 1, t, &ontrack)) == 0) { break; @@ -633,12 +641,12 @@ Editor::build_region_boundary_cache () } } -Region* +boost::shared_ptr Editor::find_next_region (jack_nframes_t frame, RegionPoint point, int32_t dir, TrackViewList& tracks, TimeAxisView **ontrack) { TrackViewList::iterator i; jack_nframes_t closest = max_frames; - Region* ret = 0; + boost::shared_ptr ret; jack_nframes_t rpos = 0; float track_speed; @@ -648,8 +656,8 @@ Editor::find_next_region (jack_nframes_t frame, RegionPoint point, int32_t dir, for (i = tracks.begin(); i != tracks.end(); ++i) { jack_nframes_t distance; - Region* r; - + boost::shared_ptr r; + track_speed = 1.0f; if ( (atav = dynamic_cast(*i)) != 0 ) { if (atav->get_diskstream()!=0) @@ -698,7 +706,7 @@ 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; + boost::shared_ptr r; jack_nframes_t pos = cursor->current_frame; if (!session) { @@ -715,10 +723,10 @@ Editor::cursor_to_region_point (Cursor* cursor, RegionPoint point, int32_t dir) r = find_next_region (pos, point, dir, selection->tracks, &ontrack); - } else if (clicked_trackview) { + } else if (clicked_axisview) { TrackViewList t; - t.push_back (clicked_trackview); + t.push_back (clicked_axisview); r = find_next_region (pos, point, dir, t, &ontrack); @@ -781,8 +789,8 @@ Editor::cursor_to_selection_start (Cursor *cursor) jack_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; @@ -810,8 +818,8 @@ Editor::cursor_to_selection_end (Cursor *cursor) 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; @@ -1277,7 +1285,7 @@ Editor::add_location_from_selection () return; } - if (session == 0 || clicked_trackview == 0) { + if (session == 0 || clicked_axisview == 0) { return; } @@ -1287,9 +1295,10 @@ Editor::add_location_from_selection () Location *location = new Location (start, end, "selection"); session->begin_reversible_command (_("add marker")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); session->locations()->add (location, true); - 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 (); } @@ -1300,27 +1309,29 @@ Editor::add_location_from_playhead_cursor () Location *location = new Location (where, where, "mark", Location::IsMark); session->begin_reversible_command (_("add marker")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); session->locations()->add (location, true); - 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 (); } void Editor::add_location_from_audio_region () { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } - AudioRegionView* rv = *(selection->audio_regions.begin()); - Region& region = rv->region; + RegionView* rv = *(selection->regions.begin()); + boost::shared_ptr region = rv->region(); - Location *location = new Location (region.position(), region.last_frame(), region.name()); + Location *location = new Location (region->position(), region->last_frame(), region->name()); session->begin_reversible_command (_("add marker")); - session->add_undo (session->locations()->get_memento()); + XMLNode &before = session->locations()->get_state(); session->locations()->add (location, true); - 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 (); } @@ -1329,11 +1340,11 @@ Editor::select_all_in_track (Selection::Operation op) { list touched; - if (!clicked_trackview) { + if (!clicked_axisview) { return; } - clicked_trackview->get_selectables (0, max_frames, 0, DBL_MAX, touched); + clicked_axisview->get_selectables (0, max_frames, 0, DBL_MAX, touched); switch (op) { case Selection::Toggle: @@ -1379,11 +1390,11 @@ Editor::invert_selection_in_track () { list touched; - if (!clicked_trackview) { + if (!clicked_axisview) { return; } - clicked_trackview->get_inverted_selectables (*selection, touched); + clicked_axisview->get_inverted_selectables (*selection, touched); selection->set (touched); } @@ -1441,15 +1452,15 @@ Editor::select_all_within (jack_nframes_t start, jack_nframes_t end, double top, void Editor::set_selection_from_audio_region () { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } - AudioRegionView* rv = *(selection->audio_regions.begin()); - Region& region = rv->region; + 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()); + selection->set (0, region->position(), region->last_frame()); commit_reversible_command (); set_mouse_mode (Editing::MouseRange, false); @@ -1736,9 +1747,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 (); } } @@ -1748,7 +1760,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(); @@ -1758,7 +1770,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 (); } } @@ -1767,9 +1780,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 (); } @@ -1777,7 +1791,7 @@ Editor::clear_locations () /* INSERT/REPLACE */ void -Editor::insert_region_list_drag (AudioRegion& region, int x, int y) +Editor::insert_region_list_drag (boost::shared_ptr region, int x, int y) { double wx, wy; double cx, cy; @@ -1817,22 +1831,22 @@ Editor::insert_region_list_drag (AudioRegion& region, int x, int y) 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; + if (clicked_routeview != 0) { + tv = clicked_routeview; } else if (!selection->tracks.empty()) { - if ((tv = dynamic_cast(selection->tracks.front())) == 0) { + if ((tv = dynamic_cast(selection->tracks.front())) == 0) { return; } } else { @@ -1850,12 +1864,12 @@ Editor::insert_region_list_selection (float times) } TreeModel::iterator i = region_list_display.get_selection()->get_selected(); - Region* region = (*i)[region_list_columns.region]; + boost::shared_ptr region = (*i)[region_list_columns.region]; 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()); + 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 (); } @@ -1927,23 +1941,23 @@ Editor::play_selection () void Editor::play_selected_region () { - if (!selection->audio_regions.empty()) { - AudioRegionView *rv = *(selection->audio_regions.begin()); + if (!selection->regions.empty()) { + RegionView *rv = *(selection->regions.begin()); - session->request_bounded_roll (rv->region.position(), rv->region.last_frame()); + 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 @@ -1986,10 +2000,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); } } @@ -1997,35 +2011,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 @@ -2046,7 +2060,7 @@ Editor::rename_region () Button ok_button (_("OK")); Button cancel_button (_("Cancel")); - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } @@ -2077,7 +2091,7 @@ Editor::rename_region () Main::run (); if (region_renamed) { - (*selection->audio_regions.begin())->region.set_name (entry.get_text()); + (*selection->regions.begin())->region()->set_name (entry.get_text()); redisplay_regions (); } } @@ -2091,7 +2105,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 (); @@ -2104,7 +2118,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 ? */ } @@ -2112,14 +2126,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); } @@ -2155,7 +2169,7 @@ Editor::interthread_cancel_clicked () void Editor::region_from_selection () { - if (clicked_trackview == 0) { + if (clicked_axisview == 0) { return; } @@ -2169,10 +2183,8 @@ Editor::region_from_selection () jack_nframes_t selection_cnt = end - start + 1; for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - - AudioRegion *region; - AudioRegion *current; - Region* current_r; + boost::shared_ptr current; + boost::shared_ptr current_r; Playlist *pl; jack_nframes_t internal_start; @@ -2186,16 +2198,18 @@ Editor::region_from_selection () continue; } - if ((current = dynamic_cast (current_r)) != 0) { + current = boost::dynamic_pointer_cast (current_r); + assert(current); // FIXME + if (current != 0) { internal_start = start - current->position(); session->region_name (new_name, current->name(), true); - region = new AudioRegion (*current, internal_start, selection_cnt, new_name); + boost::shared_ptr region (RegionFactory::create (current, internal_start, selection_cnt, new_name)); } } } void -Editor::create_region_from_selection (vector& new_regions) +Editor::create_region_from_selection (vector >& new_regions) { if (selection->time.empty() || selection->tracks.empty()) { return; @@ -2206,8 +2220,8 @@ Editor::create_region_from_selection (vector& new_regions) for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - AudioRegion* current; - Region* current_r; + boost::shared_ptr current; + boost::shared_ptr current_r; Playlist* playlist; jack_nframes_t internal_start; string new_name; @@ -2220,14 +2234,14 @@ Editor::create_region_from_selection (vector& new_regions) continue; } - if ((current = dynamic_cast(current_r)) == 0) { + 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 (new AudioRegion (*current, internal_start, end - start + 1, new_name)); + new_regions.push_back (boost::dynamic_pointer_cast (RegionFactory::create (current, internal_start, end - start + 1, new_name))); } } @@ -2236,11 +2250,13 @@ Editor::split_multichannel_region () { vector v; - if (!clicked_regionview || clicked_regionview->region.n_channels() < 2) { + AudioRegionView* clicked_arv = dynamic_cast(clicked_regionview); + + if (!clicked_arv || clicked_arv->audio_region()->n_channels() < 2) { return; } - clicked_regionview->region.separate_by_channel (*session, v); + clicked_arv->audio_region()->separate_by_channel (*session, v); /* nothing else to do, really */ } @@ -2255,6 +2271,8 @@ Editor::new_region_from_selection () void Editor::separate_region_from_selection () { + // FIXME: TYPE + bool doing_undo = false; if (selection->time.empty()) { @@ -2276,7 +2294,9 @@ Editor::separate_region_from_selection () begin_reversible_command (_("separate")); doing_undo = true; } - if (doing_undo) session->add_undo ((playlist)->get_memento()); + XMLNode *before; + if (doing_undo) + before = &(playlist->get_state()); /* XXX need to consider musical time selections here at some point */ @@ -2286,7 +2306,8 @@ Editor::separate_region_from_selection () 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()); + if (doing_undo) + session->add_command(new MementoCommand(*playlist, before, &playlist->get_state())); } } } @@ -2298,6 +2319,8 @@ Editor::separate_region_from_selection () void Editor::separate_regions_using_location (Location& loc) { + // FIXME: TYPE + bool doing_undo = false; if (loc.is_mark()) { @@ -2321,11 +2344,14 @@ Editor::separate_regions_using_location (Location& loc) 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 */ @@ -2333,7 +2359,8 @@ Editor::separate_regions_using_location (Location& loc) playlist->partition ((jack_nframes_t)(loc.start() * speed), (jack_nframes_t)(loc.end() * speed), true); - if (doing_undo) session->add_redo_no_execute (playlist->get_memento()); + if (doing_undo) + session->add_command(new MementoCommand(*playlist, before, &playlist->get_state())); } } } @@ -2352,9 +2379,9 @@ Editor::crop_region_to_selection () vector playlists; Playlist *playlist; - if (clicked_trackview != 0) { + if (clicked_axisview != 0) { - if ((playlist = clicked_trackview->playlist()) == 0) { + if ((playlist = clicked_axisview->playlist()) == 0) { return; } @@ -2364,15 +2391,12 @@ Editor::crop_region_to_selection () for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { - AudioTimeAxisView* atv; + RouteTimeAxisView* rtv = dynamic_cast(*i); - if ((atv = dynamic_cast ((*i))) != 0) { + if (rtv && rtv->is_track()) { - if (atv->is_audio_track()) { - - if ((playlist = atv->playlist()) != 0) { - playlists.push_back (playlist); - } + if ((playlist = rtv->playlist()) != 0) { + playlists.push_back (playlist); } } } @@ -2388,7 +2412,7 @@ Editor::crop_region_to_selection () for (vector::iterator i = playlists.begin(); i != playlists.end(); ++i) { - Region *region; + boost::shared_ptr region; start = selection->time.start(); @@ -2404,9 +2428,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 (); @@ -2418,7 +2443,7 @@ Editor::region_fill_track () { jack_nframes_t end; - if (!session || selection->audio_regions.empty()) { + if (!session || selection->regions.empty()) { return; } @@ -2426,24 +2451,29 @@ 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) { - AudioRegion& region ((*i)->region); - Playlist* pl = region.playlist(); + boost::shared_ptr region ((*i)->region()); + + // FIXME + boost::shared_ptr ar = boost::dynamic_pointer_cast(region); + assert(ar); + + 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 (); @@ -2452,7 +2482,7 @@ Editor::region_fill_track () void Editor::region_fill_selection () { - if (clicked_audio_trackview == 0 || !clicked_audio_trackview->is_audio_track()) { + if (clicked_routeview == 0 || !clicked_routeview->is_audio_track()) { return; } @@ -2460,7 +2490,6 @@ Editor::region_fill_selection () return; } - Region *region; Glib::RefPtr selected = region_list_display.get_selection(); @@ -2469,7 +2498,7 @@ Editor::region_fill_selection () } TreeModel::iterator i = region_list_display.get_selection()->get_selected(); - region = (*i)[region_list_columns.region]; + 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; @@ -2491,26 +2520,27 @@ 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 (Region& region, jack_nframes_t position) +Editor::set_a_regions_sync_position (boost::shared_ptr region, jack_nframes_t position) { - if (!region.covers (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")); - session->add_undo (region.playlist()->get_memento()); - region.set_sync_position (position); - session->add_redo_no_execute (region.playlist()->get_memento()); + 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 (); } @@ -2521,16 +2551,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 (); } @@ -2538,11 +2569,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 (); } } @@ -2550,14 +2582,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 (); } @@ -2575,15 +2608,15 @@ Editor::align_relative (RegionPoint what) } struct RegionSortByTime { - bool operator() (const AudioRegionView* a, const AudioRegionView* b) { - return a->region.position() < b->region.position(); + bool operator() (const RegionView* a, const RegionView* b) { + return a->region()->position() < b->region()->position(); } }; void Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } @@ -2591,21 +2624,21 @@ Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) jack_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; } @@ -2619,19 +2652,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)); } @@ -2641,21 +2675,21 @@ Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) void Editor::align_selection (RegionPoint point, jack_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, jack_nframes_t position) { begin_reversible_command (_("align region")); align_region_internal (region, point, position); @@ -2663,27 +2697,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, jack_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 @@ -2693,21 +2728,22 @@ 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; - if ( clicked_trackview != 0 && (atav = dynamic_cast(clicked_trackview)) != 0 ) { + if ( clicked_axisview != 0 && (atav = dynamic_cast(clicked_axisview)) != 0 ) { if (atav->get_diskstream() != 0) { speed = atav->get_diskstream()->speed(); } } begin_reversible_command (_("trim to edit")); - session->add_undo (region.playlist()->get_memento()); - region.trim_end( session_frame_to_track_frame(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 (); } @@ -2718,32 +2754,33 @@ 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; - if ( clicked_trackview != 0 && (atav = dynamic_cast(clicked_trackview)) != 0 ) { + if ( clicked_axisview != 0 && (atav = dynamic_cast(clicked_axisview)) != 0 ) { if (atav->get_diskstream() != 0) { speed = atav->get_diskstream()->speed(); } } begin_reversible_command (_("trim to edit")); - session->add_undo (region.playlist()->get_memento()); - region.trim_front ( session_frame_to_track_frame(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 (); } void Editor::unfreeze_route () { - if (clicked_audio_trackview == 0 || !clicked_audio_trackview->is_audio_track()) { + if (clicked_routeview == 0 || !clicked_routeview->is_track()) { return; } - clicked_audio_trackview->audio_track()->unfreeze (); + clicked_routeview->track()->unfreeze (); } void* @@ -2756,7 +2793,7 @@ Editor::_freeze_thread (void* arg) void* Editor::freeze_thread () { - clicked_audio_trackview->audio_track()->freeze (*current_interthread_info); + clicked_routeview->audio_track()->freeze (*current_interthread_info); return 0; } @@ -2770,7 +2807,7 @@ Editor::freeze_progress_timeout (void *arg) void Editor::freeze_route () { - if (clicked_audio_trackview == 0 || !clicked_audio_trackview->is_audio_track()) { + if (clicked_routeview == 0 || !clicked_routeview->is_track()) { return; } @@ -2844,9 +2881,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 (); @@ -2889,16 +2927,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 (); } } @@ -2955,26 +2993,26 @@ Editor::cut_copy_regions (CutCopyOp op) 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); if (insert_result.second) { pl->freeze (); - session->add_undo (pl->get_memento()); + session->add_command (new MementoCommand(*pl, &pl->get_state(), 0)); } } } } - 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; @@ -2991,18 +3029,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; } } @@ -3022,7 +3066,7 @@ Editor::cut_copy_regions (CutCopyOp op) for (set::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) { (*pl)->thaw (); - session->add_redo_no_execute ((*pl)->get_memento()); + session->add_command (new MementoCommand(*(*pl), 0, &(*pl)->get_state())); } } @@ -3135,9 +3179,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; @@ -3148,27 +3192,27 @@ 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; - AudioRegionSelection sel = regions; // clear (below) will clear the argument list + RegionSelection sel = regions; // clear (below) will clear the argument list begin_reversible_command (_("duplicate region")); - selection->clear_audio_regions (); + selection->clear_regions (); - for (AudioRegionSelection::iterator i = sel.begin(); i != sel.end(); ++i) { + for (RegionSelection::iterator i = sel.begin(); i != sel.end(); ++i) { - Region& r ((*i)->region); + boost::shared_ptr r ((*i)->region()); TimeAxisView& tv = (*i)->get_time_axis_view(); AudioTimeAxisView* atv = dynamic_cast (&tv); - sigc::connection c = atv->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view)); + 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 (); @@ -3189,8 +3233,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); @@ -3206,9 +3250,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()) { @@ -3256,9 +3301,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 (); } @@ -3292,9 +3338,10 @@ 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 (); @@ -3335,7 +3382,7 @@ Editor::normalize_region () return; } - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } @@ -3344,10 +3391,13 @@ Editor::normalize_region () 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 (); @@ -3362,16 +3412,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 (); @@ -3392,7 +3445,7 @@ Editor::reverse_region () void Editor::apply_filter (AudioFilter& filter, string command) { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } @@ -3401,21 +3454,24 @@ Editor::apply_filter (AudioFilter& filter, string command) 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; } @@ -3424,7 +3480,7 @@ Editor::apply_filter (AudioFilter& filter, string command) } commit_reversible_command (); - selection->audio_regions.clear (); + selection->regions.clear (); out: track_canvas.get_window()->set_cursor (*current_canvas_cursor); @@ -3433,8 +3489,9 @@ Editor::apply_filter (AudioFilter& filter, string command) 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)(); } } @@ -3442,16 +3499,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); } } @@ -3468,20 +3527,20 @@ Editor::external_edit_region () void Editor::brush (jack_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); } } @@ -3489,18 +3548,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); } }