diff --git a/src/projectM-engine/PresetMerge.cpp b/src/projectM-engine/PresetMerge.cpp new file mode 100644 index 000000000..7aa9698e7 --- /dev/null +++ b/src/projectM-engine/PresetMerge.cpp @@ -0,0 +1,6 @@ +#include "PresetMerge.hpp" + +void PresetMerger::MergePresets(PresetOutputs *A, const PresetOutputs *B, double ratio) +{ + return; +} diff --git a/src/projectM-engine/PresetMerge.hpp b/src/projectM-engine/PresetMerge.hpp new file mode 100644 index 000000000..86b0418ba --- /dev/null +++ b/src/projectM-engine/PresetMerge.hpp @@ -0,0 +1,12 @@ +#ifndef PRESET_MERGE_HPP +#define PRESET_MERGE_HPP +#include "Preset.hpp" + +class PresetMerger +{ +public: + void MergePresets(PresetOutputs *A, const PresetOutputs *B, double ratio); + +}; + +#endif diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp index cfdf0a2f8..6cbeea6f5 100644 --- a/src/projectM-engine/Renderer.cpp +++ b/src/projectM-engine/Renderer.cpp @@ -156,7 +156,7 @@ void Renderer::RenderFrame(PresetOutputs *presetOutputs, PresetInputs *presetInp draw_custom_waves(presetOutputs); draw_waveform(presetOutputs, presetInputs); if(presetOutputs->bDarkenCenter)darken_center(); - // draw_borders(presetOutputs); //draw borders + draw_borders(presetOutputs); //draw borders /** Restore original view state */ glMatrixMode( GL_MODELVIEW );