diff --git a/CHANGELOG b/CHANGELOG index 059c5c7..be3b93e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -11,6 +11,7 @@ Initial startup-check for old $HOME session root vs new XDG root. Support nsmd 1.6.0 lockfiles. Older nsmd versions still work. On startup give a choice to connect to an already running session (nsmd 1.6.0) Remove internal program- and icon-database and replace with dynamic XDG based lookup. +Add a nsm-data desktop file with nsm tags and "no-display", so it can be found by Agordejo. ## 2022-01-15 0.3.1 diff --git a/Makefile.in b/Makefile.in index d00c892..3d97b43 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,6 +54,7 @@ install: install -D -m 644 desktop/desktop.desktop $(DESTDIR)$(PREFIX)/share/applications/org.laborejo.agordejo.desktop install -D -m 644 desktop/agordejo-continue.desktop $(DESTDIR)$(PREFIX)/share/applications/org.laborejo.agordejo-continue.desktop + install -D -m 644 desktop/nsm-data.desktop $(DESTDIR)$(PREFIX)/share/applications/org.laborejo.nsm-data.desktop install -d $(DESTDIR)$(PREFIX)/share/man/man1 gzip -c documentation/$(PROGRAM).1 > $(DESTDIR)$(PREFIX)/share/man/man1/$(PROGRAM).1.gz @@ -67,8 +68,8 @@ install: #Engine resources - install -d $(DESTDIR)$(PREFIX)/share/$(PROGRAM) - cp -r engine/resources/* $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/ + #install -d $(DESTDIR)$(PREFIX)/share/$(PROGRAM) + #cp -r engine/resources/* $(DESTDIR)$(PREFIX)/share/$(PROGRAM)/ uninstall: @@ -81,6 +82,7 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/bin/nsm-data rm -f $(DESTDIR)$(PREFIX)/share/applications/org.laborejo.agordejo.desktop rm -f $(DESTDIR)$(PREFIX)/share/applications/org.laborejo.agordejo-continue.desktop + rm -f $(DESTDIR)$(PREFIX)/share/applications/org.laborejo.nsm-data.desktop rm -f $(DESTDIR)$(PREFIX)/share/man/man1/$(PROGRAM).1.gz rm -f $(DESTDIR)$(PREFIX)/share/man/man1/nsm-data.1.gz diff --git a/desktop/nsm-data.desktop b/desktop/nsm-data.desktop new file mode 100644 index 0000000..997794a --- /dev/null +++ b/desktop/nsm-data.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Name=NSM-Data +Comment=In-session data storage for Agordejo +Exec=nsm-data +Icon=agordejo +Terminal=false +StartupNotify=false +Version=1.0 +Categories=Audio; +X-NSM-Capable=true +X-NSM-Exec=nsm-data +NoDisplay=true diff --git a/engine/findprograms.py b/engine/findprograms.py index d6abfb8..206d026 100644 --- a/engine/findprograms.py +++ b/engine/findprograms.py @@ -44,15 +44,15 @@ class SupportedProgramsDatabase(object): def __init__(self): self.progressHook = nothing #prevents the initial programstart from sending meaningless messages for the cached data. Set and reverted in self.build - self.blackList = set(("nsmd", "non-daw", "carla", "agordejo", "adljack", "agordejo.bin")) #only programs that have to do with audio and music. There is another general blacklist that speeds up discovery + self.blackList = set(("nsmd", "non-daw", "carla", "agordejo", "adljack", "agordejo.bin", "non-midi-mapper", "non-mixer-noui")) #only programs that have to do with audio and music. There is another general blacklist that speeds up discovery self.whiteList = set(("thisdoesnotexisttest", "patroneo", "vico", "tembro", "laborejo", "fluajho", "carla-rack", "carla-patchbay", "carla-jack-multi", "carla-jack-single", "ardour5", "ardour6", "nsm-data", "jackpatch", "nsm-proxy", "ADLplug", "ams", "drumkv1_jack", "synthv1_jack", "samplv1_jack", "padthv1_jack", - "luppp", "non-mixer", "non-timeline", "non-sequencer", "non-midi-mapper", "non-mixer-noui", + "luppp", "non-mixer", "non-timeline", "non-sequencer", "OPNplug", "qmidiarp", "qtractor", "zynaddsubfx", "jack_mixer", "hydrogen", "mfp", "shuriken", "guitarix", "radium", - "ray-proxy", "ray-jackpatch", "amsynth", "mamba", "qseq66", "zynaddsubfx-jack" + "ray-proxy", "ray-jackpatch", "amsynth", "mamba", "qseq66", "synthpod", "tap192", )) #shortcut list and programs not found by buildCache_grepExecutablePaths because they are just shellscripts and do not contain /nsm/server/announce. self.userWhitelist = () #added dynamically by api.systemProgramsSetWhitelist add to morePrograms. highest priority self.userBlacklist = () #added dynamically by api.systemProgramsSetBlacklist as blacklist. highest priority