RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:37:45 +00:00
Code Issues Activity Actions

Applications+Userland: Switch to new Audio::Loader API

Browse source
This commit is contained in:
Julian Offenhäuser 2020-12-01 20:20:46 +01:00 • committed by Andreas Kling
parent 1f47b01e3b
commit bad8cd3d8f
5 changed files with 31 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/aplay.cpp
View file

@ -26,7 +26,7 @@
#include <LibAudio/Buffer.h>
#include <LibAudio/ClientConnection.h>
#include <LibAudio/WavLoader.h>
#include <LibAudio/Loader.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h>
#include <stdio.h>
@ -37,7 +37,7 @@ int main(int argc, char** argv)
bool should_loop = false;
Core::ArgsParser args_parser;
args_parser.add_positional_argument(path, "Path to WAV file", "path");
args_parser.add_positional_argument(path, "Path to audio file", "path");
args_parser.add_option(should_loop, "Loop playback", "loop", 'l');
args_parser.parse(argc, argv);
@ -45,27 +45,27 @@ int main(int argc, char** argv)
auto audio_client = Audio::ClientConnection::construct();
audio_client->handshake();
Audio::WavLoader loader(path);
if (loader.has_error()) {
fprintf(stderr, "Failed to load WAV file: %s\n", loader.error_string());
NonnullRefPtr<Audio::Loader> loader = Audio::Loader::create(path);
if (loader->has_error()) {
fprintf(stderr, "Failed to load audio file: %s\n", loader->error_string());
return 1;
}
printf("\033[34;1m Playing\033[0m: %s\n", path);
printf("\033[34;1m Format\033[0m: %u Hz, %u-bit, %s\n",
loader.sample_rate(),
loader.bits_per_sample(),
loader.num_channels() == 1 ? "Mono" : "Stereo");
loader->sample_rate(),
loader->bits_per_sample(),
loader->num_channels() == 1 ? "Mono" : "Stereo");
printf("\033[34;1mProgress\033[0m: \033[s");
for (;;) {
auto samples = loader.get_more_samples();
auto samples = loader->get_more_samples();
if (samples) {
printf("\033[u");
printf("%d/%d", loader.loaded_samples(), loader.total_samples());
printf("%d/%d", loader->loaded_samples(), loader->total_samples());
fflush(stdout);
audio_client->enqueue(*samples);
} else if (should_loop) {
loader.reset();
loader->reset();
} else if (audio_client->get_remaining_samples()) {
sleep(1);
} else {