From 50dd880d7e75b49e7c80c79f32165a756839651c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 1 Apr 2010 01:07:24 +0000 Subject: No-op: rename a few variables and add/fix some comments. git-svn-id: svn://localhost/ardour2/branches/3.0@6818 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/playlist.h | 2 +- libs/ardour/ardour/processor.h | 2 +- libs/ardour/ardour/region_factory.h | 4 ++-- libs/ardour/ardour/slave.h | 4 ++-- libs/ardour/automation_list.cc | 4 ++-- libs/ardour/playlist.cc | 10 ++++++---- 6 files changed, 14 insertions(+), 12 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 5a6adda140..d9a14c01fd 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -66,7 +66,7 @@ class RegionListProperty : public PBD::SequenceProperty lookup_id (const PBD::ID& id); - void diff (PBD::PropertyList& before, PBD::PropertyList& after) const; + void diff (PBD::PropertyList& undo, PBD::PropertyList& redo) const; private: friend class Playlist; diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index 95d0c0a286..a07c9dcfaf 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -72,7 +72,7 @@ class Processor : public SessionObject, public AutomatableControls, public Laten /** @param result_required true if, on return from this method, bufs is required to contain valid data; * if false, the method need not bother writing to bufs if it doesn't want to. */ - virtual void run (BufferSet& /*bufs*/, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t /*nframes*/, bool /*result_required*/) {} + virtual void run (BufferSet& /*bufs*/, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t /*nframes*/, bool result_required) {} virtual void silence (nframes_t /*nframes*/) {} virtual void activate () { _pending_active = true; ActiveChanged(); } diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index ca19f52fec..c9f387f172 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -66,8 +66,8 @@ class RegionFactory { /** create a copy of @other starting at zero within @param other's sources */ static boost::shared_ptr create (boost::shared_ptr other, const PBD::PropertyList&, bool announce = true); - /** create a copy of @other starting at @param offset within @param other */ - static boost::shared_ptr create (boost::shared_ptr, frameoffset_t offset, + /** create a copy of @param other starting at @param offset within @param other */ + static boost::shared_ptr create (boost::shared_ptr other, frameoffset_t offset, const PBD::PropertyList&, bool announce = true); /** create a "copy" of @param other but using a different set of sources @param srcs */ static boost::shared_ptr create (boost::shared_ptr other, const SourceList& srcs, diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 959719eea0..d2b0e49c45 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -67,7 +67,7 @@ class Slave { * and after the method call they should * * Session::follow_slave will then try to follow the given - * position using a delay locked loop (DLL), + * position using a delay locked loop (DLL), * starting with the first given transport speed. * If the values of speed and position contradict each other, * ARDOUR will always follow the position and disregard the speed. @@ -153,7 +153,7 @@ class Slave { /** * @return the number of frames that this slave wants to seek ahead. Relevant - * only if @func requires_seekahead() returns true. + * only if requires_seekahead() returns true. */ virtual nframes64_t seekahead_distance() const { return 0; } diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 92a3d167da..b6de006d32 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -88,8 +88,8 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl AutomationListCreated(this); } -/** \a id is used for legacy sessions where the type is not present - * in or below the node. It is used if \a id is non-null. +/** @param id is used for legacy sessions where the type is not present + * in or below the AutomationList node. It is used if @param id is non-null. */ AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id) : ControlList(id) diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 3af4d22430..c71d53deca 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -131,16 +131,18 @@ RegionListProperty::copy_for_history () const } void -RegionListProperty::diff (PropertyList& before, PropertyList& after) const +RegionListProperty::diff (PropertyList& undo, PropertyList& redo) const { if (changed()) { + /* list of the removed/added regions since clear_history() was last called */ RegionListProperty* a = copy_for_history (); - RegionListProperty* b = copy_for_history (); + /* the same list, but with removed/added lists swapped (for undo purposes) */ + RegionListProperty* b = copy_for_history (); b->invert_changes (); - before.add (b); - after.add (a); + undo.add (b); + redo.add (a); } } -- cgit v1.2.3