From 6eb8bbd17274fd0fa62955feb3de9ba20f5006a9 Mon Sep 17 00:00:00 2001 From: Jess Date: Mon, 24 Dec 2018 09:13:34 -0800 Subject: [PATCH 1/3] Added backers and sponsors on the README --- README.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/README.md b/README.md index 403f83cbe..f572acbfb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ [![Build Status](https://travis-ci.org/projectM-visualizer/projectm.svg?branch=master)](https://travis-ci.org/projectM-visualizer/projectm) +[![Backers on Open Collective](https://opencollective.com/projectm/backers/badge.svg)](#backers) + [![Sponsors on Open Collective](https://opencollective.com/projectm/sponsors/badge.svg)](#sponsors) ![Logo](https://github.com/projectM-visualizer/projectm/raw/master/web/logo.png) @@ -117,5 +119,35 @@ If you maintain packages of libprojectM, we are happy to work with you! Please n ## Authors [Authors](https://github.com/projectM-visualizer/projectm/raw/master/AUTHORS.txt) +## Contributors + +This project exists thanks to all the people who contribute. + + + +## Backers + +Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/projectm#backer)] + + + + +## Sponsors + +Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/projectm#sponsor)] + + + + + + + + + + + + + + ## License [LGPL](https://github.com/projectM-visualizer/projectm/raw/master/LICENSE.txt) From 9d82515a9b5af42f9c89e47858e14dfd9a01fa1c Mon Sep 17 00:00:00 2001 From: Mischa Spiegelmock Date: Tue, 1 Jan 2019 13:27:48 +0200 Subject: [PATCH 2/3] xcode cleanup --- README.md | 9 +++++++++ src/libprojectM/libprojectM.xcodeproj/project.pbxproj | 2 +- src/projectM-iTunes/iprojectM.mm | 8 ++++---- src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj | 10 +++------- src/projectM-sdl/pmSDL.cpp | 4 ++++ src/projectM-sdl/pmSDL.hpp | 2 ++ 6 files changed, 23 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f572acbfb..75c53272f 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ Its purpose in life is to read in audio input and produce mesmerizing visuals, d ### Download Get it from the [Releases](https://github.com/projectM-visualizer/projectm/releases) tab +### Demo Video +[![](http://img.youtube.com/vi/2dSam8zwSFw/0.jpg)](http://www.youtube.com/watch?v=2dSam8zwSFw "Demo") + + ### Project Status You can read more about how it works and the current state of development [here](https://lwn.net/Articles/750152/). @@ -82,6 +86,11 @@ Silverjuke (FOSS Jukebox) projectM supports OpenGL ES 2 and 3 for embedded systems. Be sure to configure with the `--enable--gles` flag. +### Raspberry Pi (and other embedded systems) +* projectM is arch-independent, although there are some SSE2 enhancements for x86 +* [Notes on running on raspberry pi](https://github.com/projectM-visualizer/projectm/issues/115) + + # Using the library At its core projectM is a library, [libprojectM](src/libprojectM). This library is responsible for parsing presets, analyzing audio PCM data with beat detection and FFT, applying the preset to the audio feature data and rendering the resulting output with openGL. It can render to an openGL context or a texture. diff --git a/src/libprojectM/libprojectM.xcodeproj/project.pbxproj b/src/libprojectM/libprojectM.xcodeproj/project.pbxproj index 399178b9e..3bae57c42 100644 --- a/src/libprojectM/libprojectM.xcodeproj/project.pbxproj +++ b/src/libprojectM/libprojectM.xcodeproj/project.pbxproj @@ -908,7 +908,7 @@ GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; + GCC_OPTIMIZATION_LEVEL = 1; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "USE_THREADS=1", diff --git a/src/projectM-iTunes/iprojectM.mm b/src/projectM-iTunes/iprojectM.mm index ee2aa676a..789f3122c 100644 --- a/src/projectM-iTunes/iprojectM.mm +++ b/src/projectM-iTunes/iprojectM.mm @@ -13,14 +13,14 @@ void initProjectM( VisualPluginData * visualPluginData, std::string presetPath ) // hardcoded settings - disabled projectM::Settings settings; - settings.meshX = 100; - settings.meshY = 100; + settings.meshX = 140; + settings.meshY = 110; settings.fps = 60; settings.textureSize = 2048; // idk? settings.windowWidth = 1920; settings.windowHeight = 1280; - settings.smoothPresetDuration = 1; // seconds - settings.presetDuration = 9; // seconds + settings.smoothPresetDuration = 0.5; // seconds + settings.presetDuration = 15; // seconds settings.beatSensitivity = 3; settings.aspectCorrection = 1; settings.easterEgg = 0; // ??? diff --git a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj index 7570b775c..1fb37c5a9 100644 --- a/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj +++ b/src/projectM-sdl/SDLprojectM.xcodeproj/project.pbxproj @@ -21,9 +21,6 @@ C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215B1BF025A9001707D2 /* OpenGL.framework */; }; C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215D1BF025CF001707D2 /* CoreFoundation.framework */; }; C34521651BF025E5001707D2 /* libbz2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C345215F1BF025E5001707D2 /* libbz2.a */; }; - C34521661BF025E5001707D2 /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521601BF025E5001707D2 /* libfreetype.a */; }; - C34521671BF025E5001707D2 /* libftgl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521611BF025E5001707D2 /* libftgl.a */; }; - C34521681BF025E5001707D2 /* libGLEW.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521621BF025E5001707D2 /* libGLEW.a */; }; C34521691BF025E5001707D2 /* libpng15.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521631BF025E5001707D2 /* libpng15.a */; }; C345216A1BF025E5001707D2 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C34521641BF025E5001707D2 /* libz.a */; }; /* End PBXBuildFile section */ @@ -185,9 +182,6 @@ C345215E1BF025CF001707D2 /* CoreFoundation.framework in Frameworks */, C345215C1BF025A9001707D2 /* OpenGL.framework in Frameworks */, C34521651BF025E5001707D2 /* libbz2.a in Frameworks */, - C34521661BF025E5001707D2 /* libfreetype.a in Frameworks */, - C34521671BF025E5001707D2 /* libftgl.a in Frameworks */, - C34521681BF025E5001707D2 /* libGLEW.a in Frameworks */, C34521691BF025E5001707D2 /* libpng15.a in Frameworks */, C345216A1BF025E5001707D2 /* libz.a in Frameworks */, 1612C997207A80A200862A3A /* libprojectM.a in Frameworks */, @@ -425,7 +419,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "POUT=\"$BUILT_PRODUCTS_DIR\"/\"$CONTENTS_FOLDER_PATH/Resources/presets\"\nPIN=\"$SRCROOT\"/../../presets\n\nmkdir -p \"$POUT\"\nfor preset_dir in \"$PIN/\"*; do\n cp \"$preset_dir/\"* \"$POUT/\"\ndone\necho \"Copied presets to $POUT\""; + shellScript = "POUT=\"$BUILT_PRODUCTS_DIR\"/\"$CONTENTS_FOLDER_PATH/Resources/presets\"\nPIN=\"$SRCROOT\"/../../presets\n\nmkdir -p \"$POUT\"\nfor preset_dir in \"$PIN/\"*; do\n cp \"$preset_dir/\"* \"$POUT/\"\ndone\necho \"Copied presets to $POUT\"\n"; }; 168F715D21124CF8001806E7 /* Generate Installer Package */ = { isa = PBXShellScriptBuildPhase; @@ -595,6 +589,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; }; name = Debug; }; @@ -644,6 +639,7 @@ LIBRARY_SEARCH_PATHS = "$(SRCROOT)/../projectM-iTunes/macos/contrib"; MACOSX_DEPLOYMENT_TARGET = 10.11; MTL_ENABLE_DEBUG_INFO = NO; + OTHER_CFLAGS = "-DDATADIR_PATH='\"/usr/local/share/projectM\"'"; }; name = Release; }; diff --git a/src/projectM-sdl/pmSDL.cpp b/src/projectM-sdl/pmSDL.cpp index 26a81bde9..dd00a9173 100644 --- a/src/projectM-sdl/pmSDL.cpp +++ b/src/projectM-sdl/pmSDL.cpp @@ -336,3 +336,7 @@ void projectMSDL::renderTexture() { glDisable(GL_DEPTH_TEST); } +void projectMSDL::presetSwitchedEvent(bool isHardCut, size_t index) const { + std::string presetName = getPresetName(index); + SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Displaying preset: %s\n", presetName.c_str()); +} diff --git a/src/projectM-sdl/pmSDL.hpp b/src/projectM-sdl/pmSDL.hpp index b2d8e748a..f20e55e26 100644 --- a/src/projectM-sdl/pmSDL.hpp +++ b/src/projectM-sdl/pmSDL.hpp @@ -44,6 +44,8 @@ public: void maximize(); std::string getActivePresetName(); void addFakePCM(); + + virtual void presetSwitchedEvent(bool isHardCut, size_t index) const; private: SDL_Window *win; From fcfb8ebf905ce0bdc32e2e0c6c296a399ff6fc50 Mon Sep 17 00:00:00 2001 From: Matthew Bellew Date: Wed, 2 Jan 2019 18:30:56 -0800 Subject: [PATCH 3/3] fix bug when calling switchPreset() while a smooth transition is still in progress --- src/libprojectM/projectM.cpp | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/libprojectM/projectM.cpp b/src/libprojectM/projectM.cpp index 96e42a980..4386b6a4e 100755 --- a/src/libprojectM/projectM.cpp +++ b/src/libprojectM/projectM.cpp @@ -735,6 +735,13 @@ static void *thread_callback(void *prjm) { void projectM::switchPreset(const bool hardCut) { std::string result; + + // if we're already switching, promote the current m_activePreset2 + // see note in switchPreset() about not having too many presets allocated at once + if (m_activePreset2 != nullptr) + m_activePreset.swap(m_activePreset2); + m_activePreset2 = nullptr; + if (!hardCut) { result = switchPreset(m_activePreset2); } else { @@ -803,6 +810,17 @@ std::string projectM::switchPreset(std::unique_ptr & targetPreset) { pthread_mutex_lock(&preset_mutex); #endif try { + // NOTE SUBTLE BUG! + // MilkdropPresetFactory acts as if there can only ever be two presets allocated at a time, and so only + // allocates two PresetOutputs objects. However, this is not true. If we are in the middle of a soft transition + // already, we can have three. m_activePreset, m_activePreset2, and the one we are about to allocate() + // to avoid very strange missing objects (waves/shapes), make sure to free the targetPreset BEFORE calling allocate() + // but wait there is more... + // Just because we make sure we never have two presets allocated at once, isn't enough. We actually + // have make sure we release the first allocated preset (or both presets) to make sure we're alternating. + // Otherwise, the two allocated presets may be pointing at the same PresetOutputs object. + // CONSIDER actually allocating or ref-counting PresetOutputs, or allocating more of them or something. + targetPreset = nullptr; targetPreset = m_presetPos->allocate(); } catch (const PresetFactoryException & e) { #ifdef SYNC_PRESET_SWITCHES