Include cleanup, plus a few small code improvements.

Also removed empty FrameAudioData implementation file.
kblaschke · Feb 1, 2024 · a8c41f5 · a8c41f5
1 parent 7667a98
commit a8c41f5
Show file tree

Hide file tree

Showing 53 changed files with 86 additions and 155 deletions.
diff --git a/src/libprojectM/Audio/CMakeLists.txt b/src/libprojectM/Audio/CMakeLists.txt
@@ -3,7 +3,6 @@ add_library(Audio OBJECT
         AudioConstants.hpp
         MilkdropFFT.cpp
         MilkdropFFT.hpp
-        FrameAudioData.cpp
         FrameAudioData.hpp
         PCM.cpp
         PCM.hpp

diff --git a/src/libprojectM/Audio/FrameAudioData.cpp b/src/libprojectM/Audio/FrameAudioData.cpp
diff --git a/src/libprojectM/Audio/PCM.cpp b/src/libprojectM/Audio/PCM.cpp
@@ -1,7 +1,5 @@
 #include "PCM.hpp"
 
-#include <cassert>
-
 namespace libprojectM {
 namespace Audio {
 

diff --git a/src/libprojectM/CMakeLists.txt b/src/libprojectM/CMakeLists.txt
@@ -137,7 +137,7 @@ if(ENABLE_INSTALL)
     else()
         # Set PROJECTM_STATIC_EXPORT for C++ implementations to use project default visibility
         # and no dllimport/dllexport.
-        set_source_files_properties(ProjectM.cpp Audio/PCM.cpp Audio/FrameAudioData.cpp PROPERTIES
+        set_source_files_properties(ProjectM.cpp Audio/PCM.cpp PROPERTIES
                 COMPILE_DEFINITIONS PROJECTM_STATIC_DEFINE
                 )
         target_compile_definitions(projectM

diff --git a/src/libprojectM/MilkdropPreset/BlurTexture.cpp b/src/libprojectM/MilkdropPreset/BlurTexture.cpp
@@ -1,7 +1,6 @@
 #include "BlurTexture.hpp"
 
 #include "PerFrameContext.hpp"
-#include "PresetState.hpp"
 
 #include "MilkdropStaticShaders.hpp"
 

diff --git a/src/libprojectM/MilkdropPreset/Border.cpp b/src/libprojectM/MilkdropPreset/Border.cpp
@@ -1,7 +1,5 @@
 #include "Border.hpp"
 
-#include <glm/gtc/type_ptr.hpp>
-
 namespace libprojectM {
 namespace MilkdropPreset {
 

diff --git a/src/libprojectM/MilkdropPreset/Constants.hpp b/src/libprojectM/MilkdropPreset/Constants.hpp
@@ -4,8 +4,6 @@
  */
 #pragma once
 
-#include <Audio/AudioConstants.hpp>
-
 namespace libprojectM {
 namespace MilkdropPreset {
 

diff --git a/src/libprojectM/MilkdropPreset/CustomShape.cpp b/src/libprojectM/MilkdropPreset/CustomShape.cpp
@@ -2,9 +2,7 @@
 
 #include "PresetFileParser.hpp"
 
-#include "Renderer/TextureManager.hpp"
-
-#include <glm/gtc/type_ptr.hpp>
+#include <Renderer/TextureManager.hpp>
 
 #include <vector>
 

diff --git a/src/libprojectM/MilkdropPreset/CustomShape.hpp b/src/libprojectM/MilkdropPreset/CustomShape.hpp
@@ -4,7 +4,7 @@
 #include "PresetState.hpp"
 #include "ShapePerFrameContext.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <projectm-eval.h>
 

diff --git a/src/libprojectM/MilkdropPreset/CustomWaveform.cpp b/src/libprojectM/MilkdropPreset/CustomWaveform.cpp
@@ -2,13 +2,7 @@
 
 #include "PerFrameContext.hpp"
 #include "PresetFileParser.hpp"
-#include "projectM-opengl.h"
 
-#include <glm/gtc/type_ptr.hpp>
-
-#ifdef _WIN32
-#include <functional>
-#endif /** _WIN32 */
 #include <algorithm>
 #include <cmath>
 

diff --git a/src/libprojectM/MilkdropPreset/CustomWaveform.hpp b/src/libprojectM/MilkdropPreset/CustomWaveform.hpp
@@ -3,7 +3,7 @@
 #include "WaveformPerFrameContext.hpp"
 #include "WaveformPerPointContext.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <vector>
 

diff --git a/src/libprojectM/MilkdropPreset/DarkenCenter.hpp b/src/libprojectM/MilkdropPreset/DarkenCenter.hpp
@@ -2,7 +2,7 @@
 
 #include "PresetState.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 namespace libprojectM {
 namespace MilkdropPreset {

diff --git a/src/libprojectM/MilkdropPreset/Factory.cpp b/src/libprojectM/MilkdropPreset/Factory.cpp
@@ -1,15 +1,3 @@
-//
-// C++ Implementation: MilkdropPresetFactory
-//
-// Description:
-//
-//
-// Author: Carmelo Piccione <carmelo.piccione@gmail.com>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-//
 #include "Factory.hpp"
 
 #include "IdlePreset.hpp"
@@ -22,7 +10,7 @@ std::unique_ptr<::libprojectM::Preset> Factory::LoadPresetFromFile(const std::st
 {
     std::string path;
     auto protocol = PresetFactory::Protocol(filename, path);
-    if (protocol == PresetFactory::IDLE_PRESET_PROTOCOL)
+    if (protocol == "idle")
     {
         return IdlePresets::allocate();
     }

diff --git a/src/libprojectM/MilkdropPreset/Filters.cpp b/src/libprojectM/MilkdropPreset/Filters.cpp
@@ -1,7 +1,5 @@
 #include "Filters.hpp"
 
-#include "projectM-opengl.h"
-
 namespace libprojectM {
 namespace MilkdropPreset {
 

diff --git a/src/libprojectM/MilkdropPreset/FinalComposite.cpp b/src/libprojectM/MilkdropPreset/FinalComposite.cpp
@@ -4,6 +4,10 @@
 
 #include <cstddef>
 
+#ifdef MILKDROP_PRESET_DEBUG
+#include <iostream>
+#endif
+
 namespace libprojectM {
 namespace MilkdropPreset {
 

diff --git a/src/libprojectM/MilkdropPreset/IdlePreset.cpp b/src/libprojectM/MilkdropPreset/IdlePreset.cpp
@@ -1,5 +1,7 @@
 #include "IdlePreset.hpp"
+
 #include "MilkdropPreset.hpp"
+
 #include <sstream>
 #include <string>
 

diff --git a/src/libprojectM/MilkdropPreset/MilkdropShader.hpp b/src/libprojectM/MilkdropPreset/MilkdropShader.hpp
@@ -8,8 +8,9 @@
 #pragma once
 
 #include "BlurTexture.hpp"
-#include "Renderer/Shader.hpp"
-#include "Renderer/TextureManager.hpp"
+
+#include <Renderer/Shader.hpp>
+#include <Renderer/TextureManager.hpp>
 
 #include <array>
 #include <set>

diff --git a/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in b/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.cpp.in
@@ -1,6 +1,6 @@
 #include "MilkdropStaticShaders.hpp"
 
-#include "projectM-opengl.h"
+#include <projectM-opengl.h>
 
 #include <cstring>
 #include <stdexcept>

diff --git a/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.hpp.in b/src/libprojectM/MilkdropPreset/MilkdropStaticShaders.hpp.in
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "GLSLGenerator.h"
+#include <GLSLGenerator.h>
 
-#include "Renderer/Shader.hpp"
+#include <Renderer/Shader.hpp>
 
 #include <memory>
 

diff --git a/src/libprojectM/MilkdropPreset/MotionVectors.cpp b/src/libprojectM/MilkdropPreset/MotionVectors.cpp
@@ -1,6 +1,6 @@
 #include "MotionVectors.hpp"
 
-#include <MilkdropStaticShaders.hpp>
+#include "MilkdropStaticShaders.hpp"
 
 #include <Renderer/TextureManager.hpp>
 

diff --git a/src/libprojectM/MilkdropPreset/MotionVectors.hpp b/src/libprojectM/MilkdropPreset/MotionVectors.hpp
@@ -3,7 +3,7 @@
 #include "PerFrameContext.hpp"
 #include "PresetState.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <memory>
 

diff --git a/src/libprojectM/MilkdropPreset/PerPixelMesh.cpp b/src/libprojectM/MilkdropPreset/PerPixelMesh.cpp
@@ -1,15 +1,18 @@
 #include "PerPixelMesh.hpp"
 
 #include "MilkdropShader.hpp"
+#include "MilkdropStaticShaders.hpp"
 #include "PerFrameContext.hpp"
 #include "PerPixelContext.hpp"
 #include "PresetState.hpp"
 
-#include <MilkdropStaticShaders.hpp>
-
 #include <algorithm>
 #include <cmath>
 
+#ifdef MILKDROP_PRESET_DEBUG
+#include <iostream>
+#endif
+
 namespace libprojectM {
 namespace MilkdropPreset {
 

diff --git a/src/libprojectM/MilkdropPreset/PresetState.cpp b/src/libprojectM/MilkdropPreset/PresetState.cpp
@@ -1,8 +1,9 @@
 #include "PresetState.hpp"
 
+#include "MilkdropStaticShaders.hpp"
 #include "PresetFileParser.hpp"
 
-#include <MilkdropStaticShaders.hpp>
+#include <glm/gtc/matrix_transform.hpp>
 
 #include <random>
 

diff --git a/src/libprojectM/MilkdropPreset/PresetState.hpp b/src/libprojectM/MilkdropPreset/PresetState.hpp
@@ -17,8 +17,6 @@
 
 #include <projectm-eval.h>
 
-#include <glm/gtc/matrix_transform.hpp>
-
 #include <string>
 
 namespace libprojectM {

diff --git a/src/libprojectM/MilkdropPreset/VideoEcho.cpp b/src/libprojectM/MilkdropPreset/VideoEcho.cpp
@@ -1,7 +1,5 @@
 #include "VideoEcho.hpp"
 
-#include <glm/gtc/type_ptr.hpp>
-
 namespace libprojectM {
 namespace MilkdropPreset {
 

diff --git a/src/libprojectM/MilkdropPreset/VideoEcho.hpp b/src/libprojectM/MilkdropPreset/VideoEcho.hpp
@@ -3,7 +3,7 @@
 #include "PerFrameContext.hpp"
 #include "PresetState.hpp"
 
-#include "projectM-opengl.h"
+#include <projectM-opengl.h>
 
 #include <Renderer/RenderItem.hpp>
 

diff --git a/src/libprojectM/MilkdropPreset/Waveform.cpp b/src/libprojectM/MilkdropPreset/Waveform.cpp
@@ -5,9 +5,9 @@
 
 #include "Waveforms/Factory.hpp"
 
-#include "projectM-opengl.h"
+#include <projectM-opengl.h>
 
-#include "Audio/AudioConstants.hpp"
+#include <Audio/AudioConstants.hpp>
 
 #include <algorithm>
 #include <cmath>

diff --git a/src/libprojectM/MilkdropPreset/Waveform.hpp b/src/libprojectM/MilkdropPreset/Waveform.hpp
@@ -5,7 +5,7 @@
 
 #include "Waveforms/WaveformMath.hpp"
 
-#include "Renderer/RenderItem.hpp"
+#include <Renderer/RenderItem.hpp>
 
 #include <memory>
 #include <vector>

diff --git a/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp b/src/libprojectM/MilkdropPreset/Waveforms/CenteredSpiro.cpp
@@ -1,5 +1,7 @@
 #include "CenteredSpiro.hpp"
 
+#include <Audio/AudioConstants.hpp>
+
 namespace libprojectM {
 namespace MilkdropPreset {
 namespace Waveforms {

diff --git a/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp b/src/libprojectM/MilkdropPreset/Waveforms/LineBase.cpp
@@ -1,5 +1,7 @@
 #include "LineBase.hpp"
 
+#include <Audio/AudioConstants.hpp>
+
 #include <cmath>
 
 namespace libprojectM {

diff --git a/src/libprojectM/Preset.hpp b/src/libprojectM/Preset.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "Audio/FrameAudioData.hpp"
+#include <Audio/FrameAudioData.hpp>
 
-#include "Renderer/RenderContext.hpp"
-#include "Renderer/Texture.hpp"
+#include <Renderer/RenderContext.hpp>
+#include <Renderer/Texture.hpp>
 
+#include <memory>
 #include <string>
 
 namespace libprojectM {
@@ -51,7 +52,7 @@ class Preset
         m_filename = filename;
     }
 
-    inline const std::string& Filename() const
+    inline auto Filename() const -> const std::string&
     {
         return m_filename;
     }

diff --git a/src/libprojectM/PresetFactory.cpp b/src/libprojectM/PresetFactory.cpp
@@ -6,8 +6,6 @@
 
 namespace libprojectM {
 
-const std::string PresetFactory::IDLE_PRESET_PROTOCOL("idle");
-
 std::string PresetFactory::Protocol(const std::string& url, std::string& path)
 {
     auto pos = url.find("://");

diff --git a/src/libprojectM/PresetFactory.hpp b/src/libprojectM/PresetFactory.hpp
@@ -10,8 +10,6 @@ class PresetFactory
 {
 
 public:
-    static const std::string IDLE_PRESET_PROTOCOL; //!< The string "idle"
-
     PresetFactory() = default;
 
     virtual ~PresetFactory() = default;

diff --git a/src/libprojectM/PresetFactoryManager.cpp b/src/libprojectM/PresetFactoryManager.cpp
@@ -1,14 +1,3 @@
-//
-// C++ Implementation: PresetFactoryManager
-//
-// Description:
-//
-//
-// Author: Carmelo Piccione <carmelo.piccione@gmail.com>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
 #include "PresetFactoryManager.hpp"
 
 #include <MilkdropPreset/Factory.hpp>

diff --git a/src/libprojectM/ProjectM.cpp b/src/libprojectM/ProjectM.cpp
@@ -25,12 +25,12 @@
 #include "PresetFactoryManager.hpp"
 #include "TimeKeeper.hpp"
 
-#include "Audio/PCM.hpp" //Sound data handler (buffering, FFT, etc.)
+#include <Audio/PCM.hpp>
 
-#include "Renderer/CopyTexture.hpp"
-#include "Renderer/PresetTransition.hpp"
-#include "Renderer/TextureManager.hpp"
-#include "Renderer/TransitionShaderManager.hpp"
+#include <Renderer/CopyTexture.hpp>
+#include <Renderer/PresetTransition.hpp>
+#include <Renderer/TextureManager.hpp>
+#include <Renderer/TransitionShaderManager.hpp>
 
 namespace libprojectM {