Leahnaya/cc3dsfs
1
0
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2026-04-24 23:17:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix audio with CC closed on MacOS
Some checks failed
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux32 flags:32 name:Linux GCC 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux64 flags:64 name:Linux GCC x64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm32 flags:arm32 name:Linux GCC ARM 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm64 flags:arm64 name:Linux GCC ARM 64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:macos name:macOS Apple Silicon os:macos-14]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win32 flags:-A Win32 name:Windows VS2022 Win32 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win64 flags:-A x64 name:Windows VS2022 x64 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:winarm64 flags:-A ARM64 name:Windows VS2022 ARM os:windows-2022]) (push) Has been cancelled
Details
CD / Create Pi Mono Setup (push) Has been cancelled
Details
CD / Publishing (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Lorenzooone 2025-02-02 16:01:25 +01:00
parent 2879922da2
commit 50ba513adc
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/audio.hpp
View File

@ -35,9 +35,11 @@ private:
int num_consecutive_fast_seek;
std::int16_t *buffer;
std::chrono::time_point<std::chrono::high_resolution_clock> clock_time_start;
std::chrono::time_point<std::chrono::high_resolution_clock> inside_clock_time_start;
bool onGetData(sf::SoundStream::Chunk &data) override;
void onSeek(sf::Time timeOffset) override;
bool hasTooMuchTimeElapsedInside();
};
#endif

14
source/audio.cpp
View File

@ -64,6 +64,13 @@ bool Audio::hasTooMuchTimeElapsed() {
return (diff.count() > 1.0);
}
bool Audio::hasTooMuchTimeElapsedInside() {
auto curr_time = std::chrono::high_resolution_clock::now();
const std::chrono::duration<double> diff = curr_time - this->inside_clock_time_start;
return (diff.count() > 0.5);
}
bool Audio::onGetData(sf::SoundStream::Chunk &data) {
if(terminate)
return false;
@ -75,16 +82,21 @@ bool Audio::onGetData(sf::SoundStream::Chunk &data) {
terminate = true;
return false;
}
inside_clock_time_start = std::chrono::high_resolution_clock::now();
inside_onGetData = true;
int loaded_samples = samples.size();
while(loaded_samples <= 0) {
samples_wait.lock();
samples_wait.timed_lock();
if(terminate) {
inside_onGetData = false;
return false;
}
loaded_samples = samples.size();
if((loaded_samples <= 0) && this->hasTooMuchTimeElapsedInside()) {
inside_onGetData = false;
return false;
}
}
data.samples = (const std::int16_t*)buffer;