From 140258d8abc366ddd600a7b3079b55a730b10225 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 10 Jul 2016 15:30:41 +0200 Subject: remove reference "const int32_t&" -> const int32_t" this simplifies lua-bindings and also let's the compiler worry about constant primitive types. --- gtk2_ardour/automation_time_axis.cc | 2 +- gtk2_ardour/automation_time_axis.h | 2 +- gtk2_ardour/editor.h | 4 ++-- gtk2_ardour/editor_drag.cc | 4 ++-- gtk2_ardour/editor_drag.h | 4 ++-- gtk2_ardour/editor_ops.cc | 4 ++-- gtk2_ardour/midi_region_view.cc | 2 +- gtk2_ardour/midi_region_view.h | 2 +- gtk2_ardour/midi_streamview.cc | 2 +- gtk2_ardour/midi_streamview.h | 2 +- gtk2_ardour/midi_time_axis.cc | 4 ++-- gtk2_ardour/midi_time_axis.h | 4 ++-- gtk2_ardour/public_editor.h | 2 +- gtk2_ardour/region_view.cc | 4 ++-- gtk2_ardour/region_view.h | 4 ++-- gtk2_ardour/route_time_axis.cc | 2 +- gtk2_ardour/route_time_axis.h | 2 +- gtk2_ardour/time_axis_view.h | 2 +- 18 files changed, 26 insertions(+), 26 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 7a8e8ac5b3..ed55ce1a69 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -658,7 +658,7 @@ AutomationTimeAxisView::add_automation_event (GdkEvent* event, framepos_t when, } bool -AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t& sub_num) +AutomationTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (_line) { return paste_one (pos, ctx.count, ctx.times, selection, ctx.counts, ctx.greedy); diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h index f352dae1ed..7852e21ed7 100644 --- a/gtk2_ardour/automation_time_axis.h +++ b/gtk2_ardour/automation_time_axis.h @@ -97,7 +97,7 @@ class AutomationTimeAxisView : public TimeAxisView { /* editing operations */ void cut_copy_clear (Selection&, Editing::CutCopyOp); - bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&, const int32_t& sub_num); + bool paste (ARDOUR::framepos_t, const Selection&, PasteContext&, const int32_t sub_num); int set_state (const XMLNode&, int version); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 7c224a1d0c..d45545b4a7 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -534,7 +534,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD /* editing operations that need to be public */ void mouse_add_new_marker (framepos_t where, bool is_cd=false); - void split_regions_at (framepos_t, RegionSelection&, const int32_t& sub_num); + void split_regions_at (framepos_t, RegionSelection&, const int32_t sub_num); void split_region_at_points (boost::shared_ptr, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false); RegionSelection get_regions_from_selection_and_mouse (framepos_t); @@ -1190,7 +1190,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void cut_copy_midi (Editing::CutCopyOp); void mouse_paste (); - void paste_internal (framepos_t position, float times, const int32_t& sub_num); + void paste_internal (framepos_t position, float times, const int32_t sub_num); /* EDITING OPERATIONS */ diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index c8afd81476..4516eefb62 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -510,7 +510,7 @@ Drag::show_verbose_cursor_text (string const & text) } boost::shared_ptr -Drag::add_midi_region (MidiTimeAxisView* view, bool commit, const int32_t& sub_num) +Drag::add_midi_region (MidiTimeAxisView* view, bool commit, const int32_t sub_num) { if (_editor->session()) { const TempoMap& map (_editor->session()->tempo_map()); @@ -1741,7 +1741,7 @@ RegionMoveDrag::insert_region_into_playlist ( layer_t dest_layer, framecnt_t where, PlaylistSet& modified_playlists, - const int32_t& sub_num + const int32_t sub_num ) { boost::shared_ptr dest_playlist = dest_rtv->playlist (); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 911b8fbf35..cc0e9d95dd 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -248,7 +248,7 @@ protected: /* sets snap delta from unsnapped pos */ void setup_snap_delta (framepos_t pos); - boost::shared_ptr add_midi_region (MidiTimeAxisView*, bool commit, const int32_t& sub_num); + boost::shared_ptr add_midi_region (MidiTimeAxisView*, bool commit, const int32_t sub_num); void show_verbose_cursor_time (framepos_t); void show_verbose_cursor_duration (framepos_t, framepos_t, double xoffset = 0); @@ -424,7 +424,7 @@ private: ARDOUR::layer_t, ARDOUR::framecnt_t, PlaylistSet&, - const int32_t& sub_num + const int32_t sub_num ); void remove_region_from_playlist ( diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 117c80262f..63d3570b8b 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -151,7 +151,7 @@ Editor::redo (uint32_t n) } void -Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int32_t& sub_num) +Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int32_t sub_num) { bool frozen = false; @@ -4653,7 +4653,7 @@ Editor::mouse_paste () } void -Editor::paste_internal (framepos_t position, float times, const int32_t& sub_num) +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)); diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 7a45da5c40..987a9fff35 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -3524,7 +3524,7 @@ MidiRegionView::selection_as_cut_buffer () const /** This method handles undo */ bool -MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx, const int32_t& sub_num) +MidiRegionView::paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx, const int32_t sub_num) { bool commit = false; // Paste notes, if available diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index fd423a3d0c..afe2f4a97d 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -122,7 +122,7 @@ public: void resolve_note(uint8_t note_num, Evoral::Beats end_time); void cut_copy_clear (Editing::CutCopyOp); - bool paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx, const int32_t& sub_num); + bool paste (framepos_t pos, const ::Selection& selection, PasteContext& ctx, const int32_t sub_num); void paste_internal (framepos_t pos, unsigned paste_count, float times, const MidiCutBuffer&); void add_canvas_patch_change (ARDOUR::MidiModel::PatchChangePtr patch, const std::string& displaytext, bool); diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc index 24328148d4..6bd6775618 100644 --- a/gtk2_ardour/midi_streamview.cc +++ b/gtk2_ardour/midi_streamview.cc @@ -662,7 +662,7 @@ struct RegionPositionSorter { }; bool -MidiStreamView::paste (ARDOUR::framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t& sub_num) +MidiStreamView::paste (ARDOUR::framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { /* Paste into the first region which starts on or before pos. Only called when using an internal editing tool. */ diff --git a/gtk2_ardour/midi_streamview.h b/gtk2_ardour/midi_streamview.h index 582c72fc1f..59cf2da9d7 100644 --- a/gtk2_ardour/midi_streamview.h +++ b/gtk2_ardour/midi_streamview.h @@ -98,7 +98,7 @@ class MidiStreamView : public StreamView RegionView* create_region_view (boost::shared_ptr, bool, bool); - bool paste (ARDOUR::framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t& sub_num); + bool paste (ARDOUR::framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num); void apply_note_range(uint8_t lowest, uint8_t highest, bool to_region_views); diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 81c8a3736d..ac39c557ae 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -1508,7 +1508,7 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param) } boost::shared_ptr -MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit, const int32_t& sub_num) +MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit, const int32_t sub_num) { Editor* real_editor = dynamic_cast (&_editor); if (commit) { @@ -1635,7 +1635,7 @@ MidiTimeAxisView::capture_channel_mode_changed () } bool -MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t& sub_num) +MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (!_editor.internal_editing()) { // Non-internal paste, paste regions like any other route diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h index 4b78553d8c..fa6102c360 100644 --- a/gtk2_ardour/midi_time_axis.h +++ b/gtk2_ardour/midi_time_axis.h @@ -82,13 +82,13 @@ public: void set_height (uint32_t, TrackHeightMode m = OnlySelf); - boost::shared_ptr add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool, const int32_t& sub_num); + boost::shared_ptr add_region (ARDOUR::framepos_t, ARDOUR::framecnt_t, bool, const int32_t sub_num); void show_all_automation (bool apply_to_selection = false); void show_existing_automation (bool apply_to_selection = false); void create_automation_child (const Evoral::Parameter& param, bool show); - bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t& sub_num); + bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num); ARDOUR::NoteMode note_mode() const { return _note_mode; } ARDOUR::ColorMode color_mode() const { return _color_mode; } diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h index a86169b4db..69c081b94d 100644 --- a/gtk2_ardour/public_editor.h +++ b/gtk2_ardour/public_editor.h @@ -289,7 +289,7 @@ class PublicEditor : public Gtkmm2ext::Tabbable { virtual void restore_editing_space () = 0; virtual framepos_t get_preferred_edit_position (Editing::EditIgnoreOption = Editing::EDIT_IGNORE_NONE, bool from_context_menu = false, bool from_outside_canvas = false) = 0; virtual void toggle_meter_updating() = 0; - virtual void split_regions_at (framepos_t, RegionSelection&, const int32_t& sub_num) = 0; + virtual void split_regions_at (framepos_t, RegionSelection&, const int32_t sub_num) = 0; virtual void split_region_at_points (boost::shared_ptr, ARDOUR::AnalysisFeatureList&, bool can_ferret, bool select_new = false) = 0; virtual void mouse_add_new_marker (framepos_t where, bool is_cd=false) = 0; virtual void foreach_time_axis_view (sigc::slot) = 0; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 16bf44a689..1e848cf339 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -834,7 +834,7 @@ RegionView::update_coverage_frames (LayerDisplay d) } bool -RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t& sub_num) +RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t sub_num) { if (_region->locked()) { return false; @@ -876,7 +876,7 @@ RegionView::trim_front (framepos_t new_bound, bool no_overlap, const int32_t& su } bool -RegionView::trim_end (framepos_t new_bound, bool no_overlap, const int32_t& sub_num) +RegionView::trim_end (framepos_t new_bound, bool no_overlap, const int32_t sub_num) { if (_region->locked()) { return false; diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index 40485f93cf..7fad731dc2 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -102,12 +102,12 @@ class RegionView : public TimeAxisViewItem /** Called when a front trim is about to begin */ virtual void trim_front_starting () {} - bool trim_front (framepos_t, bool, const int32_t& sub_num); + bool trim_front (framepos_t, bool, const int32_t sub_num); /** Called when a start trim has finished */ virtual void trim_front_ending () {} - bool trim_end (framepos_t, bool, const int32_t& sub_num); + bool trim_end (framepos_t, bool, const int32_t sub_num); void move_contents (ARDOUR::frameoffset_t); virtual void thaw_after_trim (); diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc index 6d377df96b..c6c8b39000 100644 --- a/gtk2_ardour/route_time_axis.cc +++ b/gtk2_ardour/route_time_axis.cc @@ -1585,7 +1585,7 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op) } bool -RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t& sub_num) +RouteTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num) { if (!is_track()) { return false; diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index efa2bfafb8..0634890e51 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -107,7 +107,7 @@ public: /* Editing operations */ void cut_copy_clear (Selection&, Editing::CutCopyOp); - bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t& sub_num); + bool paste (ARDOUR::framepos_t, const Selection&, PasteContext& ctx, const int32_t sub_num); RegionView* combine_regions (); void uncombine_regions (); void uncombine_region (RegionView*); diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 2ad2214952..e4e30fdc4f 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -186,7 +186,7 @@ class TimeAxisView : public virtual AxisView virtual bool paste (ARDOUR::framepos_t pos, const Selection& selection, PasteContext& ctx, - const int32_t& sub_num) { return false; } + const int32_t sub_num) { return false; } virtual void set_selected_regionviews (RegionSelection&) {} virtual void set_selected_points (PointSelection&) {} -- cgit v1.2.3