Deleted lots of unused files and code.

projectM-visualizer · Apr 29, 2023 · b08a1ae · b08a1ae
1 parent 7bd470e
commit b08a1ae
Show file tree

Hide file tree

Showing 23 changed files with 41 additions and 2,393 deletions.
diff --git a/src/libprojectM/Audio/BeatDetect.cpp b/src/libprojectM/Audio/BeatDetect.cpp
@@ -26,18 +26,11 @@
  * you'll find it online
  */
 
-#include <numeric>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "wipemalloc.h"
-
 #include "BeatDetect.hpp"
 #include "PCM.hpp"
 
 #include <algorithm>
-#include <cmath>
-
+#include <numeric>
 
 namespace libprojectM {
 namespace Audio {

diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
@@ -34,9 +34,6 @@ add_library(projectM_main OBJECT
         Audio/PCM.hpp
         Audio/fftsg.cpp
         Audio/fftsg.h
-        Common.hpp
-        HungarianMethod.hpp
-        IdleTextures.hpp
         Preset.hpp
         PresetFactory.cpp
         PresetFactory.hpp
@@ -49,11 +46,7 @@ add_library(projectM_main OBJECT
         RandomNumberGenerators.hpp
         TimeKeeper.cpp
         TimeKeeper.hpp
-        fatal.h
-        glError.h
-        gltext.h
         projectM-opengl.h
-        resource.h
         wipemalloc.cpp
         wipemalloc.h
         )
@@ -176,7 +169,6 @@ if(ENABLE_CXX_INTERFACE)
     endif()
 
     install(FILES
-            Common.hpp
             Audio/PCM.hpp
             ProjectM.hpp
             DESTINATION "${PROJECTM_INCLUDE_DIR}/projectM-4"

diff --git a/src/libprojectM/Common.hpp b/src/libprojectM/Common.hpp
diff --git a/src/libprojectM/HungarianMethod.hpp b/src/libprojectM/HungarianMethod.hpp
diff --git a/src/libprojectM/MilkdropPreset/MilkdropPreset.cpp b/src/libprojectM/MilkdropPreset/MilkdropPreset.cpp
@@ -88,6 +88,8 @@ void MilkdropPreset::RenderFrame(const libprojectM::Audio::FrameAudioData& audio
     // First evaluate per-frame code
     PerFrameUpdate();
 
+    glViewport(0, 0, renderContext.viewportSizeX, renderContext.viewportSizeY);
+
     m_framebuffer.Bind(m_previousFrameBuffer);
     // Motion vector field. Drawn to the previous frame texture before warping it.
     // Only do it after drawing one frame after init or resize.

diff --git a/src/libprojectM/PresetFactoryManager.cpp b/src/libprojectM/PresetFactoryManager.cpp
@@ -11,10 +11,9 @@
 //
 #include "PresetFactoryManager.hpp"
 
-#include "Common.hpp"
-
 #include <MilkdropPreset/MilkdropPresetFactory.hpp>
 
+#include <algorithm>
 #include <cassert>
 #include <iostream>
 #include <sstream>
@@ -135,4 +134,17 @@ std::vector<std::string> PresetFactoryManager::extensionsHandled() const
         retval.push_back(element.first);
     }
     return retval;
-}
+}
+
+//CPP17: std::filesystem::path::extension
+auto PresetFactoryManager::ParseExtension(const std::string& filename) -> std::string
+{
+    const auto start = filename.find_last_of('.');
+
+    if (start == std::string::npos || start >= (filename.length() - 1)) {
+        return "";
+    }
+    std::string ext = filename.substr(start + 1, filename.length());
+    std::transform(ext.begin(), ext.end(), ext.begin(), tolower);
+    return ext;
+}
diff --git a/src/libprojectM/PresetFactoryManager.hpp b/src/libprojectM/PresetFactoryManager.hpp
@@ -80,6 +80,8 @@ class PresetFactoryManager
 private:
     void registerFactory(const std::string& extension, PresetFactory* factory);
 
+    auto ParseExtension(const std::string& filename) -> std::string;
+
     mutable std::map<std::string, PresetFactory*> m_factoryMap;
     mutable std::vector<PresetFactory*> m_factoryList;
     void ClearFactories();