smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 00:04:56 +01:00
Code Issues Projects Releases Wiki Activity

Clean up get_regions_for_action prototype slightly.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7909 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-10-20 00:19:09 +00:00
parent ec52182f30
commit 7d2c21fddb
4 changed files with 70 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gtk2_ardour/editor.cc
View file

@ -3531,8 +3531,7 @@ Editor::duplicate_dialog (bool with_dialog)
} }
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (mouse_mode != MouseRange) { if (mouse_mode != MouseRange) {
@ -4946,28 +4945,28 @@ Editor::get_regions_after (RegionSelection& rs, framepos_t where, const TrackVie
* *
* @param rs Returned region list. * @param rs Returned region list.
*/ */
void
Editor::get_regions_for_action (RegionSelection& rs, bool check_edit_point) RegionSelection
Editor::get_regions_for_action (bool check_edit_point)
{ {
if (!check_edit_point) { if (!check_edit_point) {
rs = selection->regions; return selection->regions;
return;
} }
if (_edit_point == EditAtMouse) { if (_edit_point == EditAtMouse) {
if (entered_regionview == 0 || selection->regions.contains (entered_regionview)) { if (entered_regionview == 0 || selection->regions.contains (entered_regionview)) {
rs = selection->regions; return selection->regions;
return;
} else { } else {
RegionSelection rs;
rs.add (entered_regionview); rs.add (entered_regionview);
return; return rs;
} }
} }
/* We're using the edit point, but its not EditAtMouse */ /* We're using the edit point, but its not EditAtMouse */
/* Start with selected regions */ /* Start with selected regions */
rs = selection->regions; RegionSelection rs = selection->regions;
TrackViewList tracks = selection->tracks; TrackViewList tracks = selection->tracks;
@ -4989,6 +4988,8 @@ Editor::get_regions_for_action (RegionSelection& rs, bool check_edit_point)
framepos_t const where = get_preferred_edit_position (); framepos_t const where = get_preferred_edit_position ();
get_regions_at (rs, where, tracks); get_regions_at (rs, where, tracks);
} }
return rs;
} }
void void

2
gtk2_ardour/editor.h
View file

@ -1993,7 +1993,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void get_regions_at (RegionSelection&, framepos_t where, const TrackViewList& ts) const; void get_regions_at (RegionSelection&, framepos_t where, const TrackViewList& ts) const;
void get_regions_after (RegionSelection&, framepos_t where, const TrackViewList& ts) const; void get_regions_after (RegionSelection&, framepos_t where, const TrackViewList& ts) const;
void get_regions_for_action (RegionSelection&, bool check_edit_point = true); RegionSelection get_regions_for_action (bool check_edit_point = true);
void start_updating_meters (); void start_updating_meters ();
void stop_updating_meters (); void stop_updating_meters ();

209
gtk2_ardour/editor_ops.cc
View file

@ -305,9 +305,8 @@ Editor::nudge_forward (bool next, bool force_playhead)
{ {
framepos_t distance; framepos_t distance;
framepos_t next_distance; framepos_t next_distance;
RegionSelection rs;
get_regions_for_action (rs); RegionSelection rs = get_regions_for_action ();
if (!_session) return; if (!_session) return;
@ -385,9 +384,7 @@ Editor::nudge_backward (bool next, bool force_playhead)
{ {
framepos_t distance; framepos_t distance;
framepos_t next_distance; framepos_t next_distance;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (!_session) return; if (!_session) return;
@ -477,9 +474,7 @@ void
Editor::nudge_forward_capture_offset () Editor::nudge_forward_capture_offset ()
{ {
framepos_t distance; framepos_t distance;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (!_session) return; if (!_session) return;
@ -506,11 +501,11 @@ void
Editor::nudge_backward_capture_offset () Editor::nudge_backward_capture_offset ()
{ {
framepos_t distance; framepos_t distance;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs); if (!_session) {
return;
if (!_session) return; }
if (!rs.empty()) { if (!rs.empty()) {
@ -913,9 +908,7 @@ void
Editor::cursor_to_selection_start (EditorCursor *cursor) Editor::cursor_to_selection_start (EditorCursor *cursor)
{ {
framepos_t pos = 0; framepos_t pos = 0;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
switch (mouse_mode) { switch (mouse_mode) {
case MouseObject: case MouseObject:
@ -945,9 +938,7 @@ void
Editor::cursor_to_selection_end (EditorCursor *cursor) Editor::cursor_to_selection_end (EditorCursor *cursor)
{ {
framepos_t pos = 0; framepos_t pos = 0;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
switch (mouse_mode) { switch (mouse_mode) {
case MouseObject: case MouseObject:
@ -1117,9 +1108,7 @@ Editor::selected_marker_to_selection_start ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
switch (mouse_mode) { switch (mouse_mode) {
case MouseObject: case MouseObject:
@ -1156,9 +1145,7 @@ Editor::selected_marker_to_selection_end ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
switch (mouse_mode) { switch (mouse_mode) {
case MouseObject: case MouseObject:
@ -1653,10 +1640,9 @@ Editor::temporal_zoom_region (bool both_axes)
{ {
framepos_t start = max_framepos; framepos_t start = max_framepos;
framepos_t end = 0; framepos_t end = 0;
RegionSelection rs;
set<TimeAxisView*> tracks; set<TimeAxisView*> tracks;
get_regions_for_action (rs); RegionSelection rs = get_regions_for_action ();
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -1934,9 +1920,7 @@ Editor::add_location_from_playhead_cursor ()
void void
Editor::add_locations_from_audio_region () Editor::add_locations_from_audio_region ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -1962,9 +1946,7 @@ Editor::add_locations_from_audio_region ()
void void
Editor::add_location_from_audio_region () Editor::add_location_from_audio_region ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -2393,9 +2375,7 @@ Editor::play_selection ()
void void
Editor::loop_selected_region () Editor::loop_selected_region ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (!rs.empty()) { if (!rs.empty()) {
RegionView *rv = *(rs.begin()); RegionView *rv = *(rs.begin());
@ -2483,9 +2463,7 @@ Editor::show_midi_list_editor ()
void void
Editor::rename_region() Editor::rename_region()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -2567,9 +2545,7 @@ Editor::play_selected_region ()
{ {
framepos_t start = max_framepos; framepos_t start = max_framepos;
framepos_t end = 0; framepos_t end = 0;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -2681,9 +2657,7 @@ Editor::create_region_from_selection (vector<boost::shared_ptr<Region> >& new_re
void void
Editor::split_multichannel_region () Editor::split_multichannel_region ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -2907,8 +2881,7 @@ Editor::separate_regions_using_location (Location& loc)
void void
Editor::separate_under_selected_regions () Editor::separate_under_selected_regions ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
vector<PlaylistState> playlists; vector<PlaylistState> playlists;
@ -3077,9 +3050,7 @@ void
Editor::region_fill_track () Editor::region_fill_track ()
{ {
framepos_t end; framepos_t end;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (!_session || rs.empty()) { if (!_session || rs.empty()) {
return; return;
@ -3161,8 +3132,7 @@ void
Editor::set_region_sync_from_edit_point () Editor::set_region_sync_from_edit_point ()
{ {
framepos_t where = get_preferred_edit_position (); framepos_t where = get_preferred_edit_position ();
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
set_sync_point (where, rs); set_sync_point (where, rs);
} }
@ -3198,9 +3168,7 @@ Editor::set_sync_point (framepos_t where, const RegionSelection& rs)
void void
Editor::remove_region_sync () Editor::remove_region_sync ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -3219,9 +3187,7 @@ Editor::remove_region_sync ()
void void
Editor::naturalize () Editor::naturalize ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -3239,9 +3205,7 @@ Editor::naturalize ()
void void
Editor::align (RegionPoint what) Editor::align (RegionPoint what)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
framepos_t where = get_preferred_edit_position(); framepos_t where = get_preferred_edit_position();
if (!rs.empty()) { if (!rs.empty()) {
@ -3258,9 +3222,7 @@ void
Editor::align_relative (RegionPoint what) Editor::align_relative (RegionPoint what)
{ {
framepos_t where = get_preferred_edit_position(); framepos_t where = get_preferred_edit_position();
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (!rs.empty()) { if (!rs.empty()) {
align_selection_relative (what, where, rs); align_selection_relative (what, where, rs);
@ -3421,9 +3383,7 @@ void
Editor::trim_region (bool front) Editor::trim_region (bool front)
{ {
framepos_t where = get_preferred_edit_position(); framepos_t where = get_preferred_edit_position();
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -3472,9 +3432,7 @@ Editor::trim_region_to_punch ()
void void
Editor::trim_region_to_location (const Location& loc, const char* str) Editor::trim_region_to_location (const Location& loc, const char* str)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
begin_reversible_command (str); begin_reversible_command (str);
@ -3516,9 +3474,7 @@ Editor::trim_region_to_location (const Location& loc, const char* str)
void void
Editor::trim_region_to_edit_point () Editor::trim_region_to_edit_point ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
framepos_t where = get_preferred_edit_position(); framepos_t where = get_preferred_edit_position();
@ -3554,9 +3510,7 @@ Editor::trim_region_to_edit_point ()
void void
Editor::trim_region_from_edit_point () Editor::trim_region_from_edit_point ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
framepos_t where = get_preferred_edit_position(); framepos_t where = get_preferred_edit_position();
@ -3604,9 +3558,7 @@ Editor::trim_region_to_next_region_start ()
void void
Editor::trim_to_region(bool forward) Editor::trim_to_region(bool forward)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
begin_reversible_command (_("trim to region")); begin_reversible_command (_("trim to region"));
@ -3881,7 +3833,7 @@ Editor::cut_copy (CutCopyOp op)
/* we only want to cut regions if some are selected */ /* we only want to cut regions if some are selected */
if (!selection->regions.empty()) { if (!selection->regions.empty()) {
get_regions_for_action (rs, false); rs = get_regions_for_action (false);
} }
switch (current_mouse_mode()) { switch (current_mouse_mode()) {
@ -4009,8 +3961,7 @@ Editor::remove_clicked_region ()
void void
Editor::remove_selected_regions () Editor::remove_selected_regions ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (!_session) { if (!_session) {
return; return;
@ -4540,8 +4491,7 @@ Editor::normalize_region ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -4626,9 +4576,7 @@ Editor::reset_region_scale_amplitude ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -4655,9 +4603,7 @@ Editor::adjust_region_scale_amplitude (bool up)
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -4719,8 +4665,7 @@ Editor::strip_region_silence ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -4759,10 +4704,9 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv
void void
Editor::apply_midi_note_edit_op (MidiOperator& op) Editor::apply_midi_note_edit_op (MidiOperator& op)
{ {
RegionSelection rs;
Command* cmd; Command* cmd;
get_regions_for_action (rs); RegionSelection rs = get_regions_for_action ();
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -4794,9 +4738,7 @@ Editor::apply_midi_note_edit_op (MidiOperator& op)
void void
Editor::fork_region () Editor::fork_region ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -4857,9 +4799,7 @@ Editor::quantize_region ()
void void
Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress) Editor::apply_filter (Filter& filter, string command, ProgressReporter* progress)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -4970,9 +4910,7 @@ void
Editor::brush (framepos_t pos) Editor::brush (framepos_t pos)
{ {
RegionSelection sel; RegionSelection sel;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
snap_to (pos); snap_to (pos);
@ -5163,9 +5101,7 @@ Editor::toggle_record_enable ()
void void
Editor::set_fade_length (bool in) Editor::set_fade_length (bool in)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs, true);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5236,9 +5172,7 @@ Editor::set_fade_length (bool in)
void void
Editor::toggle_fade_active (bool in) Editor::toggle_fade_active (bool in)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5287,9 +5221,7 @@ Editor::toggle_fade_active (bool in)
void void
Editor::set_fade_in_shape (FadeShape shape) Editor::set_fade_in_shape (FadeShape shape)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5320,9 +5252,7 @@ Editor::set_fade_in_shape (FadeShape shape)
void void
Editor::set_fade_out_shape (FadeShape shape) Editor::set_fade_out_shape (FadeShape shape)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5352,9 +5282,7 @@ Editor::set_fade_out_shape (FadeShape shape)
void void
Editor::set_fade_in_active (bool yn) Editor::set_fade_in_active (bool yn)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5383,9 +5311,7 @@ Editor::set_fade_in_active (bool yn)
void void
Editor::set_fade_out_active (bool yn) Editor::set_fade_out_active (bool yn)
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5413,12 +5339,11 @@ Editor::set_fade_out_active (bool yn)
void void
Editor::toggle_selected_region_fades (int dir) Editor::toggle_selected_region_fades (int dir)
{ {
RegionSelection rs;
RegionSelection::iterator i; RegionSelection::iterator i;
boost::shared_ptr<AudioRegion> ar; boost::shared_ptr<AudioRegion> ar;
bool yn; bool yn;
get_regions_for_action (rs); RegionSelection rs = get_regions_for_action ();
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5550,9 +5475,7 @@ Editor::split ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs, true);
framepos_t where = get_preferred_edit_position(); framepos_t where = get_preferred_edit_position();
@ -5727,9 +5650,7 @@ Editor::set_loop_from_region (bool play)
framepos_t start = max_framepos; framepos_t start = max_framepos;
framepos_t end = 0; framepos_t end = 0;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5788,9 +5709,7 @@ Editor::set_punch_from_region ()
framepos_t start = max_framepos; framepos_t start = max_framepos;
framepos_t end = 0; framepos_t end = 0;
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5811,9 +5730,7 @@ Editor::set_punch_from_region ()
void void
Editor::pitch_shift_regions () Editor::pitch_shift_regions ()
{ {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5829,9 +5746,7 @@ Editor::use_region_as_bar ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -5946,9 +5861,7 @@ Editor::split_region_at_transients ()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -6120,9 +6033,7 @@ Editor::place_transient()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -6161,9 +6072,7 @@ Editor::snap_regions_to_grid()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -6187,9 +6096,7 @@ Editor::close_region_gaps()
return; return;
} }
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;
@ -6306,9 +6213,7 @@ Editor::tab_to_transient (bool forward)
} else { } else {
RegionSelection rs; RegionSelection rs = get_regions_for_action ();
get_regions_for_action (rs);
if (rs.empty()) { if (rs.empty()) {
return; return;

6
gtk2_ardour/rhythm_ferret.cc
View file

@ -330,11 +330,7 @@ RhythmFerret::do_action ()
void void
RhythmFerret::do_split_action () RhythmFerret::do_split_action ()
{ {
/* this can/will change the current selection, so work with a copy */ RegionSelection regions = editor.get_regions_for_action ();
//RegionSelection& regions (editor.get_selection().regions);
RegionSelection regions;
editor.get_regions_for_action(regions);
if (regions.empty()) { if (regions.empty()) {
return; return;