diff --git a/data/templates/Non-DAW/history b/data/templates/Non-DAW/history new file mode 100644 index 0000000..e1c150b --- /dev/null +++ b/data/templates/Non-DAW/history @@ -0,0 +1 @@ +Tempo_Point 0x1 create :start 0 :tempo X_BPM_X-CLAUDIA-X_BPM_X00000 diff --git a/data/templates/Non-DAW/info b/data/templates/Non-DAW/info new file mode 100644 index 0000000..1bfea44 --- /dev/null +++ b/data/templates/Non-DAW/info @@ -0,0 +1,8 @@ +created by + The Non-DAW 1.0.0 +created on + Thu Sep 2 02:03:44 2010 +version + 1 +sample rate + X_SR_X-CLAUDIA-X_SR_X diff --git a/data/templates/Non-Sequencer.non b/data/templates/Non-Sequencer.non new file mode 100644 index 0000000..3cff1d2 Binary files /dev/null and b/data/templates/Non-Sequencer.non differ diff --git a/src/claudia_database.py b/src/claudia_database.py index b5948f9..0d6473c 100644 --- a/src/claudia_database.py +++ b/src/claudia_database.py @@ -34,11 +34,11 @@ list_DAW = [ ( "hydrogen", "Hydrogen", "Drum Sequencer", "hydrogen -d jack", "h2-icon", TEMPLATE_YES, LEVEL_JS, "OpenSource", (1, 0, 0, 0, "", 1, 1, "ALSA | JACK"), ("file:///usr/share/hydrogen/data/doc/manual_en.html.upstream", "http://www.hydrogen-music.org/") ), ( "hydrogen-svn", "Hydrogen (SVN)", "Drum Sequencer", "hydrogen -d jack", "h2-icon", TEMPLATE_YES, LEVEL_JS, "OpenSource", (1, 0, 0, 0, "", 1, 1, "ALSA | JACK"), ("file:///usr/share/hydrogen/data/doc/manual_en.html.upstream", "http://www.hydrogen-music.org/") ), - ( "jacker", "Jacker", "MIDI Sequencer", "jacker", "jacker", TEMPLATE_NO, LEVEL_0, "OpenSource", (0, 0, 0, 0, "", 1, 1, "JACK"), ("", "https://bitbucket.org/paniq/jacker/wiki/Home") ), + ( "jacker", "Jacker", "MIDI Sequencer", "jacker", "jacker", TEMPLATE_YES, LEVEL_0, "OpenSource", (0, 0, 0, 0, "", 1, 1, "JACK"), ("", "https://bitbucket.org/paniq/jacker/wiki/Home") ), - ( "lmms", "LMMS", "DAW", "lmms", "lmms", TEMPLATE_NO, LEVEL_0, "OpenSource", (1, 0, 0, 1, "Windows", 0, 1, "ALSA"), ("file:///usr/share/kxstudio/docs/LMMS_UserManual_0.4.12.1.pdf", "http://lmms.sourceforge.net/") ), + ( "lmms", "LMMS", "DAW", "lmms", "lmms", TEMPLATE_YES, LEVEL_0, "OpenSource", (1, 0, 0, 1, "Windows", 0, 1, "ALSA"), ("file:///usr/share/kxstudio/docs/LMMS_UserManual_0.4.12.1.pdf", "http://lmms.sourceforge.net/") ), - ( "muse", "MusE", "DAW", "muse", "muse", TEMPLATE_NO, LEVEL_0, "OpenSource", (1, 1, 0, 0, "", 1, 1, "ALSA + JACK"), ("file:///usr/share/doc/muse/html/window_ref.html", "http://www.muse-sequencer.org/") ), + ( "muse", "MusE", "DAW", "muse", "muse", TEMPLATE_YES, LEVEL_0, "OpenSource", (1, 1, 0, 0, "", 1, 1, "ALSA + JACK"), ("file:///usr/share/doc/muse/html/window_ref.html", "http://www.muse-sequencer.org/") ), ( "musescore", "MuseScore", "MIDI Composer", "mscore", "mscore", TEMPLATE_NO, LEVEL_0, "OpenSource", (0, 0, 0, 0, "", 0, 1, "ALSA | JACK"), ("file:///usr/share/kxstudio/docs/MuseScore-en.pdf", "http://www.musescore.org/") ), diff --git a/src/claudia_launcher.py b/src/claudia_launcher.py index da0eb9a..1b57d34 100755 --- a/src/claudia_launcher.py +++ b/src/claudia_launcher.py @@ -330,7 +330,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): elif app == "ardour3": tmplte_folder = os.path.join(proj_folder, "Ardour3_%i" % rand_check) - tmplte_file = os.path.join(tmplte_folder, "Ardour3_%i.ardour" % rand_check) + tmplte_file = os.path.join(tmplte_folder, "Ardour3_%i.ardour" % rand_check) os.mkdir(tmplte_folder) # Create template @@ -410,6 +410,30 @@ 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 app == "non-daw": + tmplte_folder = os.path.join(proj_folder, "Non-DAW_%i" % rand_check) + os.mkdir(tmplte_folder) + + # Create template + 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.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"))) + os.system('sed -i "s/X_BPM_X-CLAUDIA-X_BPM_X/%s/" "%s"' % (proj_bpm, os.path.join(tmplte_folder, "history"))) + + tmplte_cmd = binary + tmplte_cmd += " '%s'" % (os.path.basename(tmplte_folder) if self.callback_isLadishRoom() else tmplte_folder) + + elif app == "non-sequencer": + tmplte_file = os.path.join(proj_folder, "Non-Sequencer_%i.non" % rand_check) + + # Create template + os.system("cp '%s' '%s'" % (os.path.join(tmplte_dir, "Non-Sequencer.non"), tmplte_file)) + + tmplte_cmd = binary + tmplte_cmd += " '%s'" % (os.path.basename(tmplte_file) if self.callback_isLadishRoom() else tmplte_file) + elif app == "calfjackhost": tmplte_file = os.path.join(proj_folder, "CalfJackHost_%i" % rand_check) @@ -449,19 +473,6 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): #tmplte_cmd = binary #tmplte_cmd += " -f '%s'" % (os.path.basename(tmplte_file_r) if self.callback_isLadishRoom() else tmplte_file_r) - #elif (app == "non-daw"): - #tmplte_folder = os.path.join(proj_folder, "Non-DAW_%i" % (rand_check)) - - ## Create template - #os.system("cp -r '%s' '%s'" % (os.path.join(sys.path[0], "..", "templates", "Non-DAW"), tmplte_folder)) - #os.mkdir(os.path.join(tmplte_folder, "sources")) - - #os.system('sed -i "s/X_SR_X-KLAUDIA-X_SR_X/%s/" "%s"' % (proj_srate, os.path.join(tmplte_folder, "info"))) - #os.system('sed -i "s/X_BPM_X-KLAUDIA-X_BPM_X/%s/" "%s"' % (proj_bpm, os.path.join(tmplte_folder, "history"))) - - #tmplte_cmd = binary - #tmplte_cmd += " '%s'" % (os.path.basename(tmplte_folder) if self.callback_isLadishRoom() else tmplte_folder) - #elif (app == "non-mixer"): #tmplte_folder = os.path.join(proj_folder, "Non-Mixer_%i" % (rand_check)) @@ -471,15 +482,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 (app == "non-sequencer"): - #tmplte_file_r = os.path.join(proj_folder, "Non-Sequencer_%i.non" % (rand_check)) - - ## Create template - #os.system("cp '%s' '%s'" % (os.path.join(sys.path[0], "..", "templates", "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 (app == "qsampler"): #tmplte_file_r = os.path.join(proj_folder, "Qsampler_%i.lscp" % (rand_check)) @@ -556,8 +558,7 @@ class ClaudiaLauncher(QWidget, ui_claudia_launcher.Ui_ClaudiaLauncherW): if tmplte_file != None: os.system('sed -i "s/X_SR_X-CLAUDIA-X_SR_X/%s/" "%s"' % (proj_srate, tmplte_file)) os.system('sed -i "s/X_BPM_X-CLAUDIA-X_BPM_X/%s/" "%s"' % (proj_bpm, tmplte_file)) - os.system('sed -i "s/X_FOLDER_X-CLAUDIA-X_FOLDER_X/%s/" "%s"' % ( - proj_folder.replace("/", "\/").replace("$", "\$"), tmplte_file)) + os.system('sed -i "s/X_FOLDER_X-CLAUDIA-X_FOLDER_X/%s/" "%s"' % (proj_folder.replace("/", "\/").replace("$", "\$"), tmplte_file)) appBus = self.callback_getAppBus() appBus.RunCustom2(False, tmplte_cmd, app_name, tmplte_lvl)