fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Misc] Fixed some issues during compilation process on Linux

Browse Source
This commit is contained in:
Gliniak
2025-01-07 22:53:54 +01:00
parent 57eeed86b7
commit 7437c020d6
7 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/apu/audio_media_player.cc
View File

@@ -451,7 +451,7 @@ void AudioMediaPlayer::RemovePlaylist(uint32_t handle) {
X_STATUS AudioMediaPlayer::SetVolume(float volume) {
volume_ = std::min(volume, 1.0f);
std::unique_lock<xe::xe_fast_mutex> guard(driver_mutex_);
std::unique_lock<xe_mutex> guard(driver_mutex_);
if (!driver_) {
return X_STATUS_UNSUCCESSFUL;
}
@@ -517,7 +517,7 @@ void AudioMediaPlayer::ProcessAudioBuffer(std::vector<float>* buffer) {
bool AudioMediaPlayer::SetupDriver(uint32_t sample_rate, uint32_t channels) {
DeleteDriver();
std::unique_lock<xe::xe_fast_mutex> guard(driver_mutex_);
std::unique_lock<xe_mutex> guard(driver_mutex_);
driver_semaphore_ = xe::threading::Semaphore::Create(
AudioSystem::kMaximumQueuedFrames, AudioSystem::kMaximumQueuedFrames);
@@ -543,7 +543,7 @@ bool AudioMediaPlayer::SetupDriver(uint32_t sample_rate, uint32_t channels) {
}
void AudioMediaPlayer::DeleteDriver() {
std::unique_lock<xe::xe_fast_mutex> guard(driver_mutex_);
std::unique_lock<xe_mutex> guard(driver_mutex_);
if (driver_) {
if (driver_semaphore_) {
driver_semaphore_.reset();

2
src/xenia/apu/audio_media_player.h
View File

@@ -130,7 +130,7 @@ class AudioMediaPlayer {
// really compatible with it.
std::unique_ptr<AudioDriver> driver_ = nullptr;
std::unique_ptr<xe::threading::Semaphore> driver_semaphore_ = {};
xe::xe_fast_mutex driver_mutex_ = {};
xe_mutex driver_mutex_ = {};
bool SetupDriver(uint32_t sample_rate, uint32_t channels);
void DeleteDriver();