Merge pull request #897 from Daft-Freak/pico-presto
pico: Presto + QwST Pad
diff --git a/.vscode/cmake-kits.json b/.vscode/cmake-kits.json
index 8f3d667..aa8519e 100644
--- a/.vscode/cmake-kits.json
+++ b/.vscode/cmake-kits.json
@@ -1,6 +1,14 @@
[
- {
- "name": "32Blit",
- "toolchainFile": "${workspaceFolder}/32blit.toolchain"
- }
+ {
+ "name": "32Blit",
+ "toolchainFile": "${workspaceFolder}/32blit.toolchain"
+ },
+ {
+ "name": "32Blit-Pico",
+ "toolchainFile": "${workspaceFolder}/pico.toolchain"
+ },
+ {
+ "name": "32Blit-Pico2",
+ "toolchainFile": "${workspaceFolder}/pico2.toolchain"
+ }
]
diff --git a/32blit/32blit.hpp b/32blit/32blit.hpp
index 70c06b3..6849ad5 100644
--- a/32blit/32blit.hpp
+++ b/32blit/32blit.hpp
@@ -9,7 +9,6 @@
#include "engine/input.hpp"
#include "engine/menu.hpp"
#include "engine/multiplayer.hpp"
-#include "engine/output.hpp"
#include "engine/particle.hpp"
#include "engine/profiler.hpp"
#include "engine/running_average.hpp"
diff --git a/32blit/CMakeLists.txt b/32blit/CMakeLists.txt
index 1df5826..8524813 100644
--- a/32blit/CMakeLists.txt
+++ b/32blit/CMakeLists.txt
@@ -6,7 +6,6 @@
engine/api.cpp
engine/input.cpp
engine/multiplayer.cpp
- engine/output.cpp
engine/particle.cpp
engine/profiler.cpp
engine/running_average.cpp
diff --git a/32blit/audio/mp3-stream.cpp b/32blit/audio/mp3-stream.cpp
index 239f0e3..0b498c1 100644
--- a/32blit/audio/mp3-stream.cpp
+++ b/32blit/audio/mp3-stream.cpp
@@ -18,6 +18,9 @@
MP3Stream::~MP3Stream() {
delete static_cast<mp3dec_t *>(mp3dec);
+
+ if(!file.get_ptr())
+ delete[] file_buffer;
}
bool MP3Stream::load(std::string filename, bool do_duration_calc) {
@@ -87,7 +90,6 @@
blit::channels[channel].user_data = this;
blit::channels[channel].wave_buffer_callback = &MP3Stream::static_callback;
- blit::channels[channel].adsr = 0xFFFF00;
blit::channels[channel].trigger_sustain();
}
diff --git a/32blit/engine/output.cpp b/32blit/engine/output.cpp
deleted file mode 100644
index 054aaaa..0000000
--- a/32blit/engine/output.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! \file output.cpp
- \brief Output handlers
-*/
-#include "output.hpp"
\ No newline at end of file
diff --git a/32blit/engine/output.hpp b/32blit/engine/output.hpp
deleted file mode 100644
index a42cd2f..0000000
--- a/32blit/engine/output.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "../graphics/surface.hpp"
-#include <cstdint>
\ No newline at end of file
diff --git a/vs/32blit/32blit.vcxproj b/vs/32blit/32blit.vcxproj
index f455af8..b879c19 100644
--- a/vs/32blit/32blit.vcxproj
+++ b/vs/32blit/32blit.vcxproj
@@ -153,7 +153,6 @@
<ClInclude Include="..\..\32blit\engine\engine.hpp" />
<ClInclude Include="..\..\32blit\engine\file.hpp" />
<ClInclude Include="..\..\32blit\engine\input.hpp" />
- <ClInclude Include="..\..\32blit\engine\output.hpp" />
<ClInclude Include="..\..\32blit\engine\particle.hpp" />
<ClInclude Include="..\..\32blit\engine\save.hpp" />
<ClInclude Include="..\..\32blit\engine\timer.hpp" />
@@ -184,7 +183,6 @@
<ClCompile Include="..\..\32blit\engine\engine.cpp" />
<ClCompile Include="..\..\32blit\engine\file.cpp" />
<ClCompile Include="..\..\32blit\engine\input.cpp" />
- <ClCompile Include="..\..\32blit\engine\output.cpp" />
<ClCompile Include="..\..\32blit\engine\particle.cpp" />
<ClCompile Include="..\..\32blit\engine\save.cpp" />
<ClCompile Include="..\..\32blit\engine\timer.cpp" />
@@ -213,4 +211,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/vs/32blit/32blit.vcxproj.filters b/vs/32blit/32blit.vcxproj.filters
index 54a5e4c..4bf4054 100644
--- a/vs/32blit/32blit.vcxproj.filters
+++ b/vs/32blit/32blit.vcxproj.filters
@@ -42,9 +42,6 @@
<ClInclude Include="..\..\32blit\engine\input.hpp">
<Filter>engine</Filter>
</ClInclude>
- <ClInclude Include="..\..\32blit\engine\output.hpp">
- <Filter>engine</Filter>
- </ClInclude>
<ClInclude Include="..\..\32blit\engine\particle.hpp">
<Filter>engine</Filter>
</ClInclude>
@@ -122,9 +119,6 @@
<ClCompile Include="..\..\32blit\engine\input.cpp">
<Filter>engine</Filter>
</ClCompile>
- <ClCompile Include="..\..\32blit\engine\output.cpp">
- <Filter>engine</Filter>
- </ClCompile>
<ClCompile Include="..\..\32blit\engine\particle.cpp">
<Filter>engine</Filter>
</ClCompile>
@@ -198,4 +192,4 @@
<Filter>engine</Filter>
</ClCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
