1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:07:34 +00:00

SoundPlayer: Let the user open a file from the GUI

The user now can open a file without passing it as an argument
This commit is contained in:
Till Mayer 2019-11-09 17:15:16 +01:00 committed by Andreas Kling
parent b7efebe11c
commit 56cd8b4d17
5 changed files with 123 additions and 66 deletions

View file

@ -1,28 +1,45 @@
#include "PlaybackManager.h"
PlaybackManager::PlaybackManager(NonnullRefPtr<AClientConnection> connection, AWavLoader& loader)
: m_loader(loader)
, m_connection(connection)
PlaybackManager::PlaybackManager(NonnullRefPtr<AClientConnection> connection)
: m_connection(connection)
{
m_total_length = loader.total_samples() / static_cast<float>(loader.sample_rate());
m_timer = CTimer::construct(100, [&]() { next_buffer(); });
pause();
m_timer = CTimer::construct(100, [&]() {
if (!m_loader)
return;
next_buffer();
});
m_timer->stop();
}
PlaybackManager::~PlaybackManager()
{
}
void PlaybackManager::set_loader(OwnPtr<AWavLoader>&& loader)
{
stop();
m_loader = move(loader);
if (m_loader) {
m_total_length = m_loader->total_samples() / static_cast<float>(m_loader->sample_rate());
m_timer->start();
load_next_buffer();
} else {
m_timer->stop();
}
}
void PlaybackManager::stop()
{
set_paused(true);
m_connection->clear_buffer(true);
m_buffers.clear();
m_loader.reset();
m_last_seek = 0;
m_next_buffer = nullptr;
m_current_buffer = nullptr;
m_next_ptr = 0;
if (m_loader)
m_loader->reset();
}
void PlaybackManager::play()
@ -32,6 +49,9 @@ void PlaybackManager::play()
void PlaybackManager::seek(const int position)
{
if (!m_loader)
return;
m_last_seek = position;
bool paused_state = m_paused;
set_paused(true);
@ -41,7 +61,7 @@ void PlaybackManager::seek(const int position)
m_current_buffer = nullptr;
m_next_ptr = 0;
m_buffers.clear();
m_loader.seek(position);
m_loader->seek(position);
if (!paused_state)
set_paused(false);
@ -75,8 +95,8 @@ void PlaybackManager::remove_dead_buffers()
void PlaybackManager::load_next_buffer()
{
if (m_buffers.size() < 10) {
for (int i = 0; i < 20 && m_loader.loaded_samples() < m_loader.total_samples(); i++) {
auto buffer = m_loader.get_more_samples(PLAYBACK_MANAGER_BUFFER_SIZE);
for (int i = 0; i < 20 && m_loader->loaded_samples() < m_loader->total_samples(); i++) {
auto buffer = m_loader->get_more_samples(PLAYBACK_MANAGER_BUFFER_SIZE);
if (buffer)
m_buffers.append(buffer);
}
@ -91,7 +111,7 @@ void PlaybackManager::load_next_buffer()
void PlaybackManager::set_paused(bool paused)
{
if (!m_next_buffer)
if (!m_next_buffer && m_loader)
load_next_buffer();
m_paused = paused;