Merge branch 'refs/heads/dev'

This commit is contained in:
SimoneN64
2024-05-25 18:47:28 +02:00
4 changed files with 4 additions and 2 deletions

View File

@@ -1,5 +1,6 @@
#include <Audio.hpp>
#include <log.hpp>
#include <SDL2/SDL.h>
namespace n64 {
#define AUDIO_SAMPLE_RATE 44100

View File

@@ -1,6 +1,6 @@
#pragma once
#include <MemoryHelpers.hpp>
#include <SDL2/SDL.h>
#include <SDL2/SDL_audio.h>
namespace n64 {
struct AudioDevice {

View File

@@ -2,6 +2,7 @@
#include <RenderWidget.hpp>
#include <ParallelRDPWrapper.hpp>
#include "Audio.hpp"
#include <SDL2/SDL.h>
EmuThread::EmuThread(std::unique_ptr<QtInstanceFactory>&& instance_, std::unique_ptr<Vulkan::WSIPlatform>&& wsiPlatform_, std::unique_ptr<ParallelRDP::WindowInfo>&& windowInfo_, SettingsWindow& settings) noexcept
: instance(std::move(instance_)), wsiPlatform(std::move(wsiPlatform_)),

View File

@@ -4,7 +4,7 @@
#include <Core.hpp>
#include <SettingsWindow.hpp>
#include <memory>
#include <SDL2/SDL.h>
#include <SDL2/SDL_gamecontroller.h>
class EmuThread : public QThread
{