Merge pull request #38 from Ahbee/rename

Renamed StkFrames::copyChannel to StkFrames::getChannel
This commit is contained in:
garyscavone
2014-11-03 14:11:17 -05:00
2 changed files with 3 additions and 3 deletions

View File

@@ -381,13 +381,13 @@ public:
*/ */
void resize( size_t nFrames, unsigned int nChannels, StkFloat value ); void resize( size_t nFrames, unsigned int nChannels, StkFloat value );
//! Copies a single channel //! Retrieves a single channel
/*! /*!
Copies the specified \c channel into \c destinationFrames's \c destinationChannel. \c destinationChannel must be between 0 and destination.channels() - 1 and Copies the specified \c channel into \c destinationFrames's \c destinationChannel. \c destinationChannel must be between 0 and destination.channels() - 1 and
\c channel must be between 0 and channels() - 1. destination.frames() must be >= frames(). \c channel must be between 0 and channels() - 1. destination.frames() must be >= frames().
No range checking is performed unless _STK_DEBUG_ is defined. No range checking is performed unless _STK_DEBUG_ is defined.
*/ */
StkFrames& copyChannel(unsigned int channel,StkFrames& destinationFrames, unsigned int destinationChannel) const; StkFrames& getChannel(unsigned int channel,StkFrames& destinationFrames, unsigned int destinationChannel) const;
//! Sets a single channel //! Sets a single channel
/*! /*!

View File

@@ -317,7 +317,7 @@ void StkFrames :: resize( size_t nFrames, unsigned int nChannels, StkFloat value
for ( size_t i=0; i<size_; i++ ) data_[i] = value; for ( size_t i=0; i<size_; i++ ) data_[i] = value;
} }
StkFrames& StkFrames::copyChannel(unsigned int sourceChannel,StkFrames& destinationFrames, unsigned int destinationChannel) const StkFrames& StkFrames::getChannel(unsigned int sourceChannel,StkFrames& destinationFrames, unsigned int destinationChannel) const
{ {
#if defined(_STK_DEBUG_) #if defined(_STK_DEBUG_)
if (sourceChannel > channels() - 1) { if (sourceChannel > channels() - 1) {