X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=1e5f336e525bb1ef7e89064d9e82948db0f7bd72;hb=5756373841675a879833f98bb4008dd0c40714d3;hp=6f86664c282b749226441400000c1bdd8faafddf;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 6f86664c28..1e5f336e52 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; @@ -91,6 +90,87 @@ Editor::redo (uint32_t n) } } +void +Editor::set_meter_hold (int32_t cnt) +{ + Config->set_meter_hold_off(false); + Config->set_meter_hold_short(false); + Config->set_meter_hold_medium(false); + Config->set_meter_hold_long(false); + + switch (cnt) + { + case 0: + Config->set_meter_hold_off(true); + break; + case 40: + Config->set_meter_hold_short(true); + break; + case 100: + Config->set_meter_hold_medium(true); + break; + case 200: + Config->set_meter_hold_long(true); + break; + } + + if (session) { + session->set_meter_hold (cnt); + } +} + +void +Editor::set_meter_falloff (int intval) +{ + float val = 0.0f; /* off */ + std::string str; + + Config->set_meter_falloff_off(false); + Config->set_meter_falloff_slowest(false); + Config->set_meter_falloff_slow(false); + Config->set_meter_falloff_medium(false); + Config->set_meter_falloff_fast(false); + Config->set_meter_falloff_faster(false); + Config->set_meter_falloff_fastest(false); + + switch (intval) + { + case 0: + val = 0.0f; + Config->set_meter_falloff_off(true); + break; + case 1: + val = 0.266f; + Config->set_meter_falloff_slowest(true); + break; + case 2: + val = 0.342f; + Config->set_meter_falloff_slow(true); + break; + case 3: + val = 0.7f; + Config->set_meter_falloff_medium(true); + break; + case 4: + val = 1.1f; + Config->set_meter_falloff_fast(true); + break; + case 5: + val = 1.5f; + Config->set_meter_falloff_faster(true); + break; + case 6: + val = 2.5f; + Config->set_meter_falloff_fastest(true); + break; + } + + if (session) { + session->set_meter_falloff (val); + } +} + + int Editor::ensure_cursor (jack_nframes_t *pos) { @@ -107,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; @@ -150,16 +233,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,51 +258,46 @@ 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; - 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 * +Region * Editor::select_region_for_operation (int dir, TimeAxisView **tv) { - AudioRegionView* rv; - AudioRegion *region; + RegionView* rv; + Region *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()) { + if (selection->regions.empty()) { return 0; } @@ -226,26 +305,26 @@ Editor::select_region_for_operation (int dir, TimeAxisView **tv) 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) { + if ((pl = rtv->playlist()) == 0) { return 0; } - region = dynamic_cast (pl->top_region_at (start)); + region = pl->top_region_at (start); } } @@ -317,12 +396,12 @@ 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) { + Region& r ((*i)->region()); distance = get_nudge_distance (r.position(), next_distance); @@ -330,9 +409,10 @@ Editor::nudge_forward (bool next) distance = next_distance; } - session->add_undo (r.playlist()->get_memento()); + XMLNode &before = r.playlist()->get_state(); r.set_position (r.position() + distance, 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 (); @@ -351,12 +431,12 @@ 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) { + Region& r ((*i)->region()); distance = get_nudge_distance (r.position(), next_distance); @@ -364,14 +444,15 @@ Editor::nudge_backward (bool 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); } else { 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 +464,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(); } } } @@ -395,18 +476,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) { + Region& r ((*i)->region()); - session->add_undo (r.playlist()->get_memento()); + XMLNode &before = r.playlist()->get_state(); r.set_position (r.position() + distance, 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 (); @@ -421,23 +503,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) { + Region& 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); } else { 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 +532,7 @@ Editor::nudge_backward_capture_offset () void Editor::move_to_start () { - session->request_locate (0); + session->goto_start (); } void @@ -547,7 +630,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) { @@ -583,7 +666,7 @@ Editor::find_next_region (jack_nframes_t frame, RegionPoint point, int32_t dir, 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 +685,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; @@ -681,8 +764,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); @@ -709,8 +791,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; @@ -738,8 +820,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; @@ -974,8 +1056,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,22 +1077,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 () { + Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - adj->set_value (adj->get_value() + 10); + 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 () { Gtk::Adjustment* adj = edit_vscrollbar.get_adjustment(); - adj->set_value (adj->get_value() - 10); + adj->set_value (adj->get_value() - 20); } /* ZOOM */ @@ -1014,6 +1105,8 @@ 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; @@ -1115,13 +1208,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 (jack_nframes_t start, jack_nframes_t end, const string & op) { if (!session) return; @@ -1186,7 +1281,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; + } + + jack_nframes_t start = selection->time[clicked_selection].start; + jack_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 () +{ + jack_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()); + Region& 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; @@ -1196,15 +1348,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; @@ -1214,13 +1372,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 @@ -1252,7 +1416,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 (jack_nframes_t start, jack_nframes_t end, double top, double bot, Selection::Operation op) { list touched; @@ -1263,15 +1427,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()); + Region& 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() { @@ -1292,19 +1488,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; + } + + jack_nframes_t start = selection->time[clicked_selection].start; + jack_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) +{ + jack_nframes_t start; + jack_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) +{ + jack_nframes_t start; + jack_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 (); } @@ -1391,7 +1720,7 @@ Editor::jump_backward_to_mark () if (location) { session->request_locate (location->start(), session->transport_rolling()); } else { - session->request_locate (0); + session->goto_start (); } } @@ -1420,9 +1749,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 (); } } @@ -1432,7 +1762,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(); @@ -1442,7 +1772,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 (); } } @@ -1451,9 +1782,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 (); } @@ -1461,9 +1793,8 @@ Editor::clear_locations () /* INSERT/REPLACE */ void -Editor::insert_region_list_drag (AudioRegion& region) +Editor::insert_region_list_drag (AudioRegion& region, int x, int y) { - double x, y; double wx, wy; double cx, cy; TimeAxisView *tv; @@ -1471,9 +1802,9 @@ Editor::insert_region_list_drag (AudioRegion& region) 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(); GdkEvent event; event.type = GDK_BUTTON_RELEASE; @@ -1502,22 +1833,22 @@ Editor::insert_region_list_drag (AudioRegion& region) snap_to (where); begin_reversible_command (_("insert dragged region")); - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->add_region (*(new AudioRegion (region)), where, 1.0); - session->add_redo_no_execute (playlist->get_memento()); + 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 { @@ -1530,7 +1861,7 @@ Editor::insert_region_list_selection (float times) Glib::RefPtr selected = region_list_display.get_selection(); - if (selected.count_selected_rows() != 1) { + if (selected->count_selected_rows() != 1) { return; } @@ -1538,9 +1869,9 @@ Editor::insert_region_list_selection (float times) Region* region = (*i)[region_list_columns.region]; begin_reversible_command (_("insert region")); - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->add_region (*(createRegion (*region)), edit_cursor->current_frame, times); - session->add_redo_no_execute (playlist->get_memento()); + session->add_command(new MementoCommand(*playlist, before, playlist->get_state())); commit_reversible_command (); } @@ -1596,7 +1927,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 @@ -1612,31 +1943,23 @@ 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 @@ -1679,10 +2002,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); } } @@ -1690,35 +2013,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 @@ -1739,7 +2062,7 @@ Editor::rename_region () Button ok_button (_("OK")); Button cancel_button (_("Cancel")); - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } @@ -1767,12 +2090,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 (); } } @@ -1786,7 +2107,7 @@ Editor::rename_region_finished (bool status) } void -Editor::audition_playlist_region_via_route (AudioRegion& region, Route& route) +Editor::audition_playlist_region_via_route (Region& region, Route& route) { if (session->is_auditioning()) { session->cancel_audition (); @@ -1807,14 +2128,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 (Region& region) { session->audition_region (region); } @@ -1822,23 +2143,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 @@ -1849,515 +2168,23 @@ Editor::interthread_cancel_clicked () } } -void * -Editor::_import_thread (void *arg) -{ - PBD::ThreadCreated (pthread_self(), X_("Import")); - - Editor *ed = (Editor *) arg; - return ed->import_thread (); -} - -void * -Editor::import_thread () -{ - session->import_audiofile (import_status); - return 0; -} - -gint -Editor::import_progress_timeout (void *arg) -{ - interthread_progress_label.set_text (import_status.doing_what); - - if (import_status.freeze) { - interthread_cancel_button.set_sensitive(false); - } else { - interthread_cancel_button.set_sensitive(true); - } - - if (import_status.doing_what == "building peak files") { - interthread_progress_bar.pulse (); - return FALSE; - } else { - interthread_progress_bar.set_fraction (import_status.progress/100); - } - - return !(import_status.done || import_status.cancel); -} - void -Editor::import_audio (bool as_tracks) +Editor::region_from_selection () { - if (session == 0) { - warning << _("You can't import an audiofile until you have a session loaded.") << endmsg; + if (clicked_trackview == 0) { return; } - string str; - - if (as_tracks) { - str =_("Import selected as tracks"); - } else { - str = _("Import selected to region list"); + if (selection->time.empty()) { + return; } - SoundFileOmega sfdb (str); - sfdb.Imported.connect (bind (mem_fun (*this, &Editor::do_import), as_tracks)); - - sfdb.run(); -} - -void -Editor::catch_new_audio_region (AudioRegion* ar) -{ - last_audio_region = ar; -} + jack_nframes_t start = selection->time[clicked_selection].start; + jack_nframes_t end = selection->time[clicked_selection].end; -void -Editor::do_import (vector paths, bool split, bool as_tracks) -{ - 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)); - - /* 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)"), selection, errbuf) << endmsg; - 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::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 */ - - /* its the second node, always */ - - // GTK2FIX ?? is it still always the 2nd node - - TreeModel::Path path ("2"); - region_list_display.expand_row (path, true); - - 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); - - - /* 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); - } -} - -void -Editor::insert_sndfile_into (string path, bool multi, AudioTimeAxisView* tv, jack_nframes_t& pos, bool prompt) -{ - 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::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; -} - -void -Editor::region_from_selection () -{ - if (clicked_trackview == 0) { - return; - } - - 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; + 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; @@ -2374,7 +2201,9 @@ Editor::region_from_selection () continue; } - if ((current = dynamic_cast (current_r)) != 0) { + current = dynamic_cast (current_r); + // FIXME: audio only + 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); @@ -2424,11 +2253,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 */ } @@ -2464,7 +2295,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 */ @@ -2474,7 +2307,59 @@ 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())); + } + } + } + } + + if (doing_undo) commit_reversible_command (); +} + +void +Editor::separate_regions_using_location (Location& loc) +{ + bool doing_undo = false; + + if (loc.is_mark()) { + return; + } + + Playlist *playlist; + + /* 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; + + if ((atv = dynamic_cast ((*i))) != 0) { + + 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) + before = &(playlist->get_state()); + + + /* XXX need to consider musical time selections here at some point */ + + double speed = atv->get_diskstream()->speed(); + + + playlist->partition ((jack_nframes_t)(loc.start() * speed), (jack_nframes_t)(loc.end() * speed), true); + if (doing_undo) + session->add_command(new MementoCommand(*playlist, *before, playlist->get_state())); } } } @@ -2545,9 +2430,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 (); @@ -2559,7 +2445,7 @@ Editor::region_fill_track () { jack_nframes_t end; - if (!session || selection->audio_regions.empty()) { + if (!session || selection->regions.empty()) { return; } @@ -2567,9 +2453,15 @@ 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) { + + Region& region ((*i)->region()); + + // FIXME + AudioRegion* const ar = dynamic_cast(®ion); + if (!ar) + continue; - AudioRegion& region ((*i)->region); Playlist* pl = region.playlist(); if (end <= region.last_frame()) { @@ -2582,9 +2474,9 @@ Editor::region_fill_track () 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 (*(new AudioRegion (*ar)), ar->last_frame(), times); + session->add_command (new MementoCommand(*pl, before, pl->get_state())); } commit_reversible_command (); @@ -2605,7 +2497,7 @@ Editor::region_fill_selection () Glib::RefPtr selected = region_list_display.get_selection(); - if (selected.count_selected_rows() != 1) { + if (selected->count_selected_rows() != 1) { return; } @@ -2632,14 +2524,30 @@ Editor::region_fill_selection () continue; } - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->add_region (*(createRegion (*region)), start, times); - session->add_redo_no_execute (playlist->get_memento()); + 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) +{ + + 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 () { @@ -2647,17 +2555,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); - + Region& region (clicked_regionview->region()); begin_reversible_command (_("set sync from edit cursor")); - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region.playlist()->get_state(); region.set_sync_position (edit_cursor->current_frame); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &after = region.playlist()->get_state(); + session->add_command(new MementoCommand(*(region.playlist()), before, after)); commit_reversible_command (); } @@ -2665,11 +2573,12 @@ void Editor::remove_region_sync () { if (clicked_regionview) { - Region& region (clicked_regionview->region); + Region& region (clicked_regionview->region()); begin_reversible_command (_("remove sync")); - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region.playlist()->get_state(); region.clear_sync_position (); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &after = region.playlist()->get_state(); + session->add_command(new MementoCommand(*(region.playlist()), before, after)); commit_reversible_command (); } } @@ -2677,14 +2586,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(), before, after)); } commit_reversible_command (); } @@ -2703,14 +2613,14 @@ 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) { - if (selection->audio_regions.empty()) { + if (selection->regions.empty()) { return; } @@ -2718,9 +2628,9 @@ 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); + Region& r ((*sorted.begin())->region()); switch (point) { case Start: @@ -2746,11 +2656,11 @@ 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); + Region& 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); @@ -2758,7 +2668,8 @@ Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) 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)); } @@ -2768,14 +2679,14 @@ 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 (); @@ -2792,7 +2703,7 @@ Editor::align_region (Region& region, RegionPoint point, jack_nframes_t position void Editor::align_region_internal (Region& region, RegionPoint point, jack_nframes_t position) { - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region.playlist()->get_state(); switch (point) { case SyncPoint: @@ -2810,7 +2721,8 @@ Editor::align_region_internal (Region& region, RegionPoint point, jack_nframes_t 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 @@ -2820,7 +2732,7 @@ Editor::trim_region_to_edit_cursor () return; } - Region& region (clicked_regionview->region); + Region& region (clicked_regionview->region()); float speed = 1.0f; AudioTimeAxisView *atav; @@ -2832,9 +2744,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 (); } @@ -2845,7 +2758,7 @@ Editor::trim_region_from_edit_cursor () return; } - Region& region (clicked_regionview->region); + Region& region (clicked_regionview->region()); float speed = 1.0f; AudioTimeAxisView *atav; @@ -2857,9 +2770,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 (); } @@ -2924,7 +2838,7 @@ Editor::freeze_route () pthread_create (&itt.thread, 0, _freeze_thread, this); - track_canvas_scroller.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); + track_canvas.get_window()->set_cursor (Gdk::Cursor (Gdk::WATCH)); while (!itt.done && !itt.cancel) { gtk_main_iteration (); @@ -2933,7 +2847,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 @@ -2971,9 +2885,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 (); @@ -3016,16 +2931,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 (); } } @@ -3082,26 +2997,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 MementoUndoCommand(*pl, pl->get_state())); } } } } - 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; @@ -3118,18 +3033,24 @@ Editor::cut_copy_regions (CutCopyOp op) npl = pi->second; } + // FIXME + AudioRegion* const ar = dynamic_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 (*(new AudioRegion (*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 (*(new AudioRegion (*ar)), (*x)->region().position() - first_position); break; case Clear: - pl->remove_region (&((*x)->region)); + pl->remove_region (&((*x)->region())); break; } } @@ -3149,7 +3070,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 MementoRedoCommand(*(*pl), (*pl)->get_state())); } } @@ -3170,10 +3091,14 @@ Editor::paste (float times) void Editor::mouse_paste () { - double x, y; + int x, y; double 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; @@ -3219,11 +3144,11 @@ Editor::paste_internal (jack_nframes_t position, float times) void Editor::paste_named_selection (float times) { - TrackSelection::iterator i; + TrackSelection::iterator t; Glib::RefPtr selected = named_selection_display.get_selection(); - if (selected.count_selected_rows() == 0 || selection->tracks.empty()) { + if (selected->count_selected_rows() != 1 || selection->tracks.empty()) { return; } @@ -3237,13 +3162,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; } @@ -3258,9 +3183,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; @@ -3271,22 +3196,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 (); + + for (RegionSelection::iterator i = sel.begin(); i != sel.end(); ++i) { + + Region& r ((*i)->region()); - Region& 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 = (*i)->region().playlist(); + XMLNode &before = playlist->get_state(); playlist->duplicate (r, r.last_frame(), times); - session->add_redo_no_execute (playlist->get_memento()); + session->add_command(new MementoCommand(*playlist, before, playlist->get_state())); + c.disconnect (); + + if (latest_regionview) { + selection->add (latest_regionview); + } } + commit_reversible_command (); } @@ -3316,9 +3254,10 @@ Editor::duplicate_selection (float times) if ((playlist = (*i)->playlist()) == 0) { continue; } - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->duplicate (**ri, selection->time[clicked_selection].end, times); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &after = playlist->get_state(); + session->add_command (new MementoCommand(*playlist, before, after)); ++ri; if (ri == new_regions.end()) { @@ -3329,6 +3268,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 () { @@ -3349,9 +3305,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 (); } @@ -3385,40 +3342,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 () { @@ -3433,18 +3365,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.done.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(); } @@ -3457,23 +3386,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(), before, arv->region().get_state())); } commit_reversible_command (); - track_canvas_scroller.get_window()->set_cursor (*current_canvas_cursor); + track_canvas.get_window()->set_cursor (*current_canvas_cursor); } @@ -3484,16 +3416,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(), before, arv->region().get_state())); } commit_reversible_command (); @@ -3514,30 +3449,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; } @@ -3546,17 +3484,17 @@ Editor::apply_filter (AudioFilter& filter, string command) } commit_reversible_command (); - selection->audio_regions.clear (); + selection->regions.clear (); out: - track_canvas_scroller.get_window()->set_cursor (*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) { + ((*i)->region().*pmf)(); } } @@ -3564,16 +3502,16 @@ 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) { + ((*i)->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) { + ((*i)->region().*pmf)(yn); } } @@ -3590,20 +3528,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); } } @@ -3611,18 +3549,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); } }