diff --git a/data/templates/Carla.carxp b/data/templates/Carla.carxp new file mode 100755 index 0000000..7e614f6 --- /dev/null +++ b/data/templates/Carla.carxp @@ -0,0 +1,4 @@ + + + + diff --git a/data/templates/Jack-Rack b/data/templates/Jack-Rack new file mode 100755 index 0000000..97f7034 Binary files /dev/null and b/data/templates/Jack-Rack differ diff --git a/src/claudia_database.py b/src/claudia_database.py index 1d1413e..998bd83 100644 --- a/src/claudia_database.py +++ b/src/claudia_database.py @@ -71,14 +71,14 @@ list_Host = [ ( "calf-plugins", "Calf Jack Host", "Yes", "Yes", "calfjackhost", "calf", TEMPLATE_NO, LEVEL_0, "OpenSource", (1, 0, 0, 0, 0, "", "JACK"), ("", "http://calf.sourceforge.net/") ), ( "calf-plugins-git", "Calf Jack Host (GIT)", "Yes", "Yes", "calfjackhost", "calf", TEMPLATE_YES, LEVEL_1, "OpenSource", (1, 0, 0, 0, 0, "", "JACK"), ("file:///usr/share/doc/calf/Calf.html", "http://calf.sourceforge.net/") ), - ( "carla", "Carla", "Yes", "Yes", "carla", "carla", TEMPLATE_NO, LEVEL_1, "OpenSource", (0, 1, 1, 1, 1, "Native", "JACK"), ("", "http://kxstudio.sourceforge.net/KXStudio:Applications:Carla") ), + ( "carla", "Carla", "Yes", "Yes", "carla", "carla", TEMPLATE_YES, LEVEL_1, "OpenSource", (1, 1, 1, 1, 1, "Native", "JACK"), ("", "http://kxstudio.sourceforge.net/KXStudio:Applications:Carla") ), ( "festige", "FeSTige", "Yes", "Yes", "festige", "festige", TEMPLATE_NO, LEVEL_1, "OpenSource", (0, 0, 0, 0, 1, "Windows", "ALSA | JACK"), ("", "http://festige.sourceforge.net/") ), - #( "ingen", "Ingen", "Yes", "Yes", "ingen -eg", "ingen", TEMPLATE_NO, LEVEL_JS, "OpenSource", (1, 0, 0, 1, 0, "", "JACK"), ("", "http://drobilla.net/blog/software/ingen/") ), + ( "ingen", "Ingen", "Yes", "Yes", "ingen -eg", "ingen", TEMPLATE_NO, LEVEL_JS, "OpenSource", (1, 0, 0, 1, 0, "", "JACK"), ("", "http://drobilla.net/blog/software/ingen/") ), ( "ingen-svn", "Ingen (SVN)", "Yes", "Yes", "ingen-svn -eg", "ingen", TEMPLATE_NO, LEVEL_JS, "OpenSource", (1, 0, 0, 1, 0, "", "JACK"), ("", "http://drobilla.net/blog/software/ingen/") ), - ( "jack-rack", "Jack Rack", "No", "Yes", "jack-rack", "jack-rack", TEMPLATE_NO, LEVEL_0, "OpenSource", (0, 1, 0, 0, 0, "", "ALSA"), ("", "http://jack-rack.sourceforge.net/") ), + ( "jack-rack", "Jack Rack", "No", "Yes", "jack-rack", "jack-rack", TEMPLATE_YES, LEVEL_0, "OpenSource", (0, 1, 0, 0, 0, "", "ALSA"), ("", "http://jack-rack.sourceforge.net/") ), ( "zynjacku", "LV2 Rack", "No", "Yes", "lv2rack", "zynjacku", TEMPLATE_NO, LEVEL_LASH, "OpenSource", (0, 0, 0, 1, 0, "", "JACK"), ("", "http://home.gna.org/zynjacku/") ), ( "zynjacku", "ZynJackU", "Yes", "No", "zynjacku", "zynjacku", TEMPLATE_NO, LEVEL_LASH, "OpenSource", (0, 0, 0, 1, 0, "", "JACK"), ("", "http://home.gna.org/zynjacku/") ), diff --git a/src/claudia_launcher.py b/src/claudia_launcher.py index ad223e6..d72474c 100755 --- a/src/claudia_launcher.py +++ b/src/claudia_launcher.py @@ -248,12 +248,15 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): elif app == "Calf Jack Host (GIT)": self.createAppTemplate("calfjackhost", app, binary) + elif app == "Carla": + self.createAppTemplate("carla", app, binary) + + elif app == "Jack Rack": + self.createAppTemplate("jack-rack", app, binary) + #elif (app == "Jack Mixer"): #self.createAppTemplate("jack-mixer", app, binary) - #elif (app == "Jack Rack"): - #self.createAppTemplate("jack-rack", app, binary) - #elif (app == "Jamin"): #self.createAppTemplate("jamin", app, binary) @@ -492,6 +495,25 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): tmplte_cmd += " --load '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) tmplte_lvl = "1" + elif app == "carla": + tmplte_file = os.path.join(proj_folder, "Carla_%i.carxp" % rand_check) + + # Create template + os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Carla.carxp"), tmplte_file)) + + tmplte_cmd = binary + tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) + tmplte_lvl = "1" + + elif app == "jack-rack": + tmplte_file = os.path.join(proj_folder, "Jack-Rack_%i" % rand_check) + + # Create template + os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Jack-Rack"), tmplte_file)) + + tmplte_cmd = binary + tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) + #elif (app == "jack-mixer"): #tmplte_file_r = os.path.join(proj_folder, "Jack-Mixer_%i.xml" % (rand_check))