Rework how session auto-start of jack works

Makefile

@@ -85,7 +85,6 @@ debug:
 
 install:
 	# Create directories
-	install -d $(DESTDIR)/etc/xdg/autostart/
 	install -d $(DESTDIR)$(PREFIX)/bin/
 	install -d $(DESTDIR)$(PREFIX)/share/applications/
 	install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
@@ -120,8 +119,7 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/
 
 	# Install desktop files
-	install -m 644 data/autostart/*.desktop $(DESTDIR)/etc/xdg/autostart/
-	install -m 644 data/*.desktop           $(DESTDIR)$(PREFIX)/share/applications/
+	install -m 644 data/*.desktop $(DESTDIR)$(PREFIX)/share/applications/
 
 	# Install icons, 16x16
 	install -m 644 resources/16x16/cadence.png             $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/
@@ -164,8 +162,9 @@ install:
 	# Install addtional stuff for Cadence
 	install -m 644 data/pulse2jack/*     $(DESTDIR)$(PREFIX)/share/cadence/pulse2jack/
 	install -m 644 data/pulse2loopback/* $(DESTDIR)$(PREFIX)/share/cadence/pulse2loopback/
-	install -m 644 data/70cadence-plugin-paths  $(X11_RC_DIR)
-	install -m 644 data/99cadence-session-start $(X11_RC_DIR)
+	install -m 644 data/21cadence-session-inject $(X11_RC_DIR)
+	install -m 644 data/70cadence-plugin-paths   $(X11_RC_DIR)
+	install -m 644 data/99cadence-session-start  $(X11_RC_DIR)
 
 	# Install addtional stuff for Claudia
 	cp -r data/icons/*     $(DESTDIR)$(PREFIX)/share/cadence/icons/
@@ -185,9 +184,13 @@ install:
 		$(DESTDIR)$(PREFIX)/bin/catia \
 		$(DESTDIR)$(PREFIX)/bin/claudia \
 		$(DESTDIR)$(PREFIX)/bin/claudia-launcher \
+		$(X11_RC_DIR)/21cadence-session-inject \
 		$(X11_RC_DIR)/70cadence-plugin-paths \
 		$(X11_RC_DIR)/99cadence-session-start
 
+	# get rid of some old files
+	rm -f $(DESTDIR)/etc/xdg/autostart/cadence-session-start.desktop
+
 # -----------------------------------------------------------------------------------------------------------------------------------------
 
 uninstall:
@@ -210,6 +213,8 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/catia.svg
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia.svg
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/claudia-launcher.svg
+	rm -f $(DESTDIR)/etc/xdg/autostart/cadence-session-start.desktop
+	rm -f $(X11_RC_DIR)/21cadence-session-inject
 	rm -f $(X11_RC_DIR)/70cadence-plugin-paths
 	rm -f $(X11_RC_DIR)/99cadence-session-start
 	rm -rf $(DESTDIR)$(PREFIX)/share/cadence/

data/21cadence-session-inject

@@ -0,0 +1,17 @@
+# Cadence Session Startup Injection
+# Set plugin paths and start JACK (or not) according to user settings
+
+INSTALL_PREFIX="X-PREFIX-X"
+
+if [ -f $INSTALL_PREFIX/bin/cadence-session-start ]; then
+
+export LADSPA_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printLADSPA_PATH`
+export DSSI_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printDSSI_PATH`
+export LV2_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printLV2_PATH`
+export VST_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printVST_PATH`
+
+STARTUP="$INSTALL_PREFIX/bin/cadence-session-start --system-start-by-x11-startup $STARTUP"
+
+fi
+
+unset INSTALL_PREFIX

data/70cadence-plugin-paths

@@ -1,15 +1,2 @@
 # Cadence Session Startup
-# Part 1 - Export Plugins PATHs
-
-INSTALL_PREFIX="X-PREFIX-X"
-
-if [ -f $INSTALL_PREFIX/bin/cadence-session-start ]; then
-
-export LADSPA_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printLADSPA_PATH`
-export DSSI_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printDSSI_PATH`
-export LV2_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printLV2_PATH`
-export VST_PATH=`$INSTALL_PREFIX/bin/cadence-session-start --printVST_PATH`
-
-fi
-
-unset INSTALL_PREFIX
+# Not used anymore

data/99cadence-session-start

@@ -1,5 +1,2 @@
 # Cadence Session Startup
-# Part 2 - Start JACK (or not), according to user settings
-
 # Not used anymore
-# see /etc/xdg/autostart/cadence-session-start.desktop

data/autostart/cadence-session-start.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Name=Cadence session startup
-Comment=Cadence session startup
-Exec=cadence-session-start --system-start
-Icon=cadence
-Terminal=false
-GenericName=
-NoDisplay=true

data/cadence-pulse2loopback

@@ -98,7 +98,7 @@ if (IsPulseAudioRunning); then
 }
 else
 {
-    if (`pulseaudio --daemonize --high-priority --realtime --disallow-module-loading --exit-idle-time=-1 --file=$FILE -n`); then
+    if (`pulseaudio --daemonize --high-priority --realtime --exit-idle-time=-1 --file=$FILE -n`); then
         echo "Initiated PulseAudio successfully!"
     else
         echo "Failed to initialize PulseAudio!"

data/cadence-session-start

@@ -7,4 +7,10 @@ else
 fi
 
 INSTALL_PREFIX="X-PREFIX-X"
-exec $PYTHON $INSTALL_PREFIX/share/cadence/src/cadence_session_start.py "$@"
+
+if [ $1 == "--system-start-by-x11-startup" ]; then
+  $PYTHON $INSTALL_PREFIX/share/cadence/src/cadence_session_start.py --system-start &
+  exec $2
+else
+  exec $PYTHON $INSTALL_PREFIX/share/cadence/src/cadence_session_start.py "$@"
+fi