MemoryLoop

Author: pschatzmann

examples/Instrument/Instrument.ino

@@ -2,7 +2,7 @@
 #include "StkAll.h"
 
 ArdStreamTextOut output(Serial);
-Drummer instrument;
+BeeThree instrument;
 //Clarinet instrument(440);
 int note = 90; // starting midi note
 

src/FileLoop.h

@@ -83,7 +83,7 @@ class FileLoop : protected FileWvIn
     their headers.  STK RAW files have a sample rate of 22050 Hz
     by definition.  MAT-files are assumed to have a rate of 44100 Hz.
   */
-  StkFloat getFileRate( void ) const { return data_.dataRate(); };
+  virtual StkFloat getFileRate( void ) const { return data_.dataRate(); };
 
   //! Set the data read rate in samples.  The rate can be negative.
   /*!
@@ -117,7 +117,7 @@ class FileLoop : protected FileWvIn
     size and the current Stk::sampleRate.  The \e angle value
     is a multiple of file size.
   */
-  void addPhaseOffset( StkFloat angle );
+  virtual void addPhaseOffset( StkFloat angle );
 
   //! Return the specified channel value of the last computed frame.
   /*!
@@ -154,7 +154,7 @@ class FileLoop : protected FileWvIn
   virtual StkFrames& tick( StkFrames& frames,unsigned int channel = 0 );
 
  protected:
-  void fileRead( StkFrames& buffer, unsigned long startFrame, bool doNormalize );
+  virtual void fileRead( StkFrames& buffer, unsigned long startFrame, bool doNormalize );
 
   StkFrames firstFrame_;
   StkFloat phaseOffset_;

src/MemoryLoop.cpp

@@ -111,7 +111,7 @@ void MemoryLoop :: closeFile( void ){
   finished_ = true;
 }
 
-StkFloat MemoryLoop :: getFileRate( void )  { 
+StkFloat MemoryLoop :: getFileRate( void ) const { 
   return 22050.0;
 }
 

src/MemoryLoop.h

@@ -45,48 +45,46 @@ class MemoryLoop : public FileLoop {
   /*!
     This method is provided to be compatible with the FileWvIn
   */
-  virtual void openFile( std::string fileName, bool raw = true, bool doNormalize = true, bool doInt2FloatScaling = true );
+  virtual void openFile( std::string fileName, bool raw = true, bool doNormalize = true, bool doInt2FloatScaling = true ) override;
 
   //! Open the specified file and load its data.
   /*!
     This method is provided to be compatible with the FileWvIn
   */
-  virtual void openFile( const char* fileName, bool raw = true, bool doNormalize = true, bool doInt2FloatScaling = true );
+  virtual void openFile( const char* fileName, bool raw = true, bool doNormalize = true, bool doInt2FloatScaling = true ) ;
 
   //! Add a phase offset to the current read pointer.
   /*!
     This function determines a time offset based on the file
     size and the current Stk::sampleRate.  The \e angle value
     is a multiple of file size.
   */
-  void addPhaseOffset( StkFloat angle );
+  void addPhaseOffset( StkFloat angle ) override;
 
   //! Close the actual file
   /*!
     This method is provided to be compatible with the FileWvIn
   */
-  void  closeFile(void );
+  void  closeFile(void ) override;
 
   //! Query whether a file is open.
   /*!
     This does not have any importance since the data is available in the memory
     anyhow.
   */
-  bool  isOpen(void );
+  bool  isOpen(void ) override;
 
   //! Return the input file sample rate in Hz (not the data read rate).
   /*!
     STK RAW files have a sample rate of 22050 Hz
   */
-  StkFloat  getFileRate( void );
-
+  virtual StkFloat getFileRate( void ) const override;
 
 protected:
   virtual void fileRead( StkFrames& buffer, unsigned long startFrame, bool doNormalize ) override;
   virtual void open(bool doNormalize=true,bool doInt2FloatScaling=true);
 
   MemoryFS memoryFS;
-
   StkFrames firstFrame_;
   StkFloat phaseOffset_;