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

SoundPlayer: Rename NoVisualization to AlbumCoverVisualization

Browse source 
Since the NoVisualization widget now shows the album cover, it should be
called AlbumCoverVisualization instead.
This commit is contained in:
Nícolas F. R. A. Prado 2022-02-27 21:05:04 -05:00 • committed by Brian Gianforcaro
parent 2b1ac91764
commit 2470997fc9
4 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Applications/SoundPlayer/NoVisualizationWidget.cpp → Userland/Applications/SoundPlayer/AlbumCoverVisualizationWidget.cpp
View file

@ -6,12 +6,12 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include "NoVisualizationWidget.h" #include "AlbumCoverVisualizationWidget.h"
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
void NoVisualizationWidget::paint_event(GUI::PaintEvent& event) void AlbumCoverVisualizationWidget::paint_event(GUI::PaintEvent& event)
{ {
Frame::paint_event(event); Frame::paint_event(event);
GUI::Painter painter(*this); GUI::Painter painter(*this);
@ -25,7 +25,7 @@ void NoVisualizationWidget::paint_event(GUI::PaintEvent& event)
} }
} }
ErrorOr<NonnullRefPtr<Gfx::Bitmap>> NoVisualizationWidget::get_album_cover(StringView const filename) ErrorOr<NonnullRefPtr<Gfx::Bitmap>> AlbumCoverVisualizationWidget::get_album_cover(StringView const filename)
{ {
auto directory = LexicalPath::dirname(filename); auto directory = LexicalPath::dirname(filename);
@ -39,7 +39,7 @@ ErrorOr<NonnullRefPtr<Gfx::Bitmap>> NoVisualizationWidget::get_album_cover(Strin
return Error::from_string_literal("No cover file found"); return Error::from_string_literal("No cover file found");
} }
void NoVisualizationWidget::start_new_file(StringView filename) void AlbumCoverVisualizationWidget::start_new_file(StringView filename)
{ {
auto album_cover_or_error = get_album_cover(filename); auto album_cover_or_error = get_album_cover(filename);
if (album_cover_or_error.is_error()) if (album_cover_or_error.is_error())
@ -48,6 +48,6 @@ void NoVisualizationWidget::start_new_file(StringView filename)
m_album_cover = album_cover_or_error.value(); m_album_cover = album_cover_or_error.value();
} }
void NoVisualizationWidget::set_buffer(RefPtr<Audio::Buffer>) void AlbumCoverVisualizationWidget::set_buffer(RefPtr<Audio::Buffer>)
{ {
} }

8
Userland/Applications/SoundPlayer/NoVisualizationWidget.h → Userland/Applications/SoundPlayer/AlbumCoverVisualizationWidget.h
View file

@ -11,17 +11,17 @@
#include <LibAudio/Buffer.h> #include <LibAudio/Buffer.h>
#include <LibGUI/Frame.h> #include <LibGUI/Frame.h>
class NoVisualizationWidget final : public VisualizationWidget { class AlbumCoverVisualizationWidget final : public VisualizationWidget {
C_OBJECT(NoVisualizationWidget) C_OBJECT(AlbumCoverVisualizationWidget)
public: public:
~NoVisualizationWidget() override = default; ~AlbumCoverVisualizationWidget() override = default;
void set_buffer(RefPtr<Audio::Buffer>) override; void set_buffer(RefPtr<Audio::Buffer>) override;
void start_new_file(StringView) override; void start_new_file(StringView) override;
private: private:
void paint_event(GUI::PaintEvent&) override; void paint_event(GUI::PaintEvent&) override;
NoVisualizationWidget() = default; AlbumCoverVisualizationWidget() = default;
ErrorOr<NonnullRefPtr<Gfx::Bitmap>> get_album_cover(StringView const filename); ErrorOr<NonnullRefPtr<Gfx::Bitmap>> get_album_cover(StringView const filename);
RefPtr<Gfx::Bitmap> m_serenity_bg; RefPtr<Gfx::Bitmap> m_serenity_bg;

2
Userland/Applications/SoundPlayer/CMakeLists.txt
View file

@ -13,7 +13,7 @@ set(SOURCES
SampleWidget.cpp SampleWidget.cpp
SoundPlayerWidgetAdvancedView.cpp SoundPlayerWidgetAdvancedView.cpp
BarsVisualizationWidget.cpp BarsVisualizationWidget.cpp
NoVisualizationWidget.cpp AlbumCoverVisualizationWidget.cpp
M3UParser.cpp M3UParser.cpp
PlaylistWidget.cpp PlaylistWidget.cpp
) )

10
Userland/Applications/SoundPlayer/main.cpp
View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include "AlbumCoverVisualizationWidget.h"
#include "BarsVisualizationWidget.h" #include "BarsVisualizationWidget.h"
#include "NoVisualizationWidget.h"
#include "Player.h" #include "Player.h"
#include "SampleWidget.h" #include "SampleWidget.h"
#include "SoundPlayerWidgetAdvancedView.h" #include "SoundPlayerWidgetAdvancedView.h"
@ -124,11 +124,11 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
TRY(visualization_menu->try_add_action(samples)); TRY(visualization_menu->try_add_action(samples));
visualization_actions.add_action(samples); visualization_actions.add_action(samples);
auto none = GUI::Action::create_checkable("&None", [&](auto&) { auto album_cover_visualization = GUI::Action::create_checkable("&Album Cover", [&](auto&) {
static_cast<SoundPlayerWidgetAdvancedView*>(player)->set_visualization<NoVisualizationWidget>(); static_cast<SoundPlayerWidgetAdvancedView*>(player)->set_visualization<AlbumCoverVisualizationWidget>();
}); });
TRY(visualization_menu->try_add_action(none)); TRY(visualization_menu->try_add_action(album_cover_visualization));
visualization_actions.add_action(none); visualization_actions.add_action(album_cover_visualization);
auto help_menu = TRY(window->try_add_menu("&Help")); auto help_menu = TRY(window->try_add_menu("&Help"));
TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window))); TRY(help_menu->try_add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window)));