scl/strato
1
0
Fork 0
mirror of https://github.com/Takiiiiiiii/strato.git synced 2025-07-17 08:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run Android Studio Formatter on the Project

Browse Source 
This commit fixes a lot of style errors throughout the project by letting the Android Studio Formatter fix them. This commit also splits the Circular Buffer into it's own file.
This commit is contained in:
◱ PixelyIon
2020-04-19 03:10:18 +05:30
committed by ◱ PixelyIon
parent 7f78a679c3
commit 4637b4ac97
24 changed files with 203 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/cpp/skyline/audio.cpp
View File

@ -17,7 +17,7 @@ namespace skyline::audio {
}
std::shared_ptr<AudioTrack> Audio::OpenTrack(const int channelCount, const int sampleRate, const std::function<void()> &releaseCallback) {
std::lock_guard trackGuard(trackMutex);
std::lock_guard trackGuard(trackLock);
auto track = std::make_shared<AudioTrack>(channelCount, sampleRate, releaseCallback);
audioTracks.push_back(track);
@ -26,7 +26,7 @@ namespace skyline::audio {
}
void Audio::CloseTrack(std::shared_ptr<AudioTrack> &track) {
std::lock_guard trackGuard(trackMutex);
std::lock_guard trackGuard(trackLock);
audioTracks.erase(std::remove(audioTracks.begin(), audioTracks.end(), track), audioTracks.end());
track.reset();
@ -37,7 +37,7 @@ namespace skyline::audio {
size_t streamSamples = static_cast<size_t>(numFrames) * audioStream->getChannelCount();
size_t writtenSamples = 0;
std::unique_lock trackLock(trackMutex);
std::unique_lock trackGuard(trackLock);
for (auto &track : audioTracks) {
if (track->playbackState == AudioOutState::Stopped)
@ -55,7 +55,7 @@ namespace skyline::audio {
track->CheckReleasedBuffers();
}
trackLock.unlock();
trackGuard.unlock();
if (streamSamples > writtenSamples)
memset(destBuffer + writtenSamples, 0, (streamSamples - writtenSamples) * sizeof(i16));