From 902daa96ee2d30107dec78aaab2b397419b5f49d Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 11 Jul 2015 20:57:05 +0200 Subject: [PATCH] Update Claudia DB --- .../apps/{non-daw.png => non-timeline.png} | Bin .../apps/{non-daw.png => non-timeline.png} | Bin .../{Non-DAW => Non-Timeline}/history | 0 data/templates/{Non-DAW => Non-Timeline}/info | 2 +- src/claudia_database.py | 26 ++++++++++++++---- src/claudia_launcher.py | 26 +++++++++--------- 6 files changed, 35 insertions(+), 19 deletions(-) rename data/icons/claudia-hicolor/16x16/apps/{non-daw.png => non-timeline.png} (100%) rename data/icons/claudia-hicolor/48x48/apps/{non-daw.png => non-timeline.png} (100%) rename data/templates/{Non-DAW => Non-Timeline}/history (100%) rename data/templates/{Non-DAW => Non-Timeline}/info (79%) diff --git a/data/icons/claudia-hicolor/16x16/apps/non-daw.png b/data/icons/claudia-hicolor/16x16/apps/non-timeline.png similarity index 100% rename from data/icons/claudia-hicolor/16x16/apps/non-daw.png rename to data/icons/claudia-hicolor/16x16/apps/non-timeline.png diff --git a/data/icons/claudia-hicolor/48x48/apps/non-daw.png b/data/icons/claudia-hicolor/48x48/apps/non-timeline.png similarity index 100% rename from data/icons/claudia-hicolor/48x48/apps/non-daw.png rename to data/icons/claudia-hicolor/48x48/apps/non-timeline.png diff --git a/data/templates/Non-DAW/history b/data/templates/Non-Timeline/history similarity index 100% rename from data/templates/Non-DAW/history rename to data/templates/Non-Timeline/history diff --git a/data/templates/Non-DAW/info b/data/templates/Non-Timeline/info similarity index 79% rename from data/templates/Non-DAW/info rename to data/templates/Non-Timeline/info index 1bfea44..bd23c6a 100644 --- a/data/templates/Non-DAW/info +++ b/data/templates/Non-Timeline/info @@ -1,5 +1,5 @@ created by - The Non-DAW 1.0.0 + The Non-Timeline 1.0.0 created on Thu Sep 2 02:03:44 2010 version diff --git a/src/claudia_database.py b/src/claudia_database.py index 5151014..ca8b1ad 100644 --- a/src/claudia_database.py +++ b/src/claudia_database.py @@ -22,15 +22,19 @@ USING_KXSTUDIO = False # (L, D, L, V, VST-Mode, T, M, MIDI-Mode) -> (LADSPA, DSSI, LV2, VST, VST-Mode, Transport, MIDI, MIDI-Mode) +# TODO: +# luppp +# protrekkr + list_DAW = [ # Package AppName Type Binary Icon Template? Level (L, D, L, V, VST-Mode, T, M, MIDI-Mode) (doc-file, website) [ "ardour", "Ardour 2.8", "DAW", "ardour2", "ardour", TEMPLATE_YES, LEVEL_0, (1, 0, 1, 0, "", 1, 0, "ALSA"), ("file:///usr/share/kxstudio/docs/ardour.pdf", "http://www.ardour.org/") ], [ "ardour3", "Ardour 3", "DAW", "ardour3", "ardour", TEMPLATE_YES, LEVEL_JS, (1, 0, 1, 1, "Native", 1, 1, "JACK"), ("file:///usr/share/kxstudio/docs/ardour.pdf", "http://www.ardour.org/") ], - [ "ardour4", "Ardour 4", "DAW", "ardour4", "ardour", TEMPLATE_YES, LEVEL_JS, (1, 0, 1, 1, "Native", 1, 1, "JACK"), ("file:///usr/share/kxstudio/docs/ardour.pdf", "http://www.ardour.org/") ], + [ "ardour4", "Ardour 4", "DAW", "ardour4", "ardour", TEMPLATE_NO, LEVEL_JS, (1, 0, 1, 1, "Native", 1, 1, "JACK"), ("file:///usr/share/kxstudio/docs/ardour.pdf", "http://www.ardour.org/") ], [ "ariamaestosa", "Aria Maestosa", "MIDI Sequencer", "Aria", "aria", TEMPLATE_NO, LEVEL_0, (0, 0, 0, 0, "", 0, 1, "ALSA | JACK"), ("", "http://ariamaestosa.sf.net/") ], - [ "giada", "Giada", "Audio Looper", "giada", generic_audio_icon, TEMPLATE_YES, LEVEL_0, (0, 0, 0, 1, "Native", 0, 0, ""), ("", "http://www.monocasual.com/giada/") ], + [ "giada", "Giada", "Audio Looper", "giada", generic_audio_icon, TEMPLATE_NO, LEVEL_0, (0, 0, 0, 1, "Native", 0, 0, ""), ("", "http://www.monocasual.com/giada/") ], [ "hydrogen", "Hydrogen", "Drum Sequencer", "hydrogen -d jack", "h2-icon", TEMPLATE_YES, LEVEL_JS, (1, 0, 0, 0, "", 1, 1, "ALSA | JACK"), ("file:///usr/share/hydrogen/data/doc/manual_en.html.upstream", "http://www.hydrogen-music.org/") ], [ "hydrogen-git", "Hydrogen (GIT)", "Drum Sequencer", "hydrogen -d jack", "h2-icon", TEMPLATE_YES, LEVEL_JS, (1, 0, 0, 0, "", 1, 1, "ALSA | JACK"), ("file:///usr/share/hydrogen/data/doc/manual_en.html.upstream", "http://www.hydrogen-music.org/") ], @@ -44,8 +48,8 @@ list_DAW = [ [ "musescore", "MuseScore", "MIDI Composer", "mscore", "mscore", TEMPLATE_NO, LEVEL_0, (0, 0, 0, 0, "", 0, 1, "ALSA | JACK"), ("file:///usr/share/kxstudio/docs/MuseScore-en.pdf", "http://www.musescore.org/") ], - [ "non-daw", "Non-DAW", "DAW", "non-daw", "non-daw", TEMPLATE_YES, LEVEL_NSM, (0, 0, 0, 0, "", 1, 0, "CV + OSC"), ("file:///usr/share/doc/non-daw/MANUAL.html", "http://non-daw.tuxfamily.org/") ], - [ "non-sequencer", "Non-Sequencer", "MIDI Sequencer", "non-sequencer", "non-sequencer", TEMPLATE_YES, LEVEL_NSM, (0, 0, 0, 0, "", 1, 1, "JACK"), ("file:///usr/share/doc/non-sequencer/MANUAL.html", "http://non-sequencer.tuxfamily.org/") ], + [ "non-sequencer", "Non-Sequencer", "MIDI Sequencer", "non-sequencer", "non-sequencer", TEMPLATE_YES, LEVEL_NSM, (0, 0, 0, 0, "", 1, 1, "JACK"), ("file:///usr/share/doc/non-sequencer/MANUAL.html", "http://non.tuxfamily.org/wiki/Non%20Sequencer") ], + [ "non-timeline", "Non-Timeline", "DAW", "non-timeline", "non-timeline", TEMPLATE_YES, LEVEL_NSM, (0, 0, 0, 0, "", 1, 0, "CV + OSC"), ("file:///usr/share/doc/non-timeline/MANUAL.html", "http://non.tuxfamily.org/wiki/Non%20Timeline") ], [ "qtractor", "Qtractor", "DAW", "qtractor", "qtractor", TEMPLATE_YES, LEVEL_1, (1, 1, 1, 1, "Native", 1, 1, "ALSA"), ("file:///usr/share/kxstudio/docs/qtractor-0.5.x-user-manual.pdf", "http://qtractor.sf.net/") ], [ "qtractor-svn", "Qtractor (SVN)", "DAW", "qtractor", "qtractor", TEMPLATE_YES, LEVEL_1, (1, 1, 1, 1, "Native", 1, 1, "ALSA"), ("file:///usr/share/kxstudio/docs/qtractor-0.5.x-user-manual.pdf", "http://qtractor.sf.net/") ], @@ -68,6 +72,11 @@ if USING_KXSTUDIO: # (I, L, D, L, V, VST-Mode, MIDI-Mode) -> (Internal, LADSPA, DSSI, LV2, VST, VST-Mode, MIDI-Mode) +# TODO: +# ams +# mod-app +# spiralsynthmodular + list_Host = [ # Package AppName Ins? FX? Binary Icon Template? Level (I, L, D, L, V, VST-Mode, MIDI-Mode) (doc-file, website) [ "calf-plugins", "Calf Jack Host", "Yes", "Yes", "calfjackhost", "calf", TEMPLATE_NO, LEVEL_1, (1, 0, 0, 0, 0, "", "JACK"), ("file:///usr/share/doc/calf/index.html", "http://calf.sf.net/") ], @@ -91,6 +100,10 @@ iHost_Package, iHost_AppName, iHost_Ins, iHost_FX, iHost_Binary, iHost_Icon, iHo # (F, I, MIDI-Mode) -> (Built-in FX, Audio Input, MIDI-Mode) +# TODO: +# add64 +# cursynth + list_Instrument = [ # Package AppName Type Binary Icon Template? Level (F, I, MIDI-Mode) (doc-file, website) [ "aeolus", "Aeolus", "Synth", "aeolus -J", generic_audio_icon, TEMPLATE_NO, LEVEL_0, (0, 0, "ALSA | JACK"), ("", "http://www.kokkinizita.net/linuxaudio/aeolus/index.html") ], @@ -197,6 +210,9 @@ iEffect_Package, iEffect_AppName, iEffect_Type, iEffect_Binary, iEffect_Icon, iE # (MIDI-Mode, T) -> (MIDI-Mode, Transport) +# TODO: +# paulstretch + list_Tool = [ # Package AppName Type Binary Icon Template? Level (MIDI-Mode, T) (doc, website) [ "arpage", "Arpage", "MIDI Arpeggiator", "arpage", "arpage", TEMPLATE_NO, LEVEL_0, ("JACK", 1), ("", "") ], @@ -242,7 +258,7 @@ list_Tool = [ [ "mixxx", "Mixxx", "DJ", "mixxx", "mixxx", TEMPLATE_NO, LEVEL_0, ("ALSA", 0), ("file:///usr/share/kxstudio/docs/Mixxx-Manual.pdf", "http://mixxx.sf.net/") ], - [ "non-mixer", "Non-Mixer", "Mixer", "non-mixer", "non-mixer", TEMPLATE_NO, LEVEL_0, ("CV", 0), ("file:///usr/share/doc/non-mixer/MANUAL.html", "http://non-daw.tuxfamily.org/") ], + [ "non-mixer", "Non-Mixer", "Mixer", "non-mixer", "non-mixer", TEMPLATE_NO, LEVEL_0, ("CV", 0), ("file:///usr/share/doc/non-mixer/MANUAL.html", "http://non.tuxfamily.org/wiki/Non%20Mixer") ], [ "patchage", "Patchage", "Patch Bay", "patchage", "patchage", TEMPLATE_NO, LEVEL_0, ("ALSA + JACK", 0), ("", "http://drobilla.net/blog/software/patchage/") ], [ "patchage", "Patchage (ALSA Only)", "Patch Bay", "patchage -J", "patchage", TEMPLATE_NO, LEVEL_0, ("ALSA", 0), ("", "http://drobilla.net/blog/software/patchage/") ], diff --git a/src/claudia_launcher.py b/src/claudia_launcher.py index d47fc9f..275d4fb 100755 --- a/src/claudia_launcher.py +++ b/src/claudia_launcher.py @@ -243,8 +243,8 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): "jacker", "lmms", "muse", - "non-daw", "non-sequencer", + "non-timeline", "qtractor", "rosegarden", "seq24", @@ -391,12 +391,20 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) - elif binary == "non-daw": - tmplte_folder = os.path.join(proj_folder, "Non-DAW_%i" % rand_check) + elif binary == "non-sequencer": + tmplte_file_r = os.path.join(proj_folder, "Non-Sequencer_%i.non" % rand_check) + + os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-Sequencer.non"), tmplte_file_r)) + + tmplte_cmd = binary + tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r) + + elif binary == "non-timeline": + tmplte_folder = os.path.join(proj_folder, "Non-Timeline_%i" % rand_check) os.mkdir(tmplte_folder) - os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-DAW", "history"), tmplte_folder)) - os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-DAW", "info"), tmplte_folder)) + os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-Timeline", "history"), tmplte_folder)) + os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-Timeline", "info"), tmplte_folder)) os.mkdir(os.path.join(tmplte_folder, "sources")) os.system('sed -i "s/X_SR_X-CLAUDIA-X_SR_X/%s/" "%s"' % (proj_srate, os.path.join(tmplte_folder, "info"))) @@ -405,14 +413,6 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd = binary tmplte_cmd += " '%s'" % (os.path.basename(tmplte_folder) if self.callback_isLadishRoom() else tmplte_folder) - elif binary == "non-sequencer": - tmplte_file_r = os.path.join(proj_folder, "Non-Sequencer_%i.non" % rand_check) - - os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-Sequencer.non"), tmplte_file_r)) - - tmplte_cmd = binary - tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r) - elif binary == "qtractor": tmplte_file = os.path.join(proj_folder, "Qtractor_%i.qtr" % rand_check)