From 94aa57d698a6400ae9c9d46991193d8ee844bb83 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 20 Feb 2020 17:15:22 +0000 Subject: trackchange: feature to start command on application startup/exit (#202) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9235 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/trackchange/settingsdialog.cpp | 24 +++++--- src/plugins/General/trackchange/settingsdialog.ui | 70 ++++++++++++++-------- src/plugins/General/trackchange/trackchange.cpp | 34 +++++++---- src/plugins/General/trackchange/trackchange.h | 4 ++ 4 files changed, 88 insertions(+), 44 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/General/trackchange/settingsdialog.cpp b/src/plugins/General/trackchange/settingsdialog.cpp index 0e95164a0..d72bcd2d8 100644 --- a/src/plugins/General/trackchange/settingsdialog.cpp +++ b/src/plugins/General/trackchange/settingsdialog.cpp @@ -33,10 +33,14 @@ SettingsDialog::SettingsDialog(QWidget *parent) : QDialog(parent) addMenu(m_ui.titleChangeButton); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - m_ui.newTrackLineEdit->setText(settings.value("TrackChange/new_track_command").toString()); - m_ui.endOfTrackLineEdit->setText(settings.value("TrackChange/end_of_track_command").toString()); - m_ui.endOfPlayListLineEdit->setText(settings.value("TrackChange/end_of_pl_command").toString()); - m_ui.titleChangeLineEdit->setText(settings.value("TrackChange/title_change_command").toString()); + settings.beginGroup("TrackChange"); + m_ui.newTrackLineEdit->setText(settings.value("new_track_command").toString()); + m_ui.endOfTrackLineEdit->setText(settings.value("end_of_track_command").toString()); + m_ui.endOfPlayListLineEdit->setText(settings.value("end_of_pl_command").toString()); + m_ui.titleChangeLineEdit->setText(settings.value("title_change_command").toString()); + m_ui.appStartupLineEdit->setText(settings.value("application_startup_command").toString()); + m_ui.appExitLineEdit->setText(settings.value("application_exit_command").toString()); + settings.endGroup(); } SettingsDialog::~SettingsDialog() @@ -45,10 +49,14 @@ SettingsDialog::~SettingsDialog() void SettingsDialog::accept() { QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - settings.setValue("TrackChange/new_track_command", m_ui.newTrackLineEdit->text()); - settings.setValue("TrackChange/end_of_track_command", m_ui.endOfTrackLineEdit->text()); - settings.setValue("TrackChange/end_of_pl_command", m_ui.endOfPlayListLineEdit->text()); - settings.setValue("TrackChange/title_change_command", m_ui.titleChangeLineEdit->text()); + settings.beginGroup("TrackChange"); + settings.setValue("new_track_command", m_ui.newTrackLineEdit->text()); + settings.setValue("end_of_track_command", m_ui.endOfTrackLineEdit->text()); + settings.setValue("end_of_pl_command", m_ui.endOfPlayListLineEdit->text()); + settings.setValue("title_change_command", m_ui.titleChangeLineEdit->text()); + settings.setValue("application_startup_command", m_ui.appStartupLineEdit->text()); + settings.setValue("application_exit_command", m_ui.appExitLineEdit->text()); + settings.endGroup(); QDialog::accept(); } diff --git a/src/plugins/General/trackchange/settingsdialog.ui b/src/plugins/General/trackchange/settingsdialog.ui index 6835ed3bf..68b6120eb 100644 --- a/src/plugins/General/trackchange/settingsdialog.ui +++ b/src/plugins/General/trackchange/settingsdialog.ui @@ -6,8 +6,8 @@ 0 0 - 441 - 249 + 484 + 382 @@ -23,6 +23,13 @@ 6 + + + + Command to run when Qmmp starts new track + + + @@ -33,6 +40,13 @@ + + + + Command to run toward to end of a track + + + @@ -43,6 +57,13 @@ + + + + Command to run when Qmmp reaches the end of the playlist + + + @@ -53,6 +74,13 @@ + + + + Command to run when title changes (i.e. network streams title) + + + @@ -63,40 +91,32 @@ - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - + + - Command to run when Qmmp starts new track + Command to run on application startup: - - + + - Command to run toward to end of a track + Command to run on application exit: - - - - Command to run when Qmmp reaches the end of the playlist + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - Command to run when title changes (i.e. network streams title) - - + + + + + diff --git a/src/plugins/General/trackchange/trackchange.cpp b/src/plugins/General/trackchange/trackchange.cpp index cbe5009f7..5c8168129 100644 --- a/src/plugins/General/trackchange/trackchange.cpp +++ b/src/plugins/General/trackchange/trackchange.cpp @@ -18,16 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include #include #include -#include -#include -#include -#include #include -#include -#include #include #include #include @@ -45,10 +38,17 @@ TrackChange::TrackChange(QObject *parent) : QObject(parent) connect(m_core, SIGNAL(trackInfoChanged()), SLOT(onTrackInfoChanged())); connect(m_core, SIGNAL(finished()), SLOT(onFinised())); QSettings settings(Qmmp::configFile(), QSettings::IniFormat); - m_newTrackCommand = settings.value("TrackChange/new_track_command").toString(); - m_endOfTrackCommand = settings.value("TrackChange/end_of_track_command").toString(); - m_endOfPlCommand = settings.value("TrackChange/end_of_pl_command").toString(); - m_titleChangeCommand = settings.value("TrackChange/title_change_command").toString(); + settings.beginGroup("TrackChange"); + m_newTrackCommand = settings.value("new_track_command").toString(); + m_endOfTrackCommand = settings.value("end_of_track_command").toString(); + m_endOfPlCommand = settings.value("end_of_pl_command").toString(); + m_titleChangeCommand = settings.value("title_change_command").toString(); + m_appStartupCommand = settings.value("title_change_command").toString(); + m_appExitCommand = settings.value("title_change_command").toString(); + settings.endGroup(); + + connect(qApp, SIGNAL(aboutToQuit()), SLOT(onAppExit())); + onAppStartup(); } TrackChange::~TrackChange() @@ -104,6 +104,18 @@ void TrackChange::onFinised() } } +void TrackChange::onAppStartup() +{ + if(QApplication::allWindows().count() == 1 && !m_appStartupCommand.isEmpty()) //detect startup + QProcess::startDetached(m_appStartupCommand); +} + +void TrackChange::onAppExit() +{ + if(!m_appExitCommand.isEmpty()) + QProcess::startDetached(m_appExitCommand); +} + bool TrackChange::executeCommand(const TrackInfo &info, const QString &format) { TrackInfo tmp = info; diff --git a/src/plugins/General/trackchange/trackchange.h b/src/plugins/General/trackchange/trackchange.h index daacc7cc9..f9fb2f158 100644 --- a/src/plugins/General/trackchange/trackchange.h +++ b/src/plugins/General/trackchange/trackchange.h @@ -44,6 +44,8 @@ private slots: void onStateChanged(Qmmp::State state); void onTrackInfoChanged(); void onFinised(); + void onAppStartup(); + void onAppExit(); private: bool executeCommand(const TrackInfo &info, const QString &format); @@ -51,6 +53,8 @@ private: QString m_endOfTrackCommand; QString m_endOfPlCommand; QString m_titleChangeCommand; + QString m_appStartupCommand; + QString m_appExitCommand; SoundCore *m_core; PlayListManager *m_plManager; TrackInfo m_prevInfo; -- cgit v1.2.3-13-gbd6f