shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Re-order service startup (Jack Server Settings)

Browse Source
This commit is contained in:
Robin Davies
2021-08-29 21:20:42 -04:00
parent 5ec349f17b
commit 57ecc0d9ef
14 changed files with 239 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ConfigMain.cpp
+17 -2
View File
@@ -30,6 +30,7 @@
#include "SysExec.hpp"
#include <sys/wait.h>
#include <pwd.h>
#include "JackServerSettings.hpp"
using namespace std;
using namespace pipedal;
@@ -116,6 +117,10 @@ void StopService()
{
cout << "Error: Failed to stop the " SHUTDOWN_SERVICE " service.";
}
if (SysExec(SYSTEMCTL_BIN " stop " JACK_SERVICE ".service") != EXIT_SUCCESS)
{
throw PiPedalException("Failed to stop the " JACK_SERVICE " service.");
}
}
void Uninstall() {
@@ -128,13 +133,23 @@ void Uninstall() {
void StartService()
{
SilentSysExec("/usr/bin/pulseaudio --kill"); // interferes with Jack audio service startup.
if (SysExec(SYSTEMCTL_BIN " start " SHUTDOWN_SERVICE ".service") != EXIT_SUCCESS)
{
throw PiPedalException("Failed to start the " SHUTDOWN_SERVICE " service.");
}
if (SysExec(SYSTEMCTL_BIN " start " NATIVE_SERVICE ".service") != EXIT_SUCCESS)
{
throw PiPedalException("Failed to start the " NATIVE_SERVICE " service.");
}
if (SysExec(SYSTEMCTL_BIN " start " SHUTDOWN_SERVICE ".service") != EXIT_SUCCESS)
JackServerSettings serverSettings;
serverSettings.ReadJackConfiguration();
if (serverSettings.IsValid())
{
throw PiPedalException("Failed to start the " SHUTDOWN_SERVICE " service.");
if (SysExec(SYSTEMCTL_BIN " start " JACK_SERVICE ".service") != EXIT_SUCCESS)
{
throw PiPedalException("Failed to start the " JACK_SERVICE " service.");
}
}
}
void RestartService()