X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_ops.cc;h=643780a490ea4abd3559d7e111b656f099810a67;hb=d26aac90204a87e00ea3b2cb622a7f5729bfbc4a;hp=a57977007c1481f33be05c49844177000e59a888;hpb=9010262bed21611f2db652d16f63e4af4380259d;p=ardour.git diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index a57977007c..643780a490 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" @@ -81,6 +82,7 @@ #include "item_counts.h" #include "keyboard.h" #include "midi_region_view.h" +#include "mixer_ui.h" #include "mixer_strip.h" #include "mouse_cursors.h" #include "normalize_dialog.h" @@ -101,7 +103,7 @@ #include "transform_dialog.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -118,6 +120,13 @@ using Gtkmm2ext::Keyboard; void Editor::undo (uint32_t n) { + if (_session && _session->actively_recording()) { + /* no undo allowed while recording. Session will check also, + but we don't even want to get to that. + */ + return; + } + if (_drags->active ()) { _drags->abort (); } @@ -135,12 +144,19 @@ Editor::undo (uint32_t n) void Editor::redo (uint32_t n) { + if (_session && _session->actively_recording()) { + /* no redo allowed while recording. Session will check also, + but we don't even want to get to that. + */ + return; + } + if (_drags->active ()) { _drags->abort (); } if (_session) { - _session->redo (n); + _session->redo (n); if (_session->redo_depth() == 0) { redo_action->set_sensitive(false); } @@ -150,7 +166,8 @@ Editor::redo (uint32_t n) } void -Editor::split_regions_at (framepos_t where, RegionSelection& regions) +Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int32_t sub_num, + bool snap_frame) { bool frozen = false; @@ -176,10 +193,14 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) case SnapToRegionEnd: break; default: - snap_to (where); + if (snap_frame) { + snap_to (where); + } } } else { - snap_to (where); + if (snap_frame) { + snap_to (where); + } frozen = true; EditorFreeze(); /* Emit Signal */ @@ -225,7 +246,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions) if (pl) { pl->clear_changes (); - pl->split_region ((*a)->region(), where); + pl->split_region ((*a)->region(), where, sub_num); _session->add_command (new StatefulDiffCommand (pl)); } @@ -432,6 +453,9 @@ Editor::nudge_forward (bool next, bool force_playhead) } else { loc->set_end (max_framepos); } + if (loc->is_session_range()) { + _session->set_end_is_free (false); + } } if (!in_command) { begin_reversible_command (_("nudge location forward")); @@ -523,6 +547,9 @@ Editor::nudge_backward (bool next, bool force_playhead) } else { loc->set_end (loc->length()); } + if (loc->is_session_range()) { + _session->set_end_is_free (false); + } } if (!in_command) { begin_reversible_command (_("nudge location forward")); @@ -1688,25 +1715,43 @@ Editor::tav_zoom_smooth (bool coarser, bool force_all) } void -Editor::temporal_zoom_step_mouse_focus (bool coarser) +Editor::temporal_zoom_step_mouse_focus_scale (bool zoom_out, double scale) { Editing::ZoomFocus temp_focus = zoom_focus; zoom_focus = Editing::ZoomFocusMouse; - temporal_zoom_step (coarser); + temporal_zoom_step_scale (zoom_out, scale); zoom_focus = temp_focus; } void -Editor::temporal_zoom_step (bool coarser) +Editor::temporal_zoom_step_mouse_focus (bool zoom_out) +{ + temporal_zoom_step_mouse_focus_scale (zoom_out, 2.0); +} + +void +Editor::temporal_zoom_step (bool zoom_out) +{ + temporal_zoom_step_scale (zoom_out, 2.0); +} + +void +Editor::temporal_zoom_step_scale (bool zoom_out, double scale) { - ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, coarser) + ENSURE_GUI_THREAD (*this, &Editor::temporal_zoom_step, zoom_out, scale) framecnt_t nspp = samples_per_pixel; - if (coarser) { - nspp *= 2; + if (zoom_out) { + nspp *= scale; + if (nspp == samples_per_pixel) { + nspp *= 2.0; + } } else { - nspp /= 2; + nspp /= scale; + if (nspp == samples_per_pixel) { + nspp /= 2.0; + } } temporal_zoom (nspp); @@ -1728,6 +1773,7 @@ Editor::temporal_zoom (framecnt_t fpp) framepos_t leftmost_after_zoom = 0; framepos_t where; bool in_track_canvas; + bool use_mouse_frame = true; framecnt_t nfpp; double l; @@ -1788,18 +1834,13 @@ Editor::temporal_zoom (framecnt_t fpp) case ZoomFocusMouse: /* try to keep the mouse over the same point in the display */ - if (!mouse_frame (where, in_track_canvas)) { - /* use playhead instead */ - where = playhead_cursor->current_frame (); - - if (where < half_page_size) { - leftmost_after_zoom = 0; - } else { - leftmost_after_zoom = where - half_page_size; - } - - } else { + if (_drags->active()) { + where = _drags->current_pointer_frame (); + } else if (!mouse_frame (where, in_track_canvas)) { + use_mouse_frame = false; + } + if (use_mouse_frame) { l = - ((new_page_size * ((where - current_leftmost)/(double)current_page)) - where); if (l < 0) { @@ -1809,8 +1850,16 @@ Editor::temporal_zoom (framecnt_t fpp) } else { leftmost_after_zoom = (framepos_t) l; } - } + } else { + /* use playhead instead */ + where = playhead_cursor->current_frame (); + if (where < half_page_size) { + leftmost_after_zoom = 0; + } else { + leftmost_after_zoom = where - half_page_size; + } + } break; case ZoomFocusEdit: @@ -1921,7 +1970,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; @@ -2232,6 +2281,18 @@ Editor::set_session_end_from_playhead () commit_reversible_command (); } + + _session->set_end_is_free (false); +} + + +void +Editor::toggle_location_at_playhead_cursor () +{ + if (!do_remove_location_at_playhead_cursor()) + { + add_location_from_playhead_cursor(); + } } void @@ -2240,13 +2301,13 @@ Editor::add_location_from_playhead_cursor () add_location_mark (_session->audible_frame()); } -void -Editor::remove_location_at_playhead_cursor () +bool +Editor::do_remove_location_at_playhead_cursor () { + bool removed = false; if (_session) { //set up for undo XMLNode &before = _session->locations()->get_state(); - bool removed = false; //find location(s) at this time Locations::LocationList locs; @@ -2266,6 +2327,13 @@ Editor::remove_location_at_playhead_cursor () commit_reversible_command (); } } + return removed; +} + +void +Editor::remove_location_at_playhead_cursor () +{ + do_remove_location_at_playhead_cursor (); } /** Add a range marker around each selected region */ @@ -2573,7 +2641,7 @@ Editor::play_from_edit_point_and_return () void Editor::play_selection () { - framepos_t start, end; + framepos_t start, end; if (!get_selection_extents ( start, end)) return; @@ -2782,7 +2850,7 @@ Editor::rename_region () return; } - ArdourDialog d (*current_toplevel(), _("Rename Region"), true, false); + ArdourDialog d (_("Rename Region"), true, false); Entry entry; Label label (_("New name:")); HBox hbox; @@ -3042,62 +3110,63 @@ Editor::separate_regions_between (const TimeSelection& ts) for (TrackSelection::iterator i = tmptracks.begin(); i != tmptracks.end(); ++i) { - RouteTimeAxisView* rtv; + RouteTimeAxisView* rtv = dynamic_cast ((*i)); - if ((rtv = dynamic_cast ((*i))) != 0) { - - if (rtv->is_track()) { + if (!rtv) { + continue; + } - /* no edits to destructive tracks */ + if (!rtv->is_track()) { + continue; + } - if (rtv->track()->destructive()) { - continue; - } + /* no edits to destructive tracks */ - if ((playlist = rtv->playlist()) != 0) { + if (rtv->track()->destructive()) { + continue; + } - playlist->clear_changes (); + if ((playlist = rtv->playlist()) != 0) { - /* XXX need to consider musical time selections here at some point */ + playlist->clear_changes (); - double speed = rtv->track()->speed(); + /* XXX need to consider musical time selections here at some point */ + double speed = rtv->track()->speed(); - for (list::const_iterator t = ts.begin(); t != ts.end(); ++t) { + for (list::const_iterator t = ts.begin(); t != ts.end(); ++t) { - sigc::connection c = rtv->view()->RegionViewAdded.connect ( - sigc::mem_fun(*this, &Editor::collect_new_region_view)); + sigc::connection c = rtv->view()->RegionViewAdded.connect ( + sigc::mem_fun(*this, &Editor::collect_new_region_view)); - latest_regionviews.clear (); + latest_regionviews.clear (); - playlist->partition ((framepos_t)((*t).start * speed), - (framepos_t)((*t).end * speed), false); + playlist->partition ((framepos_t)((*t).start * speed), + (framepos_t)((*t).end * speed), false); - c.disconnect (); + c.disconnect (); - if (!latest_regionviews.empty()) { + if (!latest_regionviews.empty()) { - rtv->view()->foreach_regionview (sigc::bind ( - sigc::ptr_fun (add_if_covered), - &(*t), &new_selection)); + rtv->view()->foreach_regionview (sigc::bind ( + sigc::ptr_fun (add_if_covered), + &(*t), &new_selection)); - if (!in_command) { - begin_reversible_command (_("separate")); - in_command = true; - } + if (!in_command) { + begin_reversible_command (_("separate")); + in_command = true; + } - /* pick up changes to existing regions */ + /* pick up changes to existing regions */ - vector cmds; - playlist->rdiff (cmds); - _session->add_commands (cmds); + vector cmds; + playlist->rdiff (cmds); + _session->add_commands (cmds); - /* pick up changes to the playlist itself (adds/removes) - */ + /* pick up changes to the playlist itself (adds/removes) + */ - _session->add_command(new StatefulDiffCommand (playlist)); - } - } + _session->add_command(new StatefulDiffCommand (playlist)); } } } @@ -3217,7 +3286,7 @@ Editor::separate_under_selected_regions () if (!playlist) { // is this check necessary? - continue; + continue; } vector::iterator i; @@ -3292,17 +3361,18 @@ Editor::crop_region_to (framepos_t start, framepos_t end) for (TrackSelection::iterator i = ts.begin(); i != ts.end(); ++i) { - RouteTimeAxisView* rtv; + RouteTimeAxisView* rtv = dynamic_cast ((*i)); - if ((rtv = dynamic_cast ((*i))) != 0) { + if (!rtv) { + continue; + } - boost::shared_ptr t = rtv->track(); + boost::shared_ptr t = rtv->track(); - if (t != 0 && ! t->destructive()) { + if (t != 0 && ! t->destructive()) { - if ((playlist = rtv->playlist()) != 0) { - playlists.push_back (playlist); - } + if ((playlist = rtv->playlist()) != 0) { + playlists.push_back (playlist); } } } @@ -3391,7 +3461,7 @@ Editor::region_fill_track () sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)); framepos_t const position = end_frame + (r->first_frame() - start_frame + 1); - playlist = (*i)->region()->playlist(); + playlist = (*i)->region()->playlist(); playlist->clear_changes (); playlist->duplicate_until (r, position, gap, end); _session->add_command(new StatefulDiffCommand (playlist)); @@ -3917,6 +3987,7 @@ Editor::freeze_route () gtk_main_iteration (); } + pthread_join (itt.thread, 0); current_interthread_info = 0; } @@ -3955,9 +4026,9 @@ Editor::bounce_range_selection (bool replace, bool enable_processing) for (TrackViewList::iterator i = views.begin(); i != views.end(); ++i) { - RouteTimeAxisView* rtv; + RouteTimeAxisView* rtv = dynamic_cast (*i); - if ((rtv = dynamic_cast (*i)) == 0) { + if (!rtv) { continue; } @@ -4166,6 +4237,7 @@ Editor::cut_copy (CutCopyOp op) } } + struct AutomationRecord { AutomationRecord () : state (0) , line(NULL) {} AutomationRecord (XMLNode* s, const AutomationLine* l) : state (s) , line (l) {} @@ -4174,7 +4246,11 @@ struct AutomationRecord { const AutomationLine* line; ///< line this came from boost::shared_ptr copy; ///< copied events for the cut buffer }; - +struct PointsSelectionPositionSorter { + bool operator() (ControlPoint* a, ControlPoint* b) { + return (*(a->model()))->when < (*(b->model()))->when; + } +}; /** Cut, copy or clear selected automation points. * @param op Operation (Cut, Copy or Clear) */ @@ -4192,9 +4268,12 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid typedef std::map, AutomationRecord> Lists; Lists lists; + /* user could select points in any order */ + selection->points.sort(PointsSelectionPositionSorter ()); + /* Go through all selected points, making an AutomationRecord for each distinct AutomationList */ - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - const AutomationLine& line = (*i)->line(); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + const AutomationLine& line = (*sel_point)->line(); const boost::shared_ptr al = line.the_list(); if (lists.find (al) == lists.end ()) { /* We haven't seen this list yet, so make a record for it. This includes @@ -4214,17 +4293,17 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid /* Add all selected points to the relevant copy ControlLists */ framepos_t start = std::numeric_limits::max(); - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - boost::shared_ptr al = (*i)->line().the_list(); - AutomationList::const_iterator j = (*i)->model(); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + boost::shared_ptr al = (*sel_point)->line().the_list(); + AutomationList::const_iterator ctrl_evt = (*sel_point)->model (); - lists[al].copy->fast_simple_add ((*j)->when, (*j)->value); + lists[al].copy->fast_simple_add ((*ctrl_evt)->when, (*ctrl_evt)->value); if (midi) { /* Update earliest MIDI start time in beats */ - earliest = std::min(earliest, Evoral::Beats((*j)->when)); + earliest = std::min(earliest, Evoral::Beats((*ctrl_evt)->when)); } else { /* Update earliest session start time in frames */ - start = std::min(start, (*i)->line().session_position(j)); + start = std::min(start, (*sel_point)->line().session_position(ctrl_evt)); } } @@ -4247,12 +4326,13 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid start time, so relative ordering between points is preserved when copying from several lists and the paste starts at the earliest copied piece of data. */ - for (AutomationList::iterator j = i->second.copy->begin(); j != i->second.copy->end(); ++j) { - (*j)->when -= line_offset; + boost::shared_ptr &al_cpy = i->second.copy; + for (AutomationList::iterator ctrl_evt = al_cpy->begin(); ctrl_evt != al_cpy->end(); ++ctrl_evt) { + (*ctrl_evt)->when -= line_offset; } /* And add it to the cut buffer */ - cut_buffer->add (i->second.copy); + cut_buffer->add (al_cpy); } } @@ -4264,9 +4344,22 @@ Editor::cut_copy_points (Editing::CutCopyOp op, Evoral::Beats earliest, bool mid } /* Remove each selected point from its AutomationList */ - for (PointSelection::iterator i = selection->points.begin(); i != selection->points.end(); ++i) { - boost::shared_ptr al = (*i)->line().the_list(); - al->erase ((*i)->model ()); + for (PointSelection::iterator sel_point = selection->points.begin(); sel_point != selection->points.end(); ++sel_point) { + AutomationLine& line = (*sel_point)->line (); + boost::shared_ptr al = line.the_list(); + + bool erase = true; + + if (dynamic_cast (&line)) { + /* removing of first and last gain point in region gain lines is prohibited*/ + if (line.is_last_point (*(*sel_point)) || line.is_first_point (*(*sel_point))) { + erase = false; + } + } + + if(erase) { + al->erase ((*sel_point)->model ()); + } } /* Thaw the lists and add undo records for them */ @@ -4382,7 +4475,7 @@ Editor::remove_selected_regions () if (!playlist) { // is this check necessary? - continue; + continue; } /* get_regions_from_selection_and_entered() guarantees that @@ -4631,7 +4724,7 @@ Editor::paste (float times, bool from_context) { DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); - paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times); + paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times, get_grid_music_divisions (0)); } void @@ -4645,11 +4738,11 @@ Editor::mouse_paste () } snap_to (where); - paste_internal (where, 1); + paste_internal (where, 1, get_grid_music_divisions (0)); } void -Editor::paste_internal (framepos_t position, float times) +Editor::paste_internal (framepos_t position, float times, const int32_t sub_num) { DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("apparent paste position is %1\n", position)); @@ -4742,7 +4835,7 @@ Editor::paste_internal (framepos_t position, float times) "greedy" paste from one automation type to another. */ PasteContext ctx(paste_count, times, ItemCounts(), true); - ts.front()->paste (position, *cut_buffer, ctx); + ts.front()->paste (position, *cut_buffer, ctx, sub_num); } else { @@ -4750,13 +4843,20 @@ Editor::paste_internal (framepos_t position, float times) PasteContext ctx(paste_count, times, ItemCounts(), false); for (TrackViewList::iterator i = ts.begin(); i != ts.end(); ++i) { - (*i)->paste (position, *cut_buffer, ctx); + (*i)->paste (position, *cut_buffer, ctx, sub_num); } } commit_reversible_command (); } +void +Editor::duplicate_regions (float times) +{ + RegionSelection rs (get_regions_from_selection_and_entered()); + duplicate_some_regions (rs, times); +} + void Editor::duplicate_some_regions (RegionSelection& regions, float times) { @@ -4786,7 +4886,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times) sigc::connection c = rtv->view()->RegionViewAdded.connect (sigc::mem_fun(*this, &Editor::collect_new_region_view)); framepos_t const position = end_frame + (r->first_frame() - start_frame + 1); - playlist = (*i)->region()->playlist(); + playlist = (*i)->region()->playlist(); playlist->clear_changes (); playlist->duplicate (r, position, gap, times); _session->add_command(new StatefulDiffCommand (playlist)); @@ -4984,7 +5084,7 @@ Editor::normalize_region () NormalizeDialog dialog (rs.size() > 1); - if (dialog.run () == RESPONSE_CANCEL) { + if (dialog.run () != RESPONSE_ACCEPT) { return; } @@ -4998,25 +5098,36 @@ Editor::normalize_region () obtain the maximum amplitude of them all. */ list max_amps; + list rms_vals; double max_amp = 0; + double max_rms = 0; + bool use_rms = dialog.constrain_rms (); + for (RegionSelection::const_iterator i = rs.begin(); i != rs.end(); ++i) { AudioRegionView const * arv = dynamic_cast (*i); - if (arv) { - dialog.descend (1.0 / regions); - double const a = arv->audio_region()->maximum_amplitude (&dialog); - - if (a == -1) { - /* the user cancelled the operation */ - return; - } + if (!arv) { + continue; + } + dialog.descend (1.0 / regions); + double const a = arv->audio_region()->maximum_amplitude (&dialog); + if (use_rms) { + double r = arv->audio_region()->rms (&dialog); + max_rms = max (max_rms, r); + rms_vals.push_back (r); + } - max_amps.push_back (a); - max_amp = max (max_amp, a); - dialog.ascend (); + if (a == -1) { + /* the user cancelled the operation */ + return; } + + max_amps.push_back (a); + max_amp = max (max_amp, a); + dialog.ascend (); } list::const_iterator a = max_amps.begin (); + list::const_iterator l = rms_vals.begin (); bool in_command = false; for (RegionSelection::iterator r = rs.begin(); r != rs.end(); ++r) { @@ -5027,9 +5138,21 @@ Editor::normalize_region () arv->region()->clear_changes (); - double const amp = dialog.normalize_individually() ? *a : max_amp; + double amp = dialog.normalize_individually() ? *a : max_amp; + double target = dialog.target_peak (); // dB + + if (use_rms) { + double const amp_rms = dialog.normalize_individually() ? *l : max_rms; + const double t_rms = dialog.target_rms (); + const gain_t c_peak = dB_to_coefficient (target); + const gain_t c_rms = dB_to_coefficient (t_rms); + if ((amp_rms / c_rms) > (amp / c_peak)) { + amp = amp_rms; + target = t_rms; + } + } - arv->audio_region()->normalize (amp, dialog.target ()); + arv->audio_region()->normalize (amp, target); if (!in_command) { begin_reversible_command (_("normalize")); @@ -5038,6 +5161,7 @@ Editor::normalize_region () _session->add_command (new StatefulDiffCommand (arv->region())); ++a; + ++l; } if (in_command) { @@ -5160,12 +5284,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); } } @@ -5179,8 +5304,7 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv vector::Notes> v; v.push_back (selected); - framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start(); - Evoral::Beats pos_beats = _session->tempo_map().framewalk_to_beats(0, pos_frames); + Evoral::Beats pos_beats = Evoral::Beats (mrv.midi_region()->beat()) - mrv.midi_region()->start_beats(); return op (mrv.midi_region()->model(), pos_beats, v); } @@ -5285,6 +5409,11 @@ Editor::quantize_regions (const RegionSelection& rs) quantize_dialog = new QuantizeDialog (*this); } + if (quantize_dialog->is_mapped()) { + /* in progress already */ + return; + } + quantize_dialog->present (); const int r = quantize_dialog->run (); quantize_dialog->hide (); @@ -5440,6 +5569,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 */ @@ -5460,14 +5594,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); @@ -5695,11 +5825,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, Controllable::UseGroup); + rtav->track()->rec_enable_control()->set_value (new_state, Controllable::UseGroup); } } @@ -5708,7 +5838,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); @@ -5722,10 +5852,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, Controllable::UseGroup); + _session->set_controls (cl, new_state ? 1.0 : 0.0, Controllable::UseGroup); } void @@ -5750,7 +5880,7 @@ Editor::toggle_mute () rl->push_back (rtav->route()); } - _session->set_mute (rl, new_state, Session::rt_cleanup, Controllable::UseGroup); + _session->set_controls (route_list_to_control_list (rl, &Stripable::mute_control), new_state, Controllable::UseGroup); } void @@ -6145,16 +6275,14 @@ Editor::split_region () return; } - split_regions_at (where, rs); + if (snap_musical()) { + split_regions_at (where, rs, get_grid_music_divisions (0)); + } else { + split_regions_at (where, rs, 0); + } } } -struct EditorOrderRouteSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key () < b->order_key (); - } -}; - void Editor::select_next_route() { @@ -6168,6 +6296,7 @@ Editor::select_next_route() RouteUI *rui; do { for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { + if (*i == current) { ++i; if (i != track_views.end()) { @@ -6179,10 +6308,12 @@ Editor::select_next_route() break; } } + rui = dynamic_cast(current); - } while ( current->hidden() || (rui != NULL && !rui->route()->active())); - selection->set(current); + } while (current->hidden() || (rui == NULL) || !rui->route()->active()); + + selection->set (current); ensure_time_axis_view_is_visible (*current, false); } @@ -6200,6 +6331,7 @@ Editor::select_prev_route() RouteUI *rui; do { for (TrackViewList::reverse_iterator i = track_views.rbegin(); i != track_views.rend(); ++i) { + if (*i == current) { ++i; if (i != track_views.rend()) { @@ -6211,7 +6343,8 @@ Editor::select_prev_route() } } rui = dynamic_cast(current); - } while ( current->hidden() || (rui != NULL && !rui->route()->active())); + + } while (current->hidden() || (rui == NULL) || !rui->route()->active()); selection->set (current); @@ -6265,6 +6398,59 @@ Editor::set_punch_from_selection () set_punch_range (start, end, _("set punch range from selection")); } +void +Editor::set_auto_punch_range () +{ + // auto punch in/out button from a single button + // If Punch In is unset, set punch range from playhead to end, enable punch in + // If Punch In is set, the next punch sets Punch Out, unless the playhead has been + // rewound beyond the Punch In marker, in which case that marker will be moved back + // to the current playhead position. + // If punch out is set, it clears the punch range and Punch In/Out buttons + + if (_session == 0) { + return; + } + + Location* tpl = transport_punch_location(); + framepos_t now = playhead_cursor->current_frame(); + framepos_t begin = now; + framepos_t end = _session->current_end_frame(); + + if (!_session->config.get_punch_in()) { + // First Press - set punch in and create range from here to eternity + set_punch_range (begin, end, _("Auto Punch In")); + _session->config.set_punch_in(true); + } else if (tpl && !_session->config.get_punch_out()) { + // Second press - update end range marker and set punch_out + if (now < tpl->start()) { + // playhead has been rewound - move start back and pretend nothing happened + begin = now; + set_punch_range (begin, end, _("Auto Punch In/Out")); + } else { + // normal case for 2nd press - set the punch out + end = playhead_cursor->current_frame (); + set_punch_range (tpl->start(), now, _("Auto Punch In/Out")); + _session->config.set_punch_out(true); + } + } else { + if (_session->config.get_punch_out()) { + _session->config.set_punch_out(false); + } + + if (_session->config.get_punch_in()) { + _session->config.set_punch_in(false); + } + + if (tpl) + { + // third press - unset punch in/out and remove range + _session->locations()->remove(tpl); + } + } + +} + void Editor::set_session_extents_from_selection () { @@ -6278,11 +6464,11 @@ Editor::set_session_extents_from_selection () Location* loc; if ((loc = _session->locations()->session_range_location()) == 0) { - _session->set_session_extents ( start, end ); // this will create a new session range; no need for UNDO + _session->set_session_extents (start, end); // this will create a new session range; no need for UNDO } else { XMLNode &before = loc->get_state(); - _session->set_session_extents ( start, end ); + _session->set_session_extents (start, end); XMLNode &after = loc->get_state(); @@ -6292,6 +6478,8 @@ Editor::set_session_extents_from_selection () commit_reversible_command (); } + + _session->set_end_is_free (false); } void @@ -6472,11 +6660,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 ... */ @@ -6495,7 +6685,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; @@ -6546,9 +6736,8 @@ 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); + const Tempo tempo (beats_per_minute, t.note_type()); + _session->tempo_map().add_tempo (tempo, 0.0, start, TempoSection::Constant, AudioTime); } XMLNode& after (_session->tempo_map().get_state()); @@ -6579,7 +6768,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 (); } @@ -6608,7 +6798,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, @@ -6661,27 +6850,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; @@ -6701,14 +6891,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); @@ -6778,8 +6969,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 (); @@ -7095,6 +7285,7 @@ Editor::remove_tracks () bool Editor::idle_remove_tracks () { + Session::StateProtector sp (_session); _remove_tracks (); return false; /* do not call again */ } @@ -7197,13 +7388,24 @@ edit your ardour.rc file to set the\n\ return; } + + Mixer_UI::instance()->selection().block_routes_changed (true); + selection->block_tracks_changed (true); { - 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) + */ + selection->block_tracks_changed (false); + Mixer_UI::instance()->selection().block_routes_changed (false); + selection->TracksChanged (); /* EMIT SIGNAL */ } void @@ -7225,7 +7427,7 @@ Editor::do_insert_time () } insert_time ( - get_preferred_edit_position (EDIT_IGNORE_MOUSE), + d.position(), d.distance(), d.intersected_region_action (), d.all_playlists(), @@ -7282,7 +7484,8 @@ Editor::insert_time ( (*i)->clear_owned_changes (); if (opt == SplitIntersected) { - (*i)->split (pos); + /* non musical split */ + (*i)->split (pos, 0); } (*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue); @@ -7373,7 +7576,6 @@ Editor::do_remove_time () return; } - framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE); InsertRemoveTimeDialog d (*this, true); int response = d.run (); @@ -7389,7 +7591,7 @@ Editor::do_remove_time () } remove_time ( - pos, + d.position(), distance, SplitIntersected, d.move_glued(), @@ -7597,7 +7799,7 @@ Editor::fit_tracks (TrackViewList & tracks) double first_y_pos = DBL_MAX; if (h < TimeAxisView::preset_height (HeightSmall)) { - MessageDialog msg (*current_toplevel(), _("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; } @@ -7832,6 +8034,8 @@ Editor::toggle_midi_input_active (bool flip_others) _session->set_exclusive_input_active (rl, onoff, flip_others); } +static bool ok_fine (GdkEventAny*) { return true; } + void Editor::lock () { @@ -7840,6 +8044,7 @@ Editor::lock () Gtk::Image* padlock = manage (new Gtk::Image (ARDOUR_UI_UTILS::get_icon ("padlock_closed"))); lock_dialog->get_vbox()->pack_start (*padlock); + lock_dialog->signal_delete_event ().connect (sigc::ptr_fun (ok_fine)); ArdourButton* b = manage (new ArdourButton); b->set_name ("lock button"); @@ -7855,6 +8060,8 @@ Editor::lock () _main_menu_disabler = new MainMenuDisabler; lock_dialog->present (); + + lock_dialog->get_window()->set_decorations (Gdk::WMDecoration (0)); } void @@ -7881,7 +8088,7 @@ Editor::update_bring_in_message (Gtk::Label* label, uint32_t n, uint32_t total, { Timers::TimerSuspender t; label->set_text (string_compose ("Copying %1, %2 of %3", name, n, total)); - Gtkmm2ext::UI::instance()->flush_pending (); + Gtkmm2ext::UI::instance()->flush_pending (1); } void @@ -7901,7 +8108,7 @@ Editor::bring_all_sources_into_session () */ Timers::TimerSuspender t; - Gtkmm2ext::UI::instance()->flush_pending (); + Gtkmm2ext::UI::instance()->flush_pending (3); cerr << " Do it\n";