Skip to content

Commit aed5350

Browse files
revmischarevmischa
committed
removing incredibly outdated FAQ
1 parent bbc88de commit aed5350

File tree

3 files changed

+10
-143
lines changed

3 files changed

+10
-143
lines changed

‎FAQ.txt‎

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎src/libprojectM/libprojectM.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,7 @@
6868
166854442105E4FC0042793A /* image_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E7207A85DC00862A3A /* image_helper.c */; };
6969
166854452105E4FC0042793A /* SOIL2.c in Sources */ = {isa = PBXBuildFile; fileRef = 1612C9E5207A85DC00862A3A /* SOIL2.c */; };
7070
166854462105E4FC0042793A /* BeatDetect.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172820C33DF300947E7E /* BeatDetect.hpp */; };
71-
166854472105E4FC0042793A /* FBO.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173120C33DF300947E7E /* FBO.hpp */; };
7271
166854482105E4FC0042793A /* Filters.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172920C33DF300947E7E /* Filters.hpp */; };
73-
166854492105E4FC0042793A /* HLSLTranslator.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172520C33DF300947E7E /* HLSLTranslator.hpp */; };
74-
1668544A2105E4FC0042793A /* MilkdropWaveform.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172D20C33DF300947E7E /* MilkdropWaveform.hpp */; };
7572
1668544B2105E4FC0042793A /* PerlinNoise.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172E20C33DF300947E7E /* PerlinNoise.hpp */; };
7673
1668544C2105E4FC0042793A /* PerPixelMesh.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173420C33DF400947E7E /* PerPixelMesh.hpp */; };
7774
1668544D2105E4FC0042793A /* Pipeline.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173520C33DF400947E7E /* Pipeline.hpp */; };
@@ -83,24 +80,19 @@
8380
166854532105E4FC0042793A /* RenderItemMatcher.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172720C33DF300947E7E /* RenderItemMatcher.hpp */; };
8481
166854542105E4FC0042793A /* RenderItemMergeFunction.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173320C33DF300947E7E /* RenderItemMergeFunction.hpp */; };
8582
166854552105E4FC0042793A /* Shader.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172B20C33DF300947E7E /* Shader.hpp */; };
86-
166854562105E4FC0042793A /* ShaderContext.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687175220C340B800947E7E /* ShaderContext.hpp */; };
8783
166854572105E4FC0042793A /* ShaderEngine.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173620C33DF400947E7E /* ShaderEngine.hpp */; };
8884
166854582105E4FC0042793A /* TextureManager.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172320C33DF300947E7E /* TextureManager.hpp */; };
8985
166854592105E4FD0042793A /* Transformation.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173220C33DF300947E7E /* Transformation.hpp */; };
90-
1668545A2105E4FD0042793A /* UserTexture.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173720C33DF400947E7E /* UserTexture.hpp */; };
9186
1668545B2105E4FD0042793A /* VideoEcho.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687172F20C33DF300947E7E /* VideoEcho.hpp */; };
9287
1668545C2105E4FD0042793A /* Waveform.hpp in Sources */ = {isa = PBXBuildFile; fileRef = 1687173020C33DF300947E7E /* Waveform.hpp */; };
9388
1668545D2105E4FD0042793A /* CodeWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689520BB1FE0000AFC1B /* CodeWriter.cpp */; };
9489
1668545E2105E4FD0042793A /* Engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C688F20BB1FDF000AFC1B /* Engine.cpp */; };
9590
1668545F2105E4FD0042793A /* GLSLGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689120BB1FDF000AFC1B /* GLSLGenerator.cpp */; };
96-
166854602105E4FD0042793A /* HLSLGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689620BB1FE0000AFC1B /* HLSLGenerator.cpp */; };
9791
166854612105E4FD0042793A /* HLSLParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689220BB1FDF000AFC1B /* HLSLParser.cpp */; };
9892
166854622105E4FD0042793A /* HLSLTokenizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689420BB1FE0000AFC1B /* HLSLTokenizer.cpp */; };
9993
166854632105E4FD0042793A /* HLSLTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689320BB1FE0000AFC1B /* HLSLTree.cpp */; };
100-
166854642105E4FD0042793A /* MSLGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 168C689020BB1FDF000AFC1B /* MSLGenerator.cpp */; };
10194
166854652105E4FD0042793A /* BeatDetect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854202105E4BC0042793A /* BeatDetect.cpp */; };
10295
166854662105E4FD0042793A /* Filters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854222105E4BD0042793A /* Filters.cpp */; };
103-
166854672105E4FD0042793A /* HLSLTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854272105E4BD0042793A /* HLSLTranslator.cpp */; };
10496
166854682105E4FD0042793A /* MilkdropWaveform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668542D2105E4BD0042793A /* MilkdropWaveform.cpp */; };
10597
166854692105E4FD0042793A /* PerlinNoise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1668541B2105E4BC0042793A /* PerlinNoise.cpp */; };
10698
1668546A2105E4FD0042793A /* PerPixelMesh.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 166854232105E4BD0042793A /* PerPixelMesh.cpp */; };
@@ -781,10 +773,7 @@
781773
166854442105E4FC0042793A /* image_helper.c in Sources */,
782774
166854452105E4FC0042793A /* SOIL2.c in Sources */,
783775
166854462105E4FC0042793A /* BeatDetect.hpp in Sources */,
784-
166854472105E4FC0042793A /* FBO.hpp in Sources */,
785776
166854482105E4FC0042793A /* Filters.hpp in Sources */,
786-
166854492105E4FC0042793A /* HLSLTranslator.hpp in Sources */,
787-
1668544A2105E4FC0042793A /* MilkdropWaveform.hpp in Sources */,
788777
1668544B2105E4FC0042793A /* PerlinNoise.hpp in Sources */,
789778
1668544C2105E4FC0042793A /* PerPixelMesh.hpp in Sources */,
790779
1668544D2105E4FC0042793A /* Pipeline.hpp in Sources */,
@@ -796,24 +785,19 @@
796785
166854532105E4FC0042793A /* RenderItemMatcher.hpp in Sources */,
797786
166854542105E4FC0042793A /* RenderItemMergeFunction.hpp in Sources */,
798787
166854552105E4FC0042793A /* Shader.hpp in Sources */,
799-
166854562105E4FC0042793A /* ShaderContext.hpp in Sources */,
800788
166854572105E4FC0042793A /* ShaderEngine.hpp in Sources */,
801789
166854582105E4FC0042793A /* TextureManager.hpp in Sources */,
802790
166854592105E4FD0042793A /* Transformation.hpp in Sources */,
803-
1668545A2105E4FD0042793A /* UserTexture.hpp in Sources */,
804791
1668545B2105E4FD0042793A /* VideoEcho.hpp in Sources */,
805792
1668545C2105E4FD0042793A /* Waveform.hpp in Sources */,
806793
1668545D2105E4FD0042793A /* CodeWriter.cpp in Sources */,
807794
1668545E2105E4FD0042793A /* Engine.cpp in Sources */,
808795
1668545F2105E4FD0042793A /* GLSLGenerator.cpp in Sources */,
809-
166854602105E4FD0042793A /* HLSLGenerator.cpp in Sources */,
810796
166854612105E4FD0042793A /* HLSLParser.cpp in Sources */,
811797
166854622105E4FD0042793A /* HLSLTokenizer.cpp in Sources */,
812798
166854632105E4FD0042793A /* HLSLTree.cpp in Sources */,
813-
166854642105E4FD0042793A /* MSLGenerator.cpp in Sources */,
814799
166854652105E4FD0042793A /* BeatDetect.cpp in Sources */,
815800
166854662105E4FD0042793A /* Filters.cpp in Sources */,
816-
166854672105E4FD0042793A /* HLSLTranslator.cpp in Sources */,
817801
166854682105E4FD0042793A /* MilkdropWaveform.cpp in Sources */,
818802
166854692105E4FD0042793A /* PerlinNoise.cpp in Sources */,
819803
1668546A2105E4FD0042793A /* PerPixelMesh.cpp in Sources */,

‎src/libprojectM/projectM.cpp‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,18 @@ pthread_mutex_t preset_mutex;
6868

6969
projectM::~projectM()
7070
{
71+
void *status;
7172

7273
#ifdef USE_THREADS
7374
std::cout << "[projectM] thread ";
7475
printf("c");
76+
pthread_mutex_lock( &mutex );
7577
running = false;
78+
pthread_mutex_unlock( &mutex );
7679
printf("l");
7780
pthread_cond_signal(&condition);
7881
printf("e");
79-
pthread_mutex_unlock( &mutex );
82+
pthread_join(thread, &status);
8083
printf("a");
8184
pthread_detach(thread);
8285
printf("n");
@@ -383,16 +386,17 @@ static void *thread_callback(void *prjm) {
383386
assert ( m_activePreset2.get() );
384387

385388
#ifdef USE_THREADS
386-
387-
pthread_cond_signal(&condition);
388-
pthread_mutex_unlock( &mutex );
389+
pthread_cond_signal(&condition);
389390
#endif
391+
390392
m_activePreset->Render(*beatDetect, pipelineContext());
391393

392394
#ifdef USE_THREADS
393-
pthread_mutex_lock( &mutex );
395+
// wait for the thread
396+
pthread_mutex_lock( &mutex );
397+
pthread_mutex_unlock( &mutex );
394398
#else
395-
evaluateSecondPreset();
399+
evaluateSecondPreset();
396400
#endif
397401

398402
Pipeline pipeline;
@@ -529,7 +533,6 @@ static void *thread_callback(void *prjm) {
529533
std::cerr << "[projectM] failed to allocate a thread! try building with option USE_THREADS turned off" << std::endl;;
530534
exit(EXIT_FAILURE);
531535
}
532-
pthread_mutex_lock( &mutex );
533536
#endif
534537

535538
/// @bug order of operatoins here is busted

0 commit comments

Comments
 (0)