Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[3.5 | Switch] Separate the Audren driver into its own directory #3

Merged
merged 1 commit into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions drivers/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ SConscript("windows/SCsub")

# Sounds drivers
SConscript("alsa/SCsub")
if env["platform"] == "switch":
SConscript("audren/SCsub")
SConscript("coreaudio/SCsub")
SConscript("pulseaudio/SCsub")
if env["platform"] == "windows":
Expand Down
6 changes: 6 additions & 0 deletions drivers/audren/SCsub
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env python

Import("env")

# Driver source files
env.add_source_files(env.drivers_sources, "audio_driver_audren.cpp")
halotroop2288 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**************************************************************************/
/* audio_driver_switch.cpp */
/* audio_driver_audren.cpp */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Expand Down Expand Up @@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/

#include "audio_driver_switch.h"
#include "audio_driver_audren.h"

#include "core/os/os.h"
#include "core/project_settings.h"
Expand All @@ -45,7 +45,7 @@ static const AudioRendererConfig arConfig = {
.num_mix_buffers = 2,
};

Error AudioDriverSwitch::init_device() {
Error AudioDriverAudren::init_device() {
int latency = GLOBAL_GET("audio/output_latency");
mix_rate = GLOBAL_GET("audio/mix_rate");
channels = 2;
Expand Down Expand Up @@ -98,21 +98,21 @@ Error AudioDriverSwitch::init_device() {
return OK;
}

Error AudioDriverSwitch::init() {
Error AudioDriverAudren::init() {
active = false;
thread_exited = false;
exit_thread = false;

Error err = init_device();
if (err == OK) {
thread.start(AudioDriverSwitch::thread_func, this);
thread.start(AudioDriverAudren::thread_func, this);
}

return err;
}

void AudioDriverSwitch::thread_func(void *p_udata) {
AudioDriverSwitch *ad = (AudioDriverSwitch *)p_udata;
void AudioDriverAudren::thread_func(void *p_udata) {
AudioDriverAudren *ad = (AudioDriverAudren *)p_udata;

svcSetThreadPriority(CUR_THREAD_HANDLE, 0x2B);

Expand Down Expand Up @@ -168,54 +168,54 @@ void AudioDriverSwitch::thread_func(void *p_udata) {
ad->thread_exited = true;
}

void AudioDriverSwitch::start() {
void AudioDriverAudren::start() {
active = true;
}

int AudioDriverSwitch::get_mix_rate() const {
int AudioDriverAudren::get_mix_rate() const {
return mix_rate;
}

AudioDriver::SpeakerMode AudioDriverSwitch::get_speaker_mode() const {
AudioDriver::SpeakerMode AudioDriverAudren::get_speaker_mode() const {
return speaker_mode;
}

Array AudioDriverSwitch::get_device_list() {
Array AudioDriverAudren::get_device_list() {
Array list;
list.push_back("Default");
return list;
}

String AudioDriverSwitch::get_device() {
String AudioDriverAudren::get_device() {
return device_name;
}

void AudioDriverSwitch::set_device(String device) {
void AudioDriverAudren::set_device(String device) {
lock();
new_device = device;
unlock();
}

void AudioDriverSwitch::lock() {
void AudioDriverAudren::lock() {
mutex.lock();
}

void AudioDriverSwitch::unlock() {
void AudioDriverAudren::unlock() {
mutex.unlock();
}

void AudioDriverSwitch::finish() {
void AudioDriverAudren::finish() {
exit_thread = true;
thread.wait_to_finish();

audrvClose(&audren_driver);
audrenExit();
}

AudioDriverSwitch::AudioDriverSwitch() :
AudioDriverAudren::AudioDriverAudren() :
device_name("Default"),
new_device("Default") {
}

AudioDriverSwitch::~AudioDriverSwitch() {
AudioDriverAudren::~AudioDriverAudren() {
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**************************************************************************/
/* audio_driver_switch.h */
/* audio_driver_audren.h */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
Expand Down Expand Up @@ -28,13 +28,17 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/

#pragma once
#ifndef AUDIO_DRIVER_AUDREN_H
#define AUDIO_DRIVER_AUDREN_H

#include "servers/audio_server.h"
#include "switch_wrapper.h"

#include "core/os/mutex.h"
#include "core/os/thread.h"

class AudioDriverSwitch : public AudioDriver {
class AudioDriverAudren : public AudioDriver {
Thread thread;
Mutex mutex;

Expand Down Expand Up @@ -79,6 +83,8 @@ class AudioDriverSwitch : public AudioDriver {
virtual void unlock();
virtual void finish();

AudioDriverSwitch();
~AudioDriverSwitch();
AudioDriverAudren();
~AudioDriverAudren();
};

#endif // !AUDIO_DRIVER_AUDREN_H
1 change: 0 additions & 1 deletion platform/switch/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ files = [
"os_switch.cpp",
"power_switch.cpp",
"joypad_switch.cpp",
"audio_driver_switch.cpp",
"context_gl_switch_egl.cpp",
]

Expand Down
2 changes: 1 addition & 1 deletion platform/switch/os_switch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ OS_Switch::OS_Switch() {
input = nullptr;
power_manager = nullptr;
gl_context = nullptr;
AudioDriverManager::add_driver(&driver_switch);
AudioDriverManager::add_driver(&driver_audren);

swkbdInlineCreate(&inline_keyboard);
}
4 changes: 2 additions & 2 deletions platform/switch/os_switch.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/

#include "audio_driver_switch.h"
#include "context_gl_switch_egl.h"
#include "core/os/input.h"
#include "core/os/os.h"
#include "drivers/audren/audio_driver_audren.h"
#include "joypad_switch.h"
#include "main/input_default.h"
#include "power_switch.h"
Expand All @@ -46,7 +46,7 @@ class OS_Switch : public OS {
PowerSwitch *power_manager;
ContextGLSwitchEGL *gl_context;
JoypadSwitch *joypad;
AudioDriverSwitch driver_switch;
AudioDriverAudren driver_audren;
String switch_execpath;

SwkbdInline inline_keyboard;
Expand Down
Loading