Skip to content

Commit 9fac3b5

Browse files
committed
Fix LV2 build target, note, this is still experimental
1 parent 8253ebf commit 9fac3b5

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

Builds/LinuxMakefile/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ endif
247247
OBJECTS_ALL := \
248248

249249
OBJECTS_LV2_MANIFEST_HELPER := \
250-
$(JUCE_OBJDIR)/juce_LV2TurtleDumpProgram_69e62a81.o \
250+
$(JUCE_OBJDIR)/juce_LV2ManifestHelper_69e62a81.o \
251251

252252
OBJECTS_LV2_PLUGIN := \
253253
$(JUCE_OBJDIR)/include_juce_audio_plugin_client_LV2_7d84e0a5.o \
@@ -1013,9 +1013,9 @@ $(JUCE_OBJDIR)/include_juce_gui_extra_6dee1c1a.o: ../../JuceLibraryCode/include_
10131013
@$(ECHO) "Compiling include_juce_gui_extra.cpp"
10141014
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_SHARED_CODE) $(JUCE_CFLAGS_SHARED_CODE) -o "$@" -c "$<"
10151015

1016-
$(JUCE_OBJDIR)/juce_LV2TurtleDumpProgram_69e62a81.o: ../../JuceModules/modules/juce_audio_plugin_client/LV2/juce_LV2TurtleDumpProgram.cpp
1016+
$(JUCE_OBJDIR)/juce_LV2ManifestHelper_69e62a81.o: ../../JuceModules/modules/juce_audio_plugin_client/LV2/juce_LV2ManifestHelper.cpp
10171017
-$(V_AT)mkdir -p $(JUCE_OBJDIR)
1018-
@$(ECHO) "Compiling juce_LV2TurtleDumpProgram.cpp"
1018+
@$(ECHO) "Compiling juce_LV2ManifestHelper.cpp"
10191019
$(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_LV2_MANIFEST_HELPER) $(JUCE_CFLAGS_LV2_MANIFEST_HELPER) -o "$@" -c "$<"
10201020

10211021
clean:

Source/ParallelThread.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262

6363
#if defined(_WIN32)
6464
#define MINGW_STDTHREAD_REDUNDANCY_WARNING
65+
#include <windows.h>
6566
#endif
6667

6768
#include <atomic>
@@ -108,6 +109,8 @@ class ProcessPtr
108109
void process() const {
109110
return memberFunc[i](instPtr[i]);
110111
}
112+
113+
void dummyFunc() {}
111114

112115
private:
113116
typedef void* InstancePtr;
@@ -118,8 +121,6 @@ class ProcessPtr
118121
return (static_cast<C*>(instance)->*Function)();
119122
}
120123

121-
void dummyFunc() {}
122-
123124
InstancePtr instPtr[2];
124125
MemberFunc memberFunc[2];
125126
uint32_t i;
@@ -185,9 +186,7 @@ class ParallelThread: public ProcessPtr
185186
if (pthread_cond_timedwait(&pProcCond, &pWaitProc, getTimeOut()) == ETIMEDOUT) {
186187
pthread_mutex_unlock(&pWaitProc);
187188
maxDuration +=1;
188-
//fprintf(stderr, "%s wait for process %i\n", threadName.c_str(), maxDuration);
189189
if (maxDuration > 2) {
190-
//fprintf(stderr, "%s break waitForProcess\n", threadName.c_str());
191190
break;
192191
}
193192
} else {
@@ -219,16 +218,13 @@ class ParallelThread: public ProcessPtr
219218
if (pthread_cond_timedwait(&pProcCond, &pWaitProc, getTimeOut()) == ETIMEDOUT) {
220219
pthread_mutex_unlock(&pWaitProc);
221220
maxDuration +=1;
222-
//fprintf(stderr, "%s wait for data %i\n", threadName.c_str(), maxDuration);
223221
if (maxDuration > 5) {
224222
pWait.store(false, std::memory_order_release);
225-
//fprintf(stderr, "%s break processWait\n", threadName.c_str());
226223
}
227224
} else {
228225
pthread_mutex_unlock(&pWaitProc);;
229226
}
230227
}
231-
//fprintf(stderr, "%s processed data %i\n", threadName.c_str(), maxDuration);
232228
}
233229
}
234230

@@ -237,6 +233,7 @@ class ParallelThread: public ProcessPtr
237233
if (isRunning()) {
238234
pRun.store(false, std::memory_order_release);
239235
if (pThd.joinable()) {
236+
set<ProcessPtr, &ProcessPtr::dummyFunc>(this);
240237
#if __cplusplus > 201703L
241238
pWorkCond.store(true);
242239
#endif

0 commit comments

Comments
 (0)