Merge pull request #19 from tu-studio/main

first refinement round from Fares

Questions_for_Nils.md

@@ -0,0 +1,12 @@
+# Questions for Nils
+
+1. Why are there system and user systemd services for twonder and cwonder? Which one should be used?
+2. I believe we are using the user services for twonder and cwonder.
+3. The jack.service file has After=sound.target local-fs.target, but these targets do not exist on the systems. Why are they there?
+4. Where is the include directory path for the config.h file defined?
+5. The config.h.in file is is not needed right?
+6. All those scripts in the scripts directory are not needed right? Except for the start-twonder.sh script.
+7. Where is the Dante pcie driver from?
+8. Is pinging really needed for the twonder and cwonder services? And if not, cann't we just go without jfwonder?
+9. Do you know what the twonder_config.xml file is for and the the Negative Delay in the cluster configuration?
+10. Why shall we need jfwonder?

TODO.md

@@ -0,0 +1,5 @@
+# TODO
+
+- [x] Add runpaths to the final executables
+- [ ] Uncomment the saving of old clients
+- [ ] Change the default paths of c and t wonder config files

docs/Installation/Build.md

@@ -80,6 +80,6 @@ can change the owner of files in your build directory to root. Running
 
 |Files|Location|
 |---    |---    |
-|Startup Scripts |*/usr/share/wonder/scripts*|
-|XML DTD |*/usr/share/wonder/dtd*|
-|Configuration files|*/etc/wonder*|
+|Startup Scripts |*/usr/local/share/wonder/scripts*|
+|XML DTD |*/usr/local/share/wonder/dtd*|
+|Configuration files|*/usr/local/etc/wonder*|

docs/Installation/Config.md

@@ -1,10 +1,10 @@
 # Wonder Configuration
 
-Wonder's configuration files must be put in `/etc/wonder`.
+Wonder's configuration files must be put in `/usr/local/etc/wonder`.
 
 ## Cluster configuration
 
-`/etc/wonder/cluster.conf` sets environment variables for wonder. You should
+`/usr/local/etc/wonder/cluster.conf` sets environment variables for wonder. You should
 set the IP address of your CWonder machine, the JACK setup information
 and the negative delay length in meters for focused sources.
 
@@ -31,7 +31,7 @@ JACK_OUTPUTS=128;
 
 ## CWonder 
 
-`/etc/wonder/cwonder_config.xml` sets the project path, number of sources and room geometry.
+`/usr/local/etc/wonder/cwonder_config.xml` sets the project path, number of sources and room geometry.
 
 ## TWonder
 

examples/config/EN325/meson.build

@@ -0,0 +1,6 @@
+message('Installing configuration files for the TU-Studio EN325.')
+message('The configuration files are installed to ' + get_option('prefix') + '/' + get_option('sysconfdir') + '.')
+
+message('This is the node: ' + get_option('node'))
+
+subdir('wonder')

examples/config/EN325/wonder/cluster.conf

@@ -0,0 +1,10 @@
+# This file contains shared information for the WONDER modules
+
+# USER_NAME='studio';
+
+CWONDER_IP='130.149.23.24';
+
+NUM_SOURCES=128;
+
+# Negative delay for focused sources (in meters)
+NEG_DELAY=7.585;

configs/EN325/cwonder_config.xml → examples/config/EN325/wonder/cwonder/cwonder_config.xml

@@ -31,8 +31,8 @@
 <!DOCTYPE cwonder_config SYSTEM "cwonder_config.dtd">
 
 <cwonder_config>
-<settings projectpath="/home/wfs/wonder3/projects" maxNoSources="64" />
-    <renderpolygon roomname="TU_Berlin_newConfig">
+<settings projectpath="/home/wfs/wonder3/projects" maxNoSources="128" />
+    <renderpolygon roomname="EN325">
 		<point x="-1.620" y="3.023" z="1.4"/>
 		<point x="1.620" y="3.023" z="1.4"/>
 		<point x="2.430" y="1.620" z="1.4"/>

examples/config/EN325/wonder/meson.build

@@ -0,0 +1,19 @@
+# The speaker configurations need to have the same folder structure for the twonder start script to work.
+# Also the speaker configurations need to start with twonder.
+
+if get_option('node') == 'none'
+    error('Please specify location with -Dnode=...')
+elif get_option('node') == 'riviera'
+    message('Installing configuration for node riviera.')
+    install_subdir('cwonder', install_dir : get_option('sysconfdir') / 'wonder')
+    install_subdir('twonder/riviera', strip_directory : true, install_dir : get_option('sysconfdir') / 'wonder' / 'twonder')
+elif get_option('node') == 'wintermute'
+    message('Installing configuration for node wintermute.')
+    install_subdir('twonder/wintermute', strip_directory : true, install_dir : get_option('sysconfdir') / 'wonder' / 'twonder')
+else
+    error('Unknown node specified.')
+endif
+
+# Install the remaining files if the node is correct, no error is thrown.
+install_data('cluster.conf', install_dir : get_option('sysconfdir') / 'wonder')
+install_data('twonder/twonder_config.xml', install_dir : get_option('sysconfdir') / 'wonder' / 'twonder')

meson.build

@@ -14,43 +14,41 @@ libsystemd_dep = dependency('libsystemd', required: get_option('systemd'))
 fmt_dep = dependency('fmt')
 
 if libsystemd_dep.found()
-	defines += '-DWONDER_SYSTEMD'
+	defines += '-DWONDER_SYSTEMD' # the defines are passed to the excecutables as cppargs
 endif
 
 subdir('src/include')
 inc = include_directories('src/include')
+lib_dir = get_option('prefix') / get_option('libdir')
+message('Library directory: ' + lib_dir)
 
 subdir('src/lib')
 subdir('src/cwonder')
-subdir('src/jfwonder')
-subdir('src/score')
+# subdir('src/jfwonder')
+# subdir('src/score')
 subdir('src/twonder')
-if get_option('xwonder') == true
-	qt5 = import('qt5')
-	qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGL', 'Xml'], include_type: 'system')
-	glu_dep = dependency('glu')
-	subdir('src/xwonder')
-endif
+# if get_option('xwonder') == true
+# 	qt5 = import('qt5')
+# 	qt5_dep = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGL', 'Xml'], include_type: 'system')
+# 	glu_dep = dependency('glu')
+# 	subdir('src/xwonder')
+# endif
 
 if systemd_dep.found()
 	subdir('services')
 endif
 
-config_dir = '/etc/wonder'
-if get_option('location') == 'none'
-	message('No location configuration selected.')
-elif get_option('location') == 'EN325'
-	install_subdir('configs/EN325', strip_directory: true, install_dir : config_dir )
-elif get_option('location') == 'HUFO'
-	install_subdir('configs/HuFo', strip_directory: true, install_dir : config_dir )
-endif
+# The configuration directory for locally installed programs should be /usr/local/etc/wonder and not to /etc/wonder as before
+# Configuration files examples are in config/examples and could be installed as follows:
+# subdir('config/examples/EN325')
+# For this to work the option 'location' and 'node' need to be set in the meson.options file
 
+# With install_dir: install_dir: get_option('datadir') the files are installed in the usr/local/share/ directory
 install_subdir('scripts', install_dir: get_option('datadir') / 'wonder')
 install_subdir('dtd', install_dir: get_option('datadir') / 'wonder')
 
 summary({'CWonder': true,
 	'TWonder': true,
 	'JFWonder': get_option('jfwonder'),
 	'XWonder': get_option('xwonder'),
-	'ScorePlayer': get_option('scoreplayer')}, bool_yn: true, section: 'Components')
-summary({'Location': get_option('location'), 'Directory': config_dir}, section: 'Configuration')
+	'ScorePlayer': get_option('scoreplayer')}, bool_yn: true, section: 'Components')

meson_options.txt → meson.options

@@ -2,4 +2,3 @@ option('xwonder', type : 'boolean', value : false)
 option('jfwonder', type : 'boolean', value : true)
 option('scoreplayer', type : 'boolean', value : true)
 option('systemd', type : 'feature', value : 'auto')
-option('location', type : 'combo', choices: ['none', 'EN325', 'HUFO'], value : 'none', description : 'Set location')