From 43b21c664a34ae53993a9f3e863ffefd65859777 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 3 Mar 2024 15:01:09 +0300 Subject: [PATCH] fixed clang warnings --- src/audio/AL/ALAudio.cpp | 4 ---- src/audio/audio.cpp | 2 +- src/coders/ogg.cpp | 18 +++++++++--------- src/frontend/screens.cpp | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/audio/AL/ALAudio.cpp b/src/audio/AL/ALAudio.cpp index 01d750a3..8cbf01e4 100644 --- a/src/audio/AL/ALAudio.cpp +++ b/src/audio/AL/ALAudio.cpp @@ -100,7 +100,6 @@ void ALStream::update(double delta) { uint buffer; AL_CHECK(alSourceUnqueueBuffers(source, 1, &buffer)); unusedBuffers.push(buffer); - std::cout << "unqueue " << buffer << std::endl; } uint preloaded = 0; @@ -109,15 +108,12 @@ void ALStream::update(double delta) { if (preloadBuffer(buffer, loop)) { preloaded++; unusedBuffers.pop(); - std::cout << "queue " << buffer << std::endl; AL_CHECK(alSourceQueueBuffers(source, 1, &buffer)); } } if (speaker->isStopped() && !speaker->isStoppedManually()) { - std::cout << "preloaded " << preloaded << std::endl; if (preloaded) { speaker->play(); - std::cout << "speaker restored" << std::endl; } else { speaker->stop(); } diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp index 738ff3f5..ecb5db2d 100644 --- a/src/audio/audio.cpp +++ b/src/audio/audio.cpp @@ -88,7 +88,7 @@ public: return totalSamples; } - duration_t getTotalDuration() const { + duration_t getTotalDuration() const override { return static_cast(totalSamples) / static_cast(sampleRate); } diff --git a/src/coders/ogg.cpp b/src/coders/ogg.cpp index a7e8568d..2be7fe95 100644 --- a/src/coders/ogg.cpp +++ b/src/coders/ogg.cpp @@ -96,43 +96,43 @@ public: return bytes; } - void close() { + void close() override { if (!closed) { ov_clear(&vf); closed = true; } } - bool isOpen() const { + bool isOpen() const override { return !closed; } - size_t getTotalSamples() const { + size_t getTotalSamples() const override { return totalSamples; } - duration_t getTotalDuration() const { + duration_t getTotalDuration() const override { return static_cast(totalSamples) / static_cast(sampleRate); } - uint getChannels() const { + uint getChannels() const override { return channels; } - uint getSampleRate() const { + uint getSampleRate() const override { return sampleRate; } - uint getBitsPerSample() const { + uint getBitsPerSample() const override { return 16; } - bool isSeekable() const { + bool isSeekable() const override { return seekable; } - void seek(size_t position) { + void seek(size_t position) override { if (!closed && seekable) { ov_raw_seek(&vf, position); } diff --git a/src/frontend/screens.cpp b/src/frontend/screens.cpp index 20e0c845..12f2dea1 100644 --- a/src/frontend/screens.cpp +++ b/src/frontend/screens.cpp @@ -150,10 +150,10 @@ void LevelScreen::update(float delta) { updateHotkeys(); } - auto camera = level->player->camera; + auto camera = this->level->player->camera; audio::setListener( camera->position, - level->player->hitbox->velocity, + this->level->player->hitbox->velocity, camera->position+camera->dir, camera->up );