Bug#664863: qjackctl: Do not stop Jack server unconditionnally on exit
Roland Mas, 2012-03-23 11:25:26 +0100 : > Hi, > > Please find attached a git patch fixing #664863 by introducing a new > setting allowing to control whether the Jack server should be stopped > when qjackctl exits. I'll also send it to the upstream author (as a > simple patch). Actually, please use the following one. dpkg-source and git both conspire to make my life harder, and parts of the patch were omitted in the previous email. >From 316ed9b289af8c01962c3b7f56d9b9f9f7463e75 Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Fri, 23 Mar 2012 11:13:49 +0100 Subject: [PATCH] Make "stop jackd on quit" configurable (closes: #664863) --- debian/changelog |6 + debian/patches/10_optional-stopjack-on-close.patch | 133 debian/patches/series |1 + 3 files changed, 140 insertions(+), 0 deletions(-) create mode 100644 debian/patches/10_optional-stopjack-on-close.patch diff --git a/debian/changelog b/debian/changelog index 66da30d..8b0f1c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qjackctl (0.3.8-1+lld1) UNRELEASED; urgency=low + + * Make "stop jackd on quit" configurable (closes: #664863) + + -- Roland Mas Fri, 23 Mar 2012 11:40:21 +0100 + qjackctl (0.3.8-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/10_optional-stopjack-on-close.patch b/debian/patches/10_optional-stopjack-on-close.patch new file mode 100644 index 000..ca17564 --- /dev/null +++ b/debian/patches/10_optional-stopjack-on-close.patch @@ -0,0 +1,133 @@ +Description: Make "stop jackd on quit" configurable (closes: #664863) + Added a setting to make the killing of jackd on application exit + optional and configurable. The default value is to kill jackd, so + as to preserve the previous behaviour. +Author: Roland Mas +Bug-Debian: http://bugs.debian.org/664863 + +Index: qjackctl/src/qjackctlSetup.cpp +=== +--- qjackctl.orig/src/qjackctlSetup.cpp qjackctl/src/qjackctlSetup.cpp +@@ -67,6 +67,7 @@ + // sServerName = m_settings.value("/ServerName").toString(); + bStartJack = m_settings.value("/StartJack", false).toBool(); + // bStartJackCmd= m_settings.value("/StartJackCmd", false).toBool(); ++ bStopJack= m_settings.value("/StopJack", true).toBool(); + bStartupScript = m_settings.value("/StartupScript", false).toBool(); + sStartupScriptShell = m_settings.value("/StartupScriptShell").toString(); + bPostStartupScript = m_settings.value("/PostStartupScript", false).toBool(); +@@ -177,6 +178,7 @@ + // m_settings.setValue("/ServerName", sServerName); + m_settings.setValue("/StartJack", bStartJack); + // m_settings.setValue("/StartJackCmd",bStartJackCmd); ++ m_settings.setValue("/StopJack",bStopJack); + m_settings.setValue("/StartupScript", bStartupScript); + m_settings.setValue("/StartupScriptShell", sStartupScriptShell); + m_settings.setValue("/PostStartupScript", bPostStartupScript); +Index: qjackctl/src/qjackctlSetupForm.ui +=== +--- qjackctl.orig/src/qjackctlSetupForm.ui qjackctl/src/qjackctlSetupForm.ui +@@ -3741,6 +3741,25 @@ + + + ++ ++ ++ ++50 ++false ++ ++ ++ ++ Whether to stop JACK audio server on application quit ++ ++ ++ Stop JACK audio server on application &quit ++ ++ ++ Alt+Q ++ ++ ++ ++ + + + +Index: qjackctl/src/qjackctlSetup.h +=== +--- qjackctl.orig/src/qjackctlSetup.h qjackctl/src/qjackctlSetup.h +@@ -107,6 +107,9 @@ + bool bStartJack; + bool bStartJackCmd; + ++ // Server stop options. ++ bool bStopJack; ++ + // User supplied command line. + QString sCmdLine; + +Index: qjackctl/src/qjackctlMainForm.cpp +=== +--- qjackctl.orig/src/qjackctlMainForm.cpp qjackctl/src/qjackctlMainForm.cpp +@@ -415,7 +415,8 @@ + qjackctlMainForm::~qjackctlMainForm (void) + { + // Stop server, if not already... +- stopJackServer(); ++ if (m_pSetup->bStopJack) ++ stopJackServer(); + + #ifdef CONFIG_DBUS + if (m_pDBusLogWatcher) +@@ -764,6 +765,7 @@ + + // Check if JACK daemon is currently running... + if (bQueryClose && m_pJack && m_pJack->state() == QProcess::Running ++ && m_pSetup->bStopJack + && (m_pSetup->bQueryClose || m_pSetup->bQueryShutdown)) { + bQueryClose = (QMessageBox::warning(this, + tr("
Bug#664863: qjackctl: Do not stop Jack server unconditionnally on exit
Hi, Please find attached a git patch fixing #664863 by introducing a new setting allowing to control whether the Jack server should be stopped when qjackctl exits. I'll also send it to the upstream author (as a simple patch). >From cb739f6958159099719fcff0fb96b0c62de43f13 Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Fri, 23 Mar 2012 11:13:49 +0100 Subject: [PATCH] Make "stop jackd on quit" configurable (closes: #664863) --- debian/changelog |6 + debian/patches/10_optional-stopjack-on-close.patch | 115 debian/patches/series |1 + 3 files changed, 122 insertions(+), 0 deletions(-) create mode 100644 debian/patches/10_optional-stopjack-on-close.patch diff --git a/debian/changelog b/debian/changelog index 66da30d..11a0093 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qjackctl (0.3.8-1+lld1) UNRELEASED; urgency=low + + * Make "stop jackd on quit" configurable (closes: #664863) + + -- Roland Mas Fri, 23 Mar 2012 11:01:09 +0100 + qjackctl (0.3.8-1) unstable; urgency=low * New upstream release. diff --git a/debian/patches/10_optional-stopjack-on-close.patch b/debian/patches/10_optional-stopjack-on-close.patch new file mode 100644 index 000..9d86bfc --- /dev/null +++ b/debian/patches/10_optional-stopjack-on-close.patch @@ -0,0 +1,115 @@ +Description: Make "stop jackd on quit" configurable (closes: #664863) + Added a setting to make the killing of jackd on application exit + optional and configurable. The default value is to kill jackd, so + as to preserve the previous behaviour. +Author: Roland Mas +Bug-Debian: http://bugs.debian.org/664863 + +Index: qjackctl/src/qjackctlSetup.cpp +=== +--- qjackctl.orig/src/qjackctlSetup.cpp qjackctl/src/qjackctlSetup.cpp +@@ -67,6 +67,7 @@ + // sServerName = m_settings.value("/ServerName").toString(); + bStartJack = m_settings.value("/StartJack", false).toBool(); + // bStartJackCmd= m_settings.value("/StartJackCmd", false).toBool(); ++ bStopJack= m_settings.value("/StopJack", false).toBool(); + bStartupScript = m_settings.value("/StartupScript", false).toBool(); + sStartupScriptShell = m_settings.value("/StartupScriptShell").toString(); + bPostStartupScript = m_settings.value("/PostStartupScript", false).toBool(); +Index: qjackctl/src/qjackctlSetupForm.ui +=== +--- qjackctl.orig/src/qjackctlSetupForm.ui qjackctl/src/qjackctlSetupForm.ui +@@ -3741,6 +3741,25 @@ + + + ++ ++ ++ ++50 ++false ++ ++ ++ ++ Whether to stop JACK audio server on application quit ++ ++ ++ Stop JACK audio server on application &quit ++ ++ ++ Alt+Q ++ ++ ++ ++ + + + +Index: qjackctl/src/qjackctlSetup.h +=== +--- qjackctl.orig/src/qjackctlSetup.h qjackctl/src/qjackctlSetup.h +@@ -107,6 +107,9 @@ + bool bStartJack; + bool bStartJackCmd; + ++ // Server stop options. ++ bool bStopJack; ++ + // User supplied command line. + QString sCmdLine; + +Index: qjackctl/src/qjackctlMainForm.cpp +=== +--- qjackctl.orig/src/qjackctlMainForm.cpp qjackctl/src/qjackctlMainForm.cpp +@@ -764,6 +764,7 @@ + + // Check if JACK daemon is currently running... + if (bQueryClose && m_pJack && m_pJack->state() == QProcess::Running ++ && m_pSetup->bStopJack + && (m_pSetup->bQueryClose || m_pSetup->bQueryShutdown)) { + bQueryClose = (QMessageBox::warning(this, + tr("Warning") + " - " QJACKCTL_SUBTITLE1, +@@ -821,7 +822,8 @@ + if (m_pSystemTray) + m_pSystemTray->close(); + // Stop any service out there... +- stopJackServer(); ++ if (m_pSetup->bStopJack) ++ stopJackServer(); + } + + return bQueryClose; +Index: qjackctl/src/qjackctlSetupForm.cpp +=== +--- qjackctl.orig/src/qjackctlSetupForm.cpp qjackctl/src/qjackctlSetupForm.cpp +@@ -373,6 +373,9 @@ + QObject::connect(m_ui.StartJackCheckBox, + SIGNAL(stateChanged(int)), + SLOT(optionsChanged())); ++ QObject::connect(m_ui.StopJackCheckBox, ++ SIGNAL(stateChanged(int)), ++ SLOT(optionsChanged())); + QObject::connect(m_ui.QueryCloseCheckBox, + SIGNAL(stateChanged(int)), + SLOT(optionsChanged())); +@@ -585,6 +588,7 @@ + + // Other misc options... + m_ui.StartJackCheckBox->setChecked(m_pSetup->bStartJack); ++ m_ui.StopJackCheckBox->setChecked(m_
Bug#664863: qjackctl: Do not stop Jack server unconditionnally on exit
Package: qjackctl Version: 0.3.8-1 Severity: wishlist Qjackctl can be configured to start, or not, the Jack server on startup; however, it apparently can't be told to leave the server running on exit. This should be made configurable; alternatively, Qjackctl should remember whether it started the server itself and only stop it if it did. -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: i386 (i686) Kernel: Linux 3.2.0-2-686-pae (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/bash Versions of packages qjackctl depends on: ii jackd 5 ii libasound21.0.25-2 ii libc6 2.13-27 ii libgcc1 1:4.6.3-1 ii libjack-jackd2-0 [libjack-0.116] 1.9.8~dfsg.2-1 ii libqt4-dbus 4:4.7.4-2 ii libqt4-xml4:4.7.4-2 ii libqtcore44:4.7.4-2 ii libqtgui4 4:4.7.4-2 ii libstdc++64.6.3-1 ii libx11-6 2:1.4.4-4 qjackctl recommends no packages. Versions of packages qjackctl suggests: ii pulseaudio-utils 1.1-3 -- no debconf information -- Roland Mas Time is a drug. Too much of it kills you. -- in Small Gods (Terry Pratchett) ___ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers