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

MainWindow: Delay command line options until playlists are loaded

Browse Source 
Fixes #1546
This commit is contained in:
Jonas Kvinge
2025-03-30 16:45:34 +02:00
parent e798349aca
commit 3dce84c73c
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/mainwindow.cpp
View File

@@ -401,6 +401,7 @@ MainWindow::MainWindow(Application *app,
was_minimized_(false), was_minimized_(false),
exit_(false), exit_(false),
exit_count_(0), exit_count_(0),
playlists_loaded_(false),
delete_files_(false) { delete_files_(false) {
qLog(Debug) << "Starting"; qLog(Debug) << "Starting";
@@ -667,7 +668,7 @@ MainWindow::MainWindow(Application *app,
QObject::connect(&*app_->player(), &Player::Playing, playlist_list_, &PlaylistListContainer::ActivePlaying); QObject::connect(&*app_->player(), &Player::Playing, playlist_list_, &PlaylistListContainer::ActivePlaying);
QObject::connect(&*app_->player(), &Player::Stopped, playlist_list_, &PlaylistListContainer::ActiveStopped); QObject::connect(&*app_->player(), &Player::Stopped, playlist_list_, &PlaylistListContainer::ActiveStopped);
QObject::connect(&*app_->playlist_manager(), &PlaylistManager::AllPlaylistsLoaded, &*app->player(), &Player::PlaylistsLoaded); QObject::connect(&*app_->playlist_manager(), &PlaylistManager::AllPlaylistsLoaded, this, &MainWindow::PlaylistsLoaded);
QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, this, &MainWindow::SongChanged); QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, this, &MainWindow::SongChanged);
QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, &*app_->player(), &Player::CurrentMetadataChanged); QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, &*app_->player(), &Player::CurrentMetadataChanged);
QObject::connect(&*app_->playlist_manager(), &PlaylistManager::EditingFinished, this, &MainWindow::PlaylistEditFinished); QObject::connect(&*app_->playlist_manager(), &PlaylistManager::EditingFinished, this, &MainWindow::PlaylistEditFinished);
@@ -1408,6 +1409,19 @@ void MainWindow::ExitFinished() {
} }
void MainWindow::PlaylistsLoaded() {
playlists_loaded_ = true;
if (options_.has_value()) {
CommandlineOptionsReceived(options_.value());
options_.reset();
}
app_->player()->PlaylistsLoaded();
}
void MainWindow::MediaStopped() { void MainWindow::MediaStopped() {
setWindowTitle(u"Strawberry Music Player"_s); setWindowTitle(u"Strawberry Music Player"_s);
@@ -2463,6 +2477,11 @@ void MainWindow::CommandlineOptionsReceived(const QByteArray &string_options) {
void MainWindow::CommandlineOptionsReceived(const CommandlineOptions &options) { void MainWindow::CommandlineOptionsReceived(const CommandlineOptions &options) {
if (!playlists_loaded_) {
options_ = options;
return;
}
switch (options.player_action()) { switch (options.player_action()) {
case CommandlineOptions::PlayerAction::Play: case CommandlineOptions::PlayerAction::Play:
if (options.urls().empty()) { if (options.urls().empty()) {

7
src/core/mainwindow.h
View File

@@ -24,6 +24,8 @@
#include "config.h" #include "config.h"
#include <optional>
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
@@ -52,6 +54,7 @@
#include "core/platforminterface.h" #include "core/platforminterface.h"
#include "core/song.h" #include "core/song.h"
#include "core/settings.h" #include "core/settings.h"
#include "core/commandlineoptions.h"
#include "tagreader/tagreaderclient.h" #include "tagreader/tagreaderclient.h"
#include "osd/osdbase.h" #include "osd/osdbase.h"
#include "playlist/playlist.h" #include "playlist/playlist.h"
@@ -144,6 +147,8 @@ class MainWindow : public QMainWindow, public PlatformInterface {
void AuthorizationUrlReceived(const QUrl &url); void AuthorizationUrlReceived(const QUrl &url);
private Q_SLOTS: private Q_SLOTS:
void PlaylistsLoaded();
void FilePathChanged(const QString &path); void FilePathChanged(const QString &path);
void MediaStopped(); void MediaStopped();
@@ -412,7 +417,9 @@ class MainWindow : public QMainWindow, public PlatformInterface {
AlbumCoverImageResult album_cover_; AlbumCoverImageResult album_cover_;
bool exit_; bool exit_;
int exit_count_; int exit_count_;
bool playlists_loaded_;
bool delete_files_; bool delete_files_;
std::optional<CommandlineOptions> options_;
}; };