Correct Midi Delays

Author: pschatzmann

src/ArdMidiStreamIn.cpp

@@ -6,21 +6,25 @@ namespace stk {
 
 ArdMidiStreamIn :: ArdMidiStreamIn(Stream &stream, ArdMidiEventHandler &handler) {
     pStream = &stream;
+    // without this I was getting a 2 sec delay!
+    pStream->setTimeout(10);
     pHandler = &handler;
     startPos = 0;
 }
 
 void ArdMidiStreamIn :: loop() {
-    int lenRead = pStream->readBytes(buffer+startPos, BUFFER_LEN-startPos);
-    if (lenRead>0){
-        int endPos = startPos+lenRead;
-        int lastStatusPos = getLastStatusPos(buffer, endPos);
-        if (lastStatusPos>=0) {
-            pHandler->parse(buffer, lastStatusPos);
-            int lenUnprocessed = endPos-lastStatusPos;
-            // move unprocessed bytes to head
-            memmove(buffer, buffer+lastStatusPos, lenUnprocessed);
-            startPos = lenUnprocessed;
+    if (pStream->available()>0){
+        int lenRead = pStream->readBytes(buffer+startPos, BUFFER_LEN-startPos);
+        if (lenRead>0){
+            int endPos = startPos+lenRead;
+            int lastStatusPos = getLastStatusPos(buffer, endPos);
+            if (lastStatusPos>=0) {
+                pHandler->parse(buffer, lastStatusPos);
+                int lenUnprocessed = endPos-lastStatusPos;
+                // move unprocessed bytes to head
+                memmove(buffer, buffer+lastStatusPos, lenUnprocessed);
+                startPos = lenUnprocessed;
+            }
         }
     }
 }

src/Mandolin.cpp

@@ -45,17 +45,17 @@ Mandolin :: Mandolin( StkFloat lowestFrequency )
   }
 
   #ifdef __RAW_ARRAYS__
-  MemoryFS::registerFile("mand1.raw", mand1_raw, mand1_raw_len);
-  MemoryFS::registerFile("mand2.raw", mand2_raw, mand2_raw_len);
-  MemoryFS::registerFile("mand3.raw", mand3_raw, mand3_raw_len);
-  MemoryFS::registerFile("mand4.raw", mand4_raw, mand4_raw_len);
-  MemoryFS::registerFile("mand5.raw", mand5_raw, mand5_raw_len);
-  MemoryFS::registerFile("mand6.raw", mand6_raw, mand6_raw_len);
-  MemoryFS::registerFile("mand7.raw", mand7_raw, mand7_raw_len);
-  MemoryFS::registerFile("mand8.raw", mand8_raw, mand8_raw_len);
-  MemoryFS::registerFile("mand9.raw", mand9_raw, mand9_raw_len);
-  MemoryFS::registerFile("mand10.raw", mand10_raw, mand10_raw_len);
-  MemoryFS::registerFile("mand11.raw", mand11_raw, mand11_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand1.raw").c_str(), mand1_raw, mand1_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand2.raw").c_str(), mand2_raw, mand2_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand3.raw").c_str(), mand3_raw, mand3_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand4.raw").c_str(), mand4_raw, mand4_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand5.raw").c_str(), mand5_raw, mand5_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand6.raw").c_str(), mand6_raw, mand6_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand7.raw").c_str(), mand7_raw, mand7_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand8.raw").c_str(), mand8_raw, mand8_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand9.raw").c_str(), mand9_raw, mand9_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand10.raw").c_str(), mand10_raw, mand10_raw_len);
+  MemoryFS::registerFile((Stk::rawwavePath() +"mand11.raw").c_str(), mand11_raw, mand11_raw_len);
   #endif
 
   // Concatenate the STK rawwave path to the rawwave files

src/Mandolin.h

@@ -91,8 +91,11 @@ class Mandolin : public Instrmnt
   protected:
 
   Twang strings_[2];
+#ifdef __RAW_ARRAYS__
+  MemoryWvIn soundfile_[12];
+#else
   FileWvIn soundfile_[12];
-
+#endif
   int mic_;
   StkFloat detuning_;
   StkFloat frequency_;

src/MemoryFS.cpp

@@ -93,17 +93,19 @@ bool MemoryFS :: fileRead( StkFrames& frames, unsigned long startFrame, bool doN
 int MemoryFS :: findByName(const char * path){
     int result = -1;
     if (registry!=NULL && path!=NULL){
-      for (int fd=0; fd<registry_last_entry; fd++){
+      for (int fd=0; fd<registry_last_entry-1; fd++){
           //ESP_LOGD(APP_VFS, "x%x, matching with %s", __func__, registry[fd].name);
-          if (strcmp(path, registry[fd].name)==0){
+          char  nameReg[] = registry[fd].name;
+          if (nameReg!= NULL && strcmp(path,nameReg) == 0){
               result = fd;
               break;
           }
       }
     }
-    return result;;
+    return result;
 }      
 
+
 VFS_FD * MemoryFS :: registerFile(const char* name, const unsigned char *raw, unsigned int size){
   const char *nameToLog = name==NULL?"":name;
   // extend registry if it is not big enough

src/Stk.h

@@ -78,7 +78,7 @@ namespace stk {
 // following user-definable floating-point type.  You
 // can change this to "float" if you prefer or perhaps
 // a "long double" in the future.
-typedef double StkFloat;
+typedef float StkFloat;
 
 //! STK error handling class.
 /*!