X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=579b2403c649194e130beef9195edc391d881ee9;hb=b7bffbe7a249356a93d25a41f7c472cc9dd8f27f;hp=747b4d47ecaea458fd3edd99126748fdf1afb617;hpb=5a39bf595c737dbb36666a9e718ac267e9131380;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 747b4d47ec..579b2403c6 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -25,8 +25,6 @@ #include #include -#include - #include #include #include @@ -38,9 +36,7 @@ #include #include #include -#include -#include -#include +#include #include #include #include @@ -62,11 +58,13 @@ #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; @@ -94,14 +92,78 @@ 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 (float val) +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); } @@ -145,9 +207,11 @@ Editor::split_regions_at (jack_nframes_t where, AudioRegionSelection& regions) _new_regionviews_show_envelope = (*a)->envelope_visible(); if (pl) { - session->add_undo (pl->get_memento()); + XMLNode &before, &after; + before = pl->get_state(); pl->split_region ((*a)->region, where); - session->add_redo_no_execute (pl->get_memento()); + after = pl->get_state(); + session->add_command(MementoCommand(*pl, before, after)); } a = tmp; @@ -167,9 +231,10 @@ Editor::remove_clicked_region () Playlist* playlist = clicked_audio_trackview->playlist(); begin_reversible_command (_("remove region")); - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->remove_region (&clicked_regionview->region); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &after = playlist->get_state(); + session->add_command(MementoCommand(*playlist, before, after)); commit_reversible_command (); } @@ -191,22 +256,17 @@ 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 (ptr_fun (Main::quit)); - prompter.show_all (); - - Main::run (); - - if (prompter.get_choice() != 0) { + + if (prompter.run() == 0) { /* first choice */ return; } @@ -347,9 +407,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 (MementoCommand(*(r.playlist()), before, after)); } commit_reversible_command (); @@ -381,14 +442,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(MementoCommand(*(r.playlist()), before, after)); } commit_reversible_command (); @@ -400,7 +462,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(); } } } @@ -421,9 +483,11 @@ Editor::nudge_forward_capture_offset () for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { AudioRegion& r ((*i)->region); - session->add_undo (r.playlist()->get_memento()); + XMLNode &before, &after; + before = r.playlist()->get_state(); r.set_position (r.position() + distance, this); - session->add_redo_no_execute (r.playlist()->get_memento()); + after = r.playlist()->get_state(); + session->add_command(MementoCommand(*(r.playlist()), before, after)); } commit_reversible_command (); @@ -447,14 +511,15 @@ Editor::nudge_backward_capture_offset () for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) { AudioRegion& 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(MementoCommand(*(r.playlist()), before, after)); } commit_reversible_command (); @@ -466,7 +531,7 @@ Editor::nudge_backward_capture_offset () void Editor::move_to_start () { - session->request_locate (0); + session->goto_start (); } void @@ -990,7 +1055,12 @@ Editor::scroll_tracks_down () cnt = (int) floor (prefix); } - vertical_adjustment.set_value (vertical_adjustment.get_value() + (cnt * vertical_adjustment.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 @@ -1012,15 +1082,21 @@ Editor::scroll_tracks_up () 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 */ @@ -1028,6 +1104,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; @@ -1129,8 +1207,10 @@ 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"); } } @@ -1199,6 +1279,63 @@ Editor::temporal_zoom_to_frame (bool coarser, jack_nframes_t frame) reposition_and_zoom (new_leftmost, new_fpu); } +void +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(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(MementoCommand(*(session->locations()), before, after)); + session->commit_reversible_command (); +} + +void +Editor::add_location_from_audio_region () +{ + if (selection->audio_regions.empty()) { + return; + } + + AudioRegionView* rv = *(selection->audio_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(MementoCommand(*(session->locations()), before, after)); + session->commit_reversible_command (); +} + void Editor::select_all_in_track (Selection::Operation op) { @@ -1288,22 +1425,48 @@ Editor::select_all_within (jack_nframes_t start, jack_nframes_t end, double top, } (*iter)->get_selectables (start, end, top, bot, touched); } + + 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); 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->audio_regions.empty()) { + return; + } + + AudioRegionView* rv = *(selection->audio_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() { @@ -1330,25 +1493,18 @@ Editor::set_selection_from_loop() void Editor::set_selection_from_range (Location& loc) { - if (clicked_trackview == 0) { - return; - } - 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 (clicked_trackview == 0) { - return; - } - if (selection->time.empty()) { return; } @@ -1366,10 +1522,10 @@ Editor::select_all_selectables_using_time_selection () } (*iter)->get_selectables (start, end - 1, 0, DBL_MAX, touched); } + begin_reversible_command (_("select all from range")); selection->set (touched); commit_reversible_command (); - } @@ -1425,18 +1581,51 @@ Editor::select_all_selectables_using_cursor (Cursor *cursor, bool after) list touched; if (after) { - begin_reversible_command (_("select all after cursor")); - start = cursor->current_frame ; - end = session->current_end_frame(); + 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 { - if (cursor->current_frame > 0) { - begin_reversible_command (_("select all before cursor")); - start = 0; - end = cursor->current_frame - 1; - } else { - return; - } + start = cursor->current_frame; + end = other_cursor->current_frame - 1; } + for (TrackViewList::iterator iter = track_views.begin(); iter != track_views.end(); ++iter) { if ((*iter)->hidden()) { continue; @@ -1530,7 +1719,7 @@ Editor::jump_backward_to_mark () if (location) { session->request_locate (location->start(), session->transport_rolling()); } else { - session->request_locate (0); + session->goto_start (); } } @@ -1559,9 +1748,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(MementoCommand(*(session->locations()), before, after)); session->commit_reversible_command (); } } @@ -1571,7 +1761,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(); @@ -1581,7 +1771,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(MementoCommand(*(session->locations()), before, after)); session->commit_reversible_command (); } } @@ -1590,9 +1781,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(MementoCommand(*(sessions->locations()), before, after)); session->commit_reversible_command (); session->locations()->clear (); } @@ -1640,9 +1832,9 @@ 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()); + 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(MementoCommand(*playlist, before, playlist->get_state())); commit_reversible_command (); } @@ -1676,9 +1868,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(MementoCommand(*playlist, before, playlist->get_state())); commit_reversible_command (); } @@ -1734,7 +1926,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 @@ -1975,497 +2167,6 @@ 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) -{ - if (session == 0) { - warning << _("You can't import an audiofile until you have a session loaded.") << endmsg; - return; - } - - string str; - - if (as_tracks) { - str =_("Import selected as tracks"); - } else { - str = _("Import selected to region list"); - } - - 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; -} - -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 (const string & path, SF_INFO& finfo, const 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 (ptr_fun (Main::quit)); - 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.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.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 (const 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.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.get_window()->set_cursor (*current_canvas_cursor); - return; -} - void Editor::region_from_selection () { @@ -2590,7 +2291,9 @@ Editor::separate_region_from_selection () begin_reversible_command (_("separate")); doing_undo = true; } - if (doing_undo) session->add_undo ((playlist)->get_memento()); + XMLNode &before, &after; + if (doing_undo) + before = playlist->get_state(); /* XXX need to consider musical time selections here at some point */ @@ -2600,7 +2303,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(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, &after; + 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(MementoCommand(*playlist, before, playlist->get_state())); } } } @@ -2671,9 +2426,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 (MementoCommand(*(*i), before, after)); } commit_reversible_command (); @@ -2708,9 +2464,9 @@ Editor::region_fill_track () return; } - session->add_undo (pl->get_memento()); + XMLNode &before = pl->get_state(); pl->add_region (*(new AudioRegion (region)), region.last_frame(), times); - session->add_redo_no_execute (pl->get_memento()); + session->add_command (MementoCommand(*pl, before, pl->get_state())); } commit_reversible_command (); @@ -2758,9 +2514,9 @@ 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 (MementoCommand(*playlist, before, playlist->get_state())); } commit_reversible_command (); @@ -2775,9 +2531,10 @@ Editor::set_a_regions_sync_position (Region& region, jack_nframes_t position) return; } begin_reversible_command (_("set region sync position")); - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region.playlist()->get_state(); region.set_sync_position (position); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &after = region.playlist()->get_state(); + session->add_command(MementoCommand(*(region.playlist()), before, after)); commit_reversible_command (); } @@ -2795,9 +2552,10 @@ Editor::set_region_sync_from_edit_cursor () 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(MementoCommand(*(region.playlist()), before, after)); commit_reversible_command (); } @@ -2807,9 +2565,10 @@ Editor::remove_region_sync () if (clicked_regionview) { 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(MementoCommand(*(region.playlist()), before, after)); commit_reversible_command (); } } @@ -2822,9 +2581,10 @@ Editor::naturalize () } 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()); + XMLNode &before = (*i)->region.get_state(); (*i)->region.move_to_natural_position (this); - session->add_redo_no_execute ((*i)->region.get_memento()); + XMLNode &after = (*i)->region.get_state(); + session->add_command (MementoCommand((*i)->region, before, after)); } commit_reversible_command (); } @@ -2890,7 +2650,7 @@ Editor::align_selection_relative (RegionPoint point, jack_nframes_t position) 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); @@ -2898,7 +2658,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(MementoCommand(*(region.playlist()), before, after)); } @@ -2932,7 +2693,8 @@ 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, &after; + before = region.playlist()->get_state(); switch (point) { case SyncPoint: @@ -2950,7 +2712,8 @@ Editor::align_region_internal (Region& region, RegionPoint point, jack_nframes_t break; } - session->add_redo_no_execute (region.playlist()->get_memento()); + after = region.playlist()->get_state(); + session->add_command(MementoCommand(*(region.playlist()), before, after)); } void @@ -2972,9 +2735,10 @@ Editor::trim_region_to_edit_cursor () } begin_reversible_command (_("trim to edit")); - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region.playlist()->get_state(); region.trim_end( session_frame_to_track_frame(edit_cursor->current_frame, speed), this); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &after = region.playlist()->get_state(); + session->add_command(MementoCommand(*(region.playlist()), before, after)); commit_reversible_command (); } @@ -2997,9 +2761,10 @@ Editor::trim_region_from_edit_cursor () } begin_reversible_command (_("trim to edit")); - session->add_undo (region.playlist()->get_memento()); + XMLNode &before = region.playlist()->get_state(); region.trim_front ( session_frame_to_track_frame(edit_cursor->current_frame, speed), this); - session->add_redo_no_execute (region.playlist()->get_memento()); + XMLNode &after = region.playlist()->get_state(); + session->add_command(MementoCommand(*(region.playlist()), before, after)); commit_reversible_command (); } @@ -3111,9 +2876,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 (MementoCommand (*playlist, before, after)); } commit_reversible_command (); @@ -3402,9 +3168,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(MementoCommand(*apl, before, apl->get_state())); if (tmp != ns->playlists.end()) { chunk = tmp; @@ -3433,9 +3199,9 @@ Editor::duplicate_some_regions (AudioRegionSelection& regions, float times) sigc::connection c = atv->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view)); playlist = (*i)->region.playlist(); - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->duplicate (r, r.last_frame(), times); - session->add_redo_no_execute (playlist->get_memento()); + session->add_command(MementoCommand(*playlist, before, playlist->get_state())); c.disconnect (); @@ -3473,9 +3239,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 (MementoCommand(*playlist, before, after)); ++ri; if (ri == new_regions.end()) { @@ -3486,6 +3253,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 () { @@ -3506,9 +3290,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 (MementoCommand(playlist, before, after)); commit_reversible_command (); } @@ -3542,34 +3327,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 (MementoCommand(*playlist, before, after)); } commit_reversible_command (); } -void -Editor::toggle_xfades_active () -{ - if (session) { - session->set_crossfades_active (!session->get_crossfades_active()); - } -} - -void -Editor::set_xfade_visibility (bool yn) -{ - -} - -void -Editor::toggle_xfade_visibility () -{ - set_xfade_visibility (!xfade_visibility()); -} - void Editor::remove_last_capture () { @@ -3584,16 +3350,12 @@ Editor::remove_last_capture () prompt = _("Do you really want to destroy the last capture?" "\n(This is destructive and cannot be undone)"); - choices.push_back (_("Yes, destroy it.")); choices.push_back (_("No, do nothing.")); + choices.push_back (_("Yes, destroy it.")); Gtkmm2ext::Choice prompter (prompt, choices); - prompter.chosen.connect (ptr_fun (Main::quit)); - prompter.show_all (); - - Main::run (); - if (prompter.get_choice() == 0) { + if (prompter.run () == 1) { session->remove_last_capture (); } @@ -3619,9 +3381,10 @@ Editor::normalize_region () gdk_flush (); for (AudioRegionSelection::iterator r = selection->audio_regions.begin(); r != selection->audio_regions.end(); ++r) { - session->add_undo ((*r)->region.get_memento()); + XMLNode &before = (*r)->region.get_state(); (*r)->region.normalize_to (0.0f); - session->add_redo_no_execute ((*r)->region.get_memento()); + XMLNode &after = (*r)->region.get_state(); + session->add_command (MementoCommand((*r)->region, before, after)); } commit_reversible_command (); @@ -3643,9 +3406,10 @@ Editor::denormalize_region () 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()); + XMLNode &before = (*r)->region.get_state(); (*r)->region.set_scale_amplitude (1.0f); - session->add_redo_no_execute ((*r)->region.get_memento()); + XMLNode &after = (*r)->region.get_state(); + session->add_command (MementoCommand((*r)->region, before, after)); } commit_reversible_command (); @@ -3687,9 +3451,10 @@ Editor::apply_filter (AudioFilter& filter, string command) if (region.apply (filter) == 0) { - session->add_undo (playlist->get_memento()); + XMLNode &before = playlist->get_state(); playlist->replace_region (region, *(filter.results.front()), region.position()); - session->add_redo_no_execute (playlist->get_memento()); + XMLNode &after = playlist->get_state(); + session->add_command(MementoCommand(*playlist, before, after)); } else { goto out; }