zynaddsubfx

commit 114f531ee12000f0247877f357233cc4cde9c126
parent 66d1f761732d75722d7a9bd48645d06c7edbfcb3
Author: fundamental <[email protected]>
Date:   Thu, 12 Oct 2017 22:06:36 -0400

Add Tentative Fix For Windows Mutex Use

Diffstat:
M
src/Misc/MiddleWare.cpp
 | 
16
++++++++++++++--

1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/Misc/MiddleWare.cpp b/src/Misc/MiddleWare.cpp
@@ -209,8 +209,18 @@ void preparePadSynth(string path, PADnoteParameters *p, rtosc::RtData &d)
     assert(!path.empty());
     path += "sample";
 
-    mutex rtdata_mutex;
-    unsigned num = p->sampleGenerator([&rtdata_mutex,&path,&d]
+#ifdef WIN32
+    unsigned num = p->sampleGenerator([&path,&d]
+                       (unsigned N, PADnoteParameters::Sample &s)
+                       {
+                           //printf("sending info to '%s'\n",
+                           //       (path+to_s(N)).c_str());
+                           d.chain((path+to_s(N)).c_str(), "ifb",
+                                   s.size, s.basefreq, sizeof(float*), &s.smp);
+                       }, []{return false;}, 1);
+#else
+    std::mutex rtdata_mutex;
+    unsigned num = p->sampleGenerator([&rtdata_mutex, &path,&d]
                        (unsigned N, PADnoteParameters::Sample &s)
                        {
                            //printf("sending info to '%s'\n",
@@ -220,6 +230,8 @@ void preparePadSynth(string path, PADnoteParameters *p, rtosc::RtData &d)
                                    s.size, s.basefreq, sizeof(float*), &s.smp);
                            rtdata_mutex.unlock();
                        }, []{return false;});
+#endif
+
     //clear out unused samples
     for(unsigned i = num; i < PAD_MAX_SAMPLES; ++i) {
         d.chain((path+to_s(i)).c_str(), "ifb",