e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-01-11 20:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from vuki/operators

Browse Source 
StkFrames: add * and *= operators for multiplication by StkFloat; ret…
This commit is contained in:
garyscavone
2021-02-25 20:39:46 -05:00
committed by GitHub
parent f1a75a8691 4b5b142531
commit b379160f2b
1 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
include/Stk.h
View File

@@ -324,7 +324,7 @@ public:
self. No range checking is performed unless _STK_DEBUG_ is self. No range checking is performed unless _STK_DEBUG_ is
defined. defined.
*/ */
void operator+= ( StkFrames& f ); StkFrames& operator+= ( StkFrames& f );
//! Assignment by product operator into self. //! Assignment by product operator into self.
/*! /*!
@@ -332,7 +332,16 @@ public:
self. No range checking is performed unless _STK_DEBUG_ is self. No range checking is performed unless _STK_DEBUG_ is
defined. defined.
*/ */
void operator*= ( StkFrames& f ); StkFrames& operator*= ( StkFrames& f );
//! Scaling operator (StkFrame * StkFloat).
StkFrames operator* ( StkFloat v ) const;
//! Scaling operator (StkFloat * StkFrame)
friend StkFrames operator*(StkFloat v, const StkFrames& f);
//! Scaling operator (inline).
StkFrames& operator*= ( StkFloat v );
//! Channel / frame subscript operator that returns a reference. //! Channel / frame subscript operator that returns a reference.
/*! /*!
@@ -511,7 +520,7 @@ inline StkFrames StkFrames::operator+(const StkFrames &f) const
return sum; return sum;
} }
inline void StkFrames :: operator+= ( StkFrames& f ) inline StkFrames& StkFrames :: operator+= ( StkFrames& f )
{ {
#if defined(_STK_DEBUG_) #if defined(_STK_DEBUG_)
if ( f.frames() != nFrames_ || f.channels() != nChannels_ ) { if ( f.frames() != nFrames_ || f.channels() != nChannels_ ) {
@@ -525,9 +534,10 @@ inline void StkFrames :: operator+= ( StkFrames& f )
StkFloat *dptr = data_; StkFloat *dptr = data_;
for ( unsigned int i=0; i<size_; i++ ) for ( unsigned int i=0; i<size_; i++ )
*dptr++ += *fptr++; *dptr++ += *fptr++;
return *this;
} }
inline void StkFrames :: operator*= ( StkFrames& f ) inline StkFrames& StkFrames :: operator*= ( StkFrames& f )
{ {
#if defined(_STK_DEBUG_) #if defined(_STK_DEBUG_)
if ( f.frames() != nFrames_ || f.channels() != nChannels_ ) { if ( f.frames() != nFrames_ || f.channels() != nChannels_ ) {
@@ -541,8 +551,40 @@ inline void StkFrames :: operator*= ( StkFrames& f )
StkFloat *dptr = data_; StkFloat *dptr = data_;
for ( unsigned int i=0; i<size_; i++ ) for ( unsigned int i=0; i<size_; i++ )
*dptr++ *= *fptr++; *dptr++ *= *fptr++;
return *this;
} }
inline StkFrames StkFrames::operator*(StkFloat v) const
{
StkFrames res((unsigned int)nFrames_, nChannels_);
StkFloat *resPtr = &res[0];
const StkFloat *dPtr = data_;
for (unsigned int i = 0; i < size_; i++) {
*resPtr++ = v * *dPtr++;
}
return res;
}
inline StkFrames operator*(StkFloat v, const StkFrames& f)
{
StkFrames res((unsigned int)f.nFrames_, f.nChannels_);
StkFloat *resPtr = &res[0];
StkFloat *dPtr = f.data_;
for (unsigned int i = 0; i < f.size_; i++) {
*resPtr++ = v * *dPtr++;
}
return res;
}
inline StkFrames& StkFrames :: operator*= ( StkFloat v )
{
StkFloat *dptr = data_;
for ( unsigned int i=0; i<size_; i++ )
*dptr++ *= v;
return *this;
}
// Here are a few other useful typedefs. // Here are a few other useful typedefs.
typedef unsigned short UINT16; typedef unsigned short UINT16;
typedef unsigned int UINT32; typedef unsigned int UINT32;