Move FileParser to main directory.

Makes it easier to reuse for loading sprites.

Author: kblaschke

src/libprojectM/CMakeLists.txt

@@ -17,6 +17,8 @@ add_library(projectM_main OBJECT
         PresetFactory.hpp
         PresetFactoryManager.cpp
         PresetFactoryManager.hpp
+        PresetFileParser.cpp
+        PresetFileParser.hpp
         ProjectM.cpp
         ProjectM.hpp
         ProjectMCWrapper.cpp

src/libprojectM/MilkdropPreset/CMakeLists.txt

@@ -75,8 +75,6 @@ add_library(MilkdropPreset OBJECT
         PerPixelContext.hpp
         PerPixelMesh.cpp
         PerPixelMesh.hpp
-        PresetFileParser.cpp
-        PresetFileParser.hpp
         PresetState.cpp
         PresetState.hpp
         ShapePerFrameContext.cpp

src/libprojectM/MilkdropPreset/CustomShape.cpp

@@ -72,7 +72,7 @@ void CustomShape::InitVertexAttrib()
     glBufferData(GL_ARRAY_BUFFER, sizeof(Point) * vertexData.size(), vertexData.data(), GL_STREAM_DRAW);
 }
 
-void CustomShape::Initialize(PresetFileParser& parsedFile, int index)
+void CustomShape::Initialize(::libprojectM::PresetFileParser& parsedFile, int index)
 {
     std::string const shapecodePrefix = "shapecode_" + std::to_string(index) + "_";
 

src/libprojectM/MilkdropPreset/CustomShape.hpp

@@ -33,7 +33,7 @@ class CustomShape : public Renderer::RenderItem
      * @param parsedFile The file parser with the preset data.
      * @param index The waveform index.
      */
-    void Initialize(PresetFileParser& parsedFile, int index);
+    void Initialize(::libprojectM::PresetFileParser& parsedFile, int index);
 
     /**
      * @brief Compiles all code blocks and runs the init expression.

src/libprojectM/MilkdropPreset/CustomWaveform.cpp

@@ -36,7 +36,7 @@ void CustomWaveform::InitVertexAttrib()
     glBufferData(GL_ARRAY_BUFFER, sizeof(ColoredPoint) * vertexData.size(), vertexData.data(), GL_STREAM_DRAW);
 }
 
-void CustomWaveform::Initialize(PresetFileParser& parsedFile, int index)
+void CustomWaveform::Initialize(::libprojectM::PresetFileParser& parsedFile, int index)
 {
     std::string const wavecodePrefix = "wavecode_" + std::to_string(index) + "_";
     std::string const wavePrefix = "wave_" + std::to_string(index) + "_";

src/libprojectM/MilkdropPreset/CustomWaveform.hpp

@@ -8,10 +8,11 @@
 #include <vector>
 
 namespace libprojectM {
-namespace MilkdropPreset {
 
 class PresetFileParser;
 
+namespace MilkdropPreset {
+
 class CustomWaveform : public Renderer::RenderItem
 {
 public:
@@ -32,7 +33,7 @@ class CustomWaveform : public Renderer::RenderItem
      * @param parsedFile The file parser with the preset data.
      * @param index The waveform index.
      */
-    void Initialize(PresetFileParser& parsedFile, int index);
+    void Initialize(::libprojectM::PresetFileParser& parsedFile, int index);
 
     /**
      * @brief Compiles all code blocks and runs the init expression.

src/libprojectM/MilkdropPreset/MilkdropPreset.cpp

@@ -207,7 +207,7 @@ void MilkdropPreset::Load(const std::string& pathname)
 
     SetFilename(ParseFilename(pathname));
 
-    PresetFileParser parser;
+    ::libprojectM::PresetFileParser parser;
 
     if (!parser.Read(pathname))
     {
@@ -226,7 +226,7 @@ void MilkdropPreset::Load(std::istream& stream)
     std::cerr << "[Preset] Loading preset from stream." << std::endl;
 #endif
 
-    PresetFileParser parser;
+    ::libprojectM::PresetFileParser parser;
 
     if (!parser.Read(stream))
     {
@@ -239,7 +239,7 @@ void MilkdropPreset::Load(std::istream& stream)
     InitializePreset(parser);
 }
 
-void MilkdropPreset::InitializePreset(PresetFileParser& parsedFile)
+void MilkdropPreset::InitializePreset(::libprojectM::PresetFileParser& parsedFile)
 {
     // Create the offscreen rendering surfaces.
     m_motionVectorUVMap = std::make_shared<Renderer::TextureAttachment>(GL_RG16F, GL_RG, GL_FLOAT, 0, 0);

src/libprojectM/MilkdropPreset/MilkdropPreset.hpp

@@ -45,10 +45,11 @@
 #include <string>
 
 namespace libprojectM {
+class PresetFileParser;
+
 namespace MilkdropPreset {
 
 class Factory;
-class PresetFileParser;
 
 class MilkdropPreset : public ::libprojectM::Preset
 {
@@ -93,7 +94,7 @@ class MilkdropPreset : public ::libprojectM::Preset
 
     void Load(std::istream& stream);
 
-    void InitializePreset(PresetFileParser& parsedFile);
+    void InitializePreset(::libprojectM::PresetFileParser& parsedFile);
 
     void CompileCodeAndRunInitExpressions();
 

src/libprojectM/MilkdropPreset/PresetState.cpp

@@ -33,7 +33,7 @@ PresetState::~PresetState()
     projectm_eval_memory_buffer_destroy(globalMemory);
 }
 
-void PresetState::Initialize(PresetFileParser& parsedFile)
+void PresetState::Initialize(::libprojectM::PresetFileParser& parsedFile)
 {
 
     // General:

src/libprojectM/MilkdropPreset/PresetState.hpp

@@ -20,10 +20,12 @@
 #include <string>
 
 namespace libprojectM {
-namespace MilkdropPreset {
 
 class PresetFileParser;
 
+namespace MilkdropPreset {
+
+
 using BlendableFloat = float; //!< Currently a placeholder to mark blendable values.
 
 /**
@@ -43,7 +45,7 @@ class PresetState
      * @brief Loads the initial values and code from the preset file.
      * @param parsedFile The file parser with the preset data.
      */
-    void Initialize(PresetFileParser& parsedFile);
+    void Initialize(::libprojectM::PresetFileParser& parsedFile);
 
     /**
      * @brief Loads or compiles the generic shaders.