X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=598725c72cd3ab019d192e3d4eeb7773f32e7d61;hb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;hp=cb67f1fc20b696ec085ed0d82eeb9d695dadc40b;hpb=c2493141d983b9c4f1f35386ff21e86e686a6be9;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index cb67f1fc20..598725c72c 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -42,6 +42,7 @@ #include "ardour/audio_track.h" #include "ardour/audioregion.h" +#include "ardour/boost_debug.h" #include "ardour/dB.h" #include "ardour/location.h" #include "ardour/midi_region.h" @@ -1589,6 +1590,53 @@ Editor::scroll_up_one_track (bool skip_child_views) return false; } +void +Editor::scroll_left_step () +{ + framepos_t xdelta = (current_page_samples() / 8); + + if (leftmost_frame > xdelta) { + reset_x_origin (leftmost_frame - xdelta); + } else { + reset_x_origin (0); + } +} + + +void +Editor::scroll_right_step () +{ + framepos_t xdelta = (current_page_samples() / 8); + + if (max_framepos - xdelta > leftmost_frame) { + reset_x_origin (leftmost_frame + xdelta); + } else { + reset_x_origin (max_framepos - current_page_samples()); + } +} + +void +Editor::scroll_left_half_page () +{ + framepos_t xdelta = (current_page_samples() / 2); + if (leftmost_frame > xdelta) { + reset_x_origin (leftmost_frame - xdelta); + } else { + reset_x_origin (0); + } +} + +void +Editor::scroll_right_half_page () +{ + framepos_t xdelta = (current_page_samples() / 2); + if (max_framepos - xdelta > leftmost_frame) { + reset_x_origin (leftmost_frame + xdelta); + } else { + reset_x_origin (max_framepos - current_page_samples()); + } +} + /* ZOOM */ void @@ -1640,6 +1688,14 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all) } } +void +Editor::temporal_zoom_step_mouse_focus (bool coarser) +{ + Editing::ZoomFocus temp_focus = zoom_focus; + zoom_focus = Editing::ZoomFocusMouse; + temporal_zoom_step (coarser); + zoom_focus = temp_focus; +} void Editor::temporal_zoom_step (bool coarser) @@ -1866,7 +1922,7 @@ Editor::temporal_zoom_region (bool both_axes) bool -Editor::get_selection_extents ( framepos_t &start, framepos_t &end ) +Editor::get_selection_extents (framepos_t &start, framepos_t &end) const { start = max_framepos; end = 0; @@ -2727,7 +2783,7 @@ Editor::rename_region () return; } - ArdourDialog d (*this, _("Rename Region"), true, false); + ArdourDialog d (_("Rename Region"), true, false); Entry entry; Label label (_("New name:")); HBox hbox; @@ -3862,6 +3918,7 @@ Editor::freeze_route () gtk_main_iteration (); } + pthread_join (itt.thread, 0); current_interthread_info = 0; } @@ -4512,7 +4569,7 @@ Editor::cut_copy_regions (CutCopyOp op, RegionSelection& rs) list > foo; - /* the pmap is in the same order as the tracks in which selected regions occured */ + /* the pmap is in the same order as the tracks in which selected regions occurred */ for (vector::iterator i = pmap.begin(); i != pmap.end(); ++i) { if ((*i).pl) { @@ -4756,18 +4813,9 @@ Editor::duplicate_selection (float times) } boost::shared_ptr playlist; - vector > new_regions; - vector >::iterator ri; - - create_region_from_selection (new_regions); - - if (new_regions.empty()) { - return; - } - - ri = new_regions.begin(); TrackViewList ts = selection->tracks.filter_to_unique_playlists (); + bool in_command = false; for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { @@ -4775,27 +4823,34 @@ Editor::duplicate_selection (float times) continue; } playlist->clear_changes (); - framepos_t end; + if (clicked_selection) { - end = selection->time[clicked_selection].end; + playlist->duplicate_range (selection->time[clicked_selection], times); } else { - end = selection->time.end_frame(); + playlist->duplicate_ranges (selection->time, times); } - playlist->duplicate (*ri, end + 1, times); if (!in_command) { - begin_reversible_command (_("duplicate selection")); + begin_reversible_command (_("duplicate range selection")); in_command = true; } _session->add_command (new StatefulDiffCommand (playlist)); - ++ri; - if (ri == new_regions.end()) { - --ri; - } } if (in_command) { + // now "move" range selection to after the current range selection + framecnt_t distance = 0; + + if (clicked_selection) { + distance = selection->time[clicked_selection].end - + selection->time[clicked_selection].start; + } else { + distance = selection->time.end_frame() - selection->time.start(); + } + + selection->move_time (distance); + commit_reversible_command (); } } @@ -5107,12 +5162,13 @@ Editor::strip_region_silence () StripSilenceDialog d (_session, audio_only); int const r = d.run (); - d.drop_rects (); + d.drop_rects (); - if (r == Gtk::RESPONSE_OK) { - ARDOUR::AudioIntervalMap silences; - d.silences (silences); + if (r == Gtk::RESPONSE_OK) { + ARDOUR::AudioIntervalMap silences; + d.silences (silences); StripSilence s (*_session, silences, d.fade_length()); + apply_filter (s, _("strip silence"), &d); } } @@ -5387,6 +5443,11 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress playlist->clear_changes (); playlist->clear_owned_changes (); + if (!in_command) { + begin_reversible_command (command); + in_command = true; + } + if (filter.results.empty ()) { /* no regions returned; remove the old one */ @@ -5407,14 +5468,10 @@ Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress } } + /* We might have removed regions, which alters other regions' layering_index, so we need to do a recursive diff here. */ - - if (!in_command) { - begin_reversible_command (command); - in_command = true; - } vector cmds; playlist->rdiff (cmds); _session->add_commands (cmds); @@ -5642,11 +5699,11 @@ Editor::toggle_record_enable () continue; if (first) { - new_state = !rtav->track()->record_enabled(); + new_state = !rtav->track()->rec_enable_control()->get_value(); first = false; } - rtav->track()->set_record_enabled (new_state, this); + rtav->track()->rec_enable_control()->set_value (new_state, Controllable::UseGroup); } } @@ -5655,7 +5712,7 @@ Editor::toggle_solo () { bool new_state = false; bool first = true; - boost::shared_ptr rl (new RouteList); + boost::shared_ptr cl (new ControlList); for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) { RouteTimeAxisView *rtav = dynamic_cast(*i); @@ -5669,10 +5726,10 @@ Editor::toggle_solo () first = false; } - rl->push_back (rtav->route()); + cl->push_back (rtav->route()->solo_control()); } - _session->set_solo (rl, new_state, Session::rt_cleanup, true); + _session->set_controls (cl, new_state ? 1.0 : 0.0, Controllable::UseGroup); } void @@ -5697,7 +5754,7 @@ Editor::toggle_mute () rl->push_back (rtav->route()); } - _session->set_mute (rl, new_state, Session::rt_cleanup, true); + _session->set_controls (route_list_to_control_list (rl, &Route::mute_control), new_state, Controllable::UseGroup); } void @@ -6096,12 +6153,6 @@ Editor::split_region () } } -struct EditorOrderRouteSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key () < b->order_key (); - } -}; - void Editor::select_next_route() { @@ -6419,11 +6470,13 @@ Editor::define_one_bar (framepos_t start, framepos_t end) { framepos_t length = end - start; - const Meter& m (_session->tempo_map().meter_at (start)); + const Meter& m (_session->tempo_map().meter_at_frame (start)); /* length = 1 bar */ - /* now we want frames per beat. + /* We're going to deliver a constant tempo here, + so we can use frames per beat to determine length. + now we want frames per beat. we have frames per bar, and beats per bar, so ... */ @@ -6442,7 +6495,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end) */ - const TempoSection& t (_session->tempo_map().tempo_section_at (start)); + const TempoSection& t (_session->tempo_map().tempo_section_at_frame (start)); bool do_global = false; @@ -6493,9 +6546,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end) } else if (t.frame() == start) { _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type()); } else { - Timecode::BBT_Time bbt; - _session->tempo_map().bbt_time (start, bbt); - _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), bbt); + _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), 0.0, start, TempoSection::Constant, AudioTime); } XMLNode& after (_session->tempo_map().get_state()); @@ -6526,7 +6577,8 @@ Editor::split_region_at_transients () boost::shared_ptr ar = boost::dynamic_pointer_cast ((*i)->region()); - if (ar && (ar->get_transients (positions) == 0)) { + if (ar) { + ar->transients (positions); split_region_at_points ((*i)->region(), positions, true); positions.clear (); } @@ -6555,7 +6607,6 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList return; } - if (positions.size() > 20 && can_ferret) { std::string msgstr = string_compose (_("You are about to split\n%1\ninto %2 pieces.\nThis could take a long time."), r->name(), positions.size() + 1); MessageDialog msg (msgstr, @@ -6608,27 +6659,28 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList framepos_t pos = 0; + framepos_t rstart = r->first_frame (); + framepos_t rend = r->last_frame (); + while (x != positions.end()) { /* deal with positons that are out of scope of present region bounds */ - if (*x <= 0 || *x > r->length()) { + if (*x <= rstart || *x > rend) { ++x; continue; } - /* file start = original start + how far we from the initial position ? - */ + /* file start = original start + how far we from the initial position ? */ framepos_t file_start = r->start() + pos; - /* length = next position - current position - */ + /* length = next position - current position */ - framepos_t len = (*x) - pos; + framepos_t len = (*x) - pos - rstart; /* XXX we do we really want to allow even single-sample regions? - shouldn't we have some kind of lower limit on region size? - */ + * shouldn't we have some kind of lower limit on region size? + */ if (len <= 0) { break; @@ -6648,14 +6700,15 @@ Editor::split_region_at_points (boost::shared_ptr r, AnalysisFeatureList plist.add (ARDOUR::Properties::length, len); plist.add (ARDOUR::Properties::name, new_name); plist.add (ARDOUR::Properties::layer, 0); + // TODO set transients_offset boost::shared_ptr nr = RegionFactory::create (r->sources(), plist, false); /* because we set annouce to false, manually add the new region to the - RegionFactory map - */ + * RegionFactory map + */ RegionFactory::map_add (nr); - pl->add_region (nr, r->position() + pos); + pl->add_region (nr, rstart + pos); if (select_new) { new_regions.push_front(nr); @@ -6725,8 +6778,7 @@ Editor::place_transient() begin_reversible_command (_("place transient")); for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { - framepos_t position = (*r)->region()->position(); - (*r)->region()->add_transient(where - position); + (*r)->region()->add_transient(where); } commit_reversible_command (); @@ -7042,6 +7094,7 @@ Editor::remove_tracks () bool Editor::idle_remove_tracks () { + Session::StateProtector sp (_session); _remove_tracks (); return false; /* do not call again */ } @@ -7145,12 +7198,17 @@ edit your ardour.rc file to set the\n\ } { - Session::StateProtector sp (_session); DisplaySuspender ds; + boost::shared_ptr rl (new RouteList); for (vector >::iterator x = routes.begin(); x != routes.end(); ++x) { - _session->remove_route (*x); + rl->push_back (*x); } + _session->remove_routes (rl); } + /* TrackSelection and RouteList leave scope, + * destructors are called, + * diskstream drops references, save_state is called (again for every track) + */ } void @@ -7171,12 +7229,10 @@ Editor::do_insert_time () return; } - InsertTimeOption opt = d.intersected_region_action (); - insert_time ( - get_preferred_edit_position(), + get_preferred_edit_position (EDIT_IGNORE_MOUSE), d.distance(), - opt, + d.intersected_region_action (), d.all_playlists(), d.move_glued(), d.move_markers(), @@ -7374,7 +7430,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, pl->shift (pos, -frames, true, ignore_music_glue); if (!in_command) { - begin_reversible_command (_("cut time")); + begin_reversible_command (_("remove time")); in_command = true; } XMLNode &after = pl->get_state(); @@ -7386,7 +7442,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, RouteTimeAxisView* rtav = dynamic_cast (*x); if (rtav) { if (!in_command) { - begin_reversible_command (_("cut time")); + begin_reversible_command (_("remove time")); in_command = true; } rtav->route ()->shift (pos, -frames); @@ -7459,7 +7515,7 @@ Editor::remove_time (framepos_t pos, framecnt_t frames, InsertTimeOption opt, if (moved) { if (!in_command) { - begin_reversible_command (_("cut time")); + begin_reversible_command (_("remove time")); in_command = true; } XMLNode& after (_session->locations()->get_state()); @@ -7546,7 +7602,7 @@ Editor::fit_tracks (TrackViewList & tracks) double first_y_pos = DBL_MAX; if (h < TimeAxisView::preset_height (HeightSmall)) { - MessageDialog msg (*this, _("There are too many tracks to fit in the current window")); + MessageDialog msg (_("There are too many tracks to fit in the current window")); /* too small to be displayed */ return; }