dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename variable

Browse Source
This commit is contained in:
Jonas Kvinge
2020-12-04 19:13:21 +01:00
parent 3a9a1f0a94
commit c482e264f4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/player.cpp
View File

@@ -398,21 +398,21 @@ void Player::NextItem(const Engine::TrackChangeFlags change, const Playlist::Aut
} }
void Player::PlayPlaylist(const QString &playlistName) { void Player::PlayPlaylist(const QString &playlist_name) {
PlayPlaylistInternal(Engine::Manual, Playlist::AutoScroll_Always, playlistName); PlayPlaylistInternal(Engine::Manual, Playlist::AutoScroll_Always, playlist_name);
} }
void Player::PlayPlaylistInternal(Engine::TrackChangeFlags change, const Playlist::AutoScroll autoscroll, const QString &playlistName) { void Player::PlayPlaylistInternal(Engine::TrackChangeFlags change, const Playlist::AutoScroll autoscroll, const QString &playlist_name) {
Playlist *playlist = nullptr; Playlist *playlist = nullptr;
for (Playlist *p : app_->playlist_manager()->GetAllPlaylists()) { for (Playlist *p : app_->playlist_manager()->GetAllPlaylists()) {
if (playlistName == app_->playlist_manager()->GetPlaylistName(p->id())) { if (playlist_name == app_->playlist_manager()->GetPlaylistName(p->id())) {
playlist = p; playlist = p;
break; break;
} }
} }
if (playlist == nullptr) { if (playlist == nullptr) {
qLog(Warning) << "Playlist '" << playlistName << "' not found."; qLog(Warning) << "Playlist '" << playlist_name << "' not found.";
return; return;
} }

6
src/core/player.h
View File

@@ -82,7 +82,7 @@ class PlayerInterface : public QObject {
// Skips this track. Might load more of the current radio station. // Skips this track. Might load more of the current radio station.
virtual void Next() = 0; virtual void Next() = 0;
virtual void Previous() = 0; virtual void Previous() = 0;
virtual void PlayPlaylist(const QString &playlistName) = 0; virtual void PlayPlaylist(const QString &playlist_name) = 0;
virtual void SetVolume(const int value) = 0; virtual void SetVolume(const int value) = 0;
virtual void VolumeUp() = 0; virtual void VolumeUp() = 0;
virtual void VolumeDown() = 0; virtual void VolumeDown() = 0;
@@ -163,7 +163,7 @@ class Player : public PlayerInterface {
void RestartOrPrevious() override; void RestartOrPrevious() override;
void Next() override; void Next() override;
void Previous() override; void Previous() override;
void PlayPlaylist(const QString &playlistName) override; void PlayPlaylist(const QString &playlist_name) override;
void SetVolume(const int value) override; void SetVolume(const int value) override;
void VolumeUp() override { SetVolume(GetVolume() + 5); } void VolumeUp() override { SetVolume(GetVolume() + 5); }
void VolumeDown() override { SetVolume(GetVolume() - 5); } void VolumeDown() override { SetVolume(GetVolume() - 5); }
@@ -196,7 +196,7 @@ class Player : public PlayerInterface {
void PreviousItem(const Engine::TrackChangeFlags change); void PreviousItem(const Engine::TrackChangeFlags change);
void NextInternal(const Engine::TrackChangeFlags, const Playlist::AutoScroll autoscroll); void NextInternal(const Engine::TrackChangeFlags, const Playlist::AutoScroll autoscroll);
void PlayPlaylistInternal(Engine::TrackChangeFlags, const Playlist::AutoScroll autoscroll, const QString &playlistName); void PlayPlaylistInternal(Engine::TrackChangeFlags, const Playlist::AutoScroll autoscroll, const QString &playlist_name);
void FatalError(); void FatalError();
void ValidSongRequested(const QUrl&); void ValidSongRequested(const QUrl&);