core/deps.cmake

@@ -27,6 +27,4 @@ CPMAddPackage("gh:nothings/stb#8cfb1605c02aee9fb6eb5d8ea559017745bd9a16") # 2.14
 CPMAddPackage("gh:WohlSoft/LuaJIT#a5da8f4a31972b74254f00969111b8b7a07cf584") # v2.1
 set(LUAJIT_INCLUDE_DIRS ${LuaJIT_SOURCE_DIR}/src)
 
-CPMAddPackage("gh:mackron/miniaudio#0.11.22")
-
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PREV_BIN_PATH})

editor/CMakeLists.txt

@@ -37,7 +37,7 @@ set(PROJECT_SOURCES
 
 qt_add_executable(editor MANUAL_FINALIZATION ${PROJECT_SOURCES})
 target_include_directories(editor PRIVATE .)
-target_link_libraries(editor PRIVATE openblocks Qt6::Widgets Qt6::OpenGLWidgets ${QSCINTILLA_LIBRARY} miniaudio)
+target_link_libraries(editor PRIVATE openblocks Qt6::Widgets Qt6::OpenGLWidgets ${QSCINTILLA_LIBRARY})
 
 set_target_properties(editor PROPERTIES
     WIN32_EXECUTABLE ON

editor/main.cpp

@@ -9,16 +9,13 @@
 #include <QSurfaceFormat>
 #include <qfont.h>
 #include <qsurfaceformat.h>
-#include <miniaudio.h>
-
-ma_engine miniaudio;
 
 int main(int argc, char *argv[])
 {
     QSurfaceFormat format;
     format.setSamples(4);
-    format.setRenderableType(QSurfaceFormat::OpenGL);
+    // TODO: This is broken for some reason on Linux, Qt refuses to use any version newer than 3.2. Figure out why
-    format.setVersion(3, 3);
+    // format.setVersion(3, 3);
     format.setProfile(QSurfaceFormat::CompatibilityProfile); // Valid only in OpenGL 3.2+, see: https://stackoverflow.com/a/70519392/16255372
     QSurfaceFormat::setDefaultFormat(format);
 
@@ -26,17 +23,10 @@ int main(int argc, char *argv[])
 
     Logger::init();
 
-    ma_result res = ma_engine_init(NULL, &miniaudio);
-    if (res != MA_SUCCESS) {
-        Logger::fatalErrorf("Failed to initialize Miniaudio withe error [%d]", res);
-        panic();
-    }
-
     MainWindow w;
     w.show();
     int result = a.exec();
 
-    ma_engine_uninit(&miniaudio);
     Logger::finish();
     return result;
 }

editor/mainglwidget.cpp

@@ -2,8 +2,8 @@
 #include <glm/common.hpp>
 #include <glm/vector_relational.hpp>
 #include <memory>
-#include <miniaudio.h>
 #include <qnamespace.h>
+#include <qsoundeffect.h>
 #include <string>
 #include "./ui_mainwindow.h"
 #include "mainglwidget.h"
@@ -45,10 +45,12 @@ void MainGLWidget::initializeGL() {
     renderInit(width(), height());
 }
 
-extern ma_engine miniaudio;
 inline void playSound(QString path) {
-    ma_engine_stop(&miniaudio);
+    return; // TODO: Fix pulseaudio bug causing stutters
-    ma_engine_play_sound(&miniaudio, path.toStdString().c_str(), NULL);
+    QSoundEffect *sound = new QSoundEffect;
+    sound->setSource(QUrl::fromLocalFile(path));
+    sound->play();
+    sound->connect(sound, &QSoundEffect::playingChanged, [=]() { /* Thank you QSound source code! */ sound->deleteLater(); return false; });
 }
 
 extern int vpx, vpy;

editor/mainwindow.cpp

@@ -20,13 +20,13 @@
 #include <qmessagebox.h>
 #include <qmimedata.h>
 #include <qnamespace.h>
+#include <qsoundeffect.h>
 #include <qstylefactory.h>
 #include <qstylehints.h>
 #include <qmdisubwindow.h>
 #include <pugixml.hpp>
 #include <qtextcursor.h>
 #include <qtextedit.h>
-#include <miniaudio.h>
 #include <vector>
 
 #ifdef _NDEBUG
@@ -58,9 +58,12 @@ void logQtMessage(QtMsgType type, const QMessageLogContext &context, const QStri
     // if (defaultMessageHandler) defaultMessageHandler(type, context, msg);
 }
 
-extern ma_engine miniaudio;
 inline void playSound(QString path) {
-    ma_engine_play_sound(&miniaudio, path.toStdString().c_str(), NULL);
+    return; // TODO: Fix pulseaudio bug causing stutters
+    QSoundEffect *sound = new QSoundEffect;
+    sound->setSource(QUrl::fromLocalFile(path));
+    sound->play();
+    sound->connect(sound, &QSoundEffect::playingChanged, [=]() { /* Thank you QSound source code! */ sound->deleteLater(); return false; });
 }
 
 MainWindow::MainWindow(QWidget *parent)