jonah/RaySession
1
0
Fork 0
mirror of https://github.com/Houston4444/RaySession.git synced 2025-12-19 08:15:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Forget for the moment the fact to consider prefix_mode=1 and jack_naming=1 as default in xml files. (It was not written correctly)

Browse Source
This commit is contained in:
Houston4444
2025-11-09 13:10:19 +01:00
parent 244c0ca6f6
commit 64f09d965d
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client_templates/40_ray_nsm/client_templates.xml
View File

@@ -5,7 +5,7 @@
In all cases, template will be available only if the executable value is in PATH
and if the template-name has not already been added -->
<RAY-CLIENT-TEMPLATES erased_by_nsm_desktop_file="false" VERSION="0.17.0">
<Client-Template template-name="Hydrogen" client_id="hydrogen" executable="hydrogen" needed-version="1.1"/>
<Client-Template template-name="Hydrogen" client_id="hydrogen" executable="hydrogen" needed-version="1.1" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="Ardour" executable="ardour" name="Ardour" icon="ardour" client_id="ardour" list_ardour_templates="true" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="Ardour8" executable="Ardour8" name="Ardour" icon="ardour" client_id="ardour" list_ardour_templates="true" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="ardour8" executable="ardour8" name="Ardour" icon="ardour" client_id="ardour" list_ardour_templates="true" prefix_mode="2" jack_naming="0"/>
@@ -16,17 +16,17 @@
<Client-Template template-name="Ardour5" executable="Ardour5" name="Ardour" icon="ardour" client_id="ardour" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="ardour5" executable="ardour5" name="Ardour" icon="ardour" client_id="ardour" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="Mixbus9" executable="Mixbus9" name="Mixbus" client_id="mixbus" label="Mixbus9" list_ardour_templates="true" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="Mixbus8" executable="Mixbus8" name="Mixbus" client_id="mixbus" label="Mixbus8" list_ardour_templates="true"/>
<Client-Template template-name="Mixbus8" executable="Mixbus8" name="Mixbus" client_id="mixbus" label="Mixbus8" list_ardour_templates="true" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="Mixbus32c9" executable="Mixbus32c9" name="Mixbus32C" client_id="mixbus32c" label="Mixbus32c9" list_ardour_templates="true" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="Mixbus32c8" executable="Mixbus32c8" name="Mixbus32C" client_id="mixbus32c" label="Mixbus32c8" list_ardour_templates="true" prefix_mode="2" jack_naming="0"/>
<Client-Template template-name="amsynth" executable="amsynth" name="amsynth" client_id="amsynth" check_nsm_bin="1" prefix_mode="1"/>
<Client-Template template-name="amsynth" executable="amsynth" name="amsynth" client_id="amsynth" check_nsm_bin="1" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="Carla" executable="carla-jack-multi" client_id="Carla" label="Carla" jack_naming="1" prefix_mode="1"/>
<Client-Template template-name="Carla-Rack" executable="carla-rack" client_id="rack" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="Carla-Patchbay" executable="carla-patchbay" client_id="patchbay" prefix_mode="1"/>
<Client-Template template-name="Carla-Patchbay" executable="carla-patchbay" client_id="patchbay" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="Non-Mixer" executable="non-mixer" client_id="nonmixer" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="Qtractor" executable="qtractor" client_id="qtractor" jack_naming="1"/>
<Client-Template template-name="Guitarix" client_id="guitarix" executable="guitarix" check_nsm_bin="1" prefix_mode="1"/>
<Client-Template template-name="Non-Timeline" executable="non-timeline" client_id="timeline" jack_naming="1"/>
<Client-Template template-name="Qtractor" executable="qtractor" client_id="qtractor" jack_naming="1" prefix_mode="2"/>
<Client-Template template-name="Guitarix" client_id="guitarix" executable="guitarix" check_nsm_bin="1" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="Non-Timeline" executable="non-timeline" client_id="timeline" prefix_mode="2" jack_naming="1"/>
<Client-Template template-name="Luppp" executable="luppp" client_id="luppp" unignored_extensions=".wav" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="ZynAddSubFX" client_id="zynaddsub" desktop_file="zynaddsubfx-jack" executable="zynaddsubfx" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="synthv1" client_id="synthv1" icon="synthv1-jack" executable="synthv1_jack" prefix_mode="1" jack_naming="1"/>

4
client_templates/60_ray_lash/client_templates.xml
View File

@@ -10,12 +10,12 @@
but can be cancel if Client-Template node has 'erased_by_nsm_desktop_file' set to false. -->
<RAY-CLIENT-TEMPLATES erased_by_nsm_desktop_file="true">
<Client-Template template-name="Hydrogen" protocol="ray_hack" client_id="hydrogen" stop_signal="15" config_file="$RAY_SESSION_NAME.h2song" executable="hydrogen" arguments="-n -s &quot;$CONFIG_FILE&quot;" save_signal="10" wait_window="1"/>
<Client-Template template-name="Hydrogen" protocol="ray_hack" client_id="hydrogen" stop_signal="15" config_file="$RAY_SESSION_NAME.h2song" executable="hydrogen" arguments="-n -s &quot;$CONFIG_FILE&quot;" save_signal="10" wait_window="1" prefix_mode="2"/>
<Client-Template template-name="Rosegarden" protocol="ray_hack" desktop_file="com.rosegardenmusic.rosegarden" client_id="rosegarden" executable="rosegarden" save_signal="10" stop_signal="15" config_file="$RAY_SESSION_NAME.rg" arguments="&quot;$CONFIG_FILE&quot;" wait_window="1"/>
<Client-Template template-name="Guitarix" protocol="ray_hack" client_id="guitarix" executable="guitarix" label="Guitarix" save_signal="10" stop_signal="15" arguments="-f &quot;$CONFIG_FILE&quot;" config_file="$RAY_SESSION_NAME.conf" wait_window="1"/>
<Client-Template template-name="Qsampler" protocol="ray_hack" client_id="qsampler" config_file="$RAY_SESSION_NAME.lscp" executable="qsampler" arguments="&quot;$CONFIG_FILE&quot;" save_signal="10" stop_signal="15" wait_window="1"/>
<Client-Template template-name="GxTuner" erased_by_nsm_desktop_file="false" protocol="ray_hack" client_id="tuner" icon="carla" label="GxTuner" try-exec="guitarix" check_last_save="0" arguments="http://guitarix.sourceforge.net/plugins/gxtuner#tuner&#xa;" save_signal="10" stop_signal="15" config_file="anything" executable="carla-single" wait_window="1"/>
<Client-Template template-name="CalfJACKHost" protocol="ray-hack" arguments="-c &quot;$RAY_JACK_CLIENT_NAME&quot; --load &quot;$CONFIG_FILE&quot;" save_signal="10" stop_signal="15" executable="calfjackhost" config_file="$RAY_SESSION_NAME.calf" wait_window="1" label="Calf JACK Host" client_id="calf" desktop_file="calf" name="Calf JACK Host" tp_display_name_is_label="true"/>
<Client-Template template-name="CalfJACKHost" protocol="ray-hack" arguments="-c &quot;$RAY_JACK_CLIENT_NAME&quot; --load &quot;$CONFIG_FILE&quot;" save_signal="10" stop_signal="15" executable="calfjackhost" config_file="$RAY_SESSION_NAME.calf" wait_window="1" label="Calf JACK Host" client_id="calf" desktop_file="calf" name="Calf JACK Host" tp_display_name_is_label="true" prefix_mode="1" jack_naming="1"/>
<Client-Template template-name="Seq24" protocol="ray_hack" client_id="seq24" stop_signal="15" arguments="&quot;$CONFIG_FILE&quot;" config_file="$RAY_SESSION_NAME.midi" executable="seq24" save_signal="10" wait_window="1"/>
<Client-Template template-name="Sequencer64" protocol="ray_hack" desktop_file="sequencer64" client_id="seq64" label="Sequencer64" save_signal="10" stop_signal="15" executable="seq64" config_file="$RAY_SESSION_NAME.midi" arguments="-m &quot;$CONFIG_FILE&quot;"/>
<Client-Template stop_signal="15" template-name="Rakarrack-plus" client_id="r_plus" save_signal="10" protocol="Ray-Hack" wait_win="0" executable="rakarrack-plus" arguments="-l &quot;$CONFIG_FILE&quot; -j &quot;$RAY_JACK_CLIENT_NAME&quot;" name="rakarrack-plus" config_file="$RAY_SESSION_NAME.rkr"/>

10
src/daemon/session_operating.py
View File

@@ -440,9 +440,6 @@ class OperatingSession(Session):
self.load_error(ray.Err.BAD_PROJECT)
return
sess_version = root.attrib.get('VERSION', '0.8.0')
old_mode = bool(ray.version_to_tuple(sess_version) < (0, 17, 0))
root.attrib['name'] = spath.name
tmp_clients = list[Client]()
@@ -453,8 +450,7 @@ class OperatingSession(Session):
for client_xml in child:
client = Client(self)
client.read_xml_properties(
XmlElement(client_xml), old_mode=old_mode)
client.read_xml_properties(XmlElement(client_xml))
if not client.executable_path:
continue
@@ -1266,8 +1262,6 @@ for better organization.""")
xroot = XmlElement(root)
sess_name = xroot.string('name')
sess_version = xroot.string('VERSION', '0.9.0')
old_mode = ray.version_to_tuple(sess_version) < (0, 17, 0)
if xroot.bool('notes_shown'):
self.future_notes_shown = True
@@ -1279,7 +1273,7 @@ for better organization.""")
for cchild in child:
c = XmlElement(cchild)
client = Client(self)
client.read_xml_properties(c, old_mode=old_mode)
client.read_xml_properties(c)
if not client.executable_path:
continue

2
src/shared/ray.py
View File

@@ -11,7 +11,7 @@ if TYPE_CHECKING:
from qtpy.QtCore import QSettings
VERSION = '0.17.0'
VERSION = '0.17.1'
APP_TITLE = 'RaySession'
DEFAULT_SESSION_ROOT = Path.home() / 'Ray Sessions'
SCRIPTS_DIR = 'ray-scripts'