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

SoundPlayer: Changed some small cosmetic things

Browse source 
Renamed "Position" to "Elapsed". "channel/channels" automatically
changes now when more than one channel exist. The current file name
is now displayed in the window title.
This commit is contained in:
Till Mayer 2019-11-05 19:09:31 +01:00 • committed by Andreas Kling
parent 94a9649945
commit ac9907ee61
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Applications/SoundPlayer/SoundPlayerWidget.cpp
View file

@ -5,9 +5,11 @@
#include <LibGUI/GLabel.h>
#include <LibM/math.h>
SoundPlayerWidget::SoundPlayerWidget(NonnullRefPtr<AClientConnection> connection, AWavLoader& loader)
SoundPlayerWidget::SoundPlayerWidget(GWindow& window, NonnullRefPtr<AClientConnection> connection, AWavLoader& loader)
: m_manager(PlaybackManager(connection, loader))
{
window.set_title(String::format("SoundPlayer - \"%s\"", loader.file()->filename().characters()));
set_fill_with_background_color(true);
set_layout(make<GBoxLayout>(Orientation::Vertical));
layout()->set_margins({ 2, 2, 2, 2 });
@ -66,9 +68,10 @@ SoundPlayerWidget::SoundPlayerWidget(NonnullRefPtr<AClientConnection> connection
m_status->set_preferred_size(0, 18);
m_status->set_text(String::format(
"Sample rate %uHz, %u channels, %u bits per sample",
"Sample rate %uHz, %u %s, %u bits per sample",
loader.sample_rate(),
loader.num_channels(),
(loader.num_channels() == 1) ? "channel" : "channels",
loader.bits_per_sample()));
update_position(0);
@ -109,7 +112,7 @@ void SoundPlayerWidget::update_position(const int position)
float remaining_seconds = m_manager.total_length() - seconds;
m_elapsed->set_text(String::format(
"Position:\n%u:%02u.%02u",
"Elapsed:\n%u:%02u.%02u",
static_cast<int>(seconds / 60),
static_cast<int>(seconds) % 60,
static_cast<int>(seconds * 100) % 100));

3
Applications/SoundPlayer/SoundPlayerWidget.h
View file

@ -6,6 +6,7 @@
#include <LibGUI/GLabel.h>
#include <LibGUI/GSlider.h>
#include <LibGUI/GWidget.h>
#include <LibGUI/GWindow.h>
class SoundPlayerWidget final : public GWidget {
C_OBJECT(SoundPlayerWidget)
@ -13,7 +14,7 @@ public:
virtual ~SoundPlayerWidget() override;
private:
explicit SoundPlayerWidget(NonnullRefPtr<AClientConnection>, AWavLoader&);
explicit SoundPlayerWidget(GWindow&, NonnullRefPtr<AClientConnection>, AWavLoader&);
void update_position(const int position);
void update_ui();

2
Applications/SoundPlayer/main.cpp
View file

@ -52,7 +52,7 @@ int main(int argc, char** argv)
window->set_rect(300, 300, 350, 140);
window->set_icon(GraphicsBitmap::load_from_file("/res/icons/16x16/app-sound-player.png"));
auto player = SoundPlayerWidget::construct(audio_client, loader);
auto player = SoundPlayerWidget::construct(window, audio_client, loader);
window->set_main_widget(player);
window->show();

1
Libraries/LibAudio/AWavLoader.h
View file

@ -30,6 +30,7 @@ public:
u32 sample_rate() const { return m_sample_rate; }
u16 num_channels() const { return m_num_channels; }
u16 bits_per_sample() const { return m_bits_per_sample; }
RefPtr<CFile> file() const { return m_file; }
private:
bool parse_header();