From 3110571ae2a39216935019d74aa7e842ef15f2df Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 23 Jul 2010 16:14:32 +0100 Subject: [PATCH] More apps, misc fixes --- src/find_plugins.py | 26 ++++++++++++++++---------- src/tb_apps.py | 14 +++++++++----- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/find_plugins.py b/src/find_plugins.py index 1c40e6e..45b2c82 100755 --- a/src/find_plugins.py +++ b/src/find_plugins.py @@ -12,15 +12,18 @@ listOfApps = [ # ("Name", "binary", "icon", "cmd to get version (or none)", "lvl-compat", "type"), ("Ardour", "ardour2", "/usr/share/ardour2/icons/ardour_icon_22px.png", "ardour2 --version | head -n 1 | awk '{printf$2}'", "1", "DAW"), ("ArdourVST", "ardourvst", "/usr/share/ardour2/icons/ardour_icon_22px.png", "ardour2 --version | head -n 1 | awk '{printf$2}'", "1", "DAW"), - ("Hydrogen", "h2-icon", "hydrogen", "hydrogen -v", "1", "DAW"), + ("Hydrogen", "hydrogen", "h2-icon", "hydrogen -v", "1", "DAW"), + ("MusE", "muse", "muse", "", "0", "DAW"), ("Qtractor", "qtractor", "qtractor", "", "1", "DAW"), ("QtractorVST", "qtractorvst", "qtractor", "", "1", "DAW"), ("QtractorVST%20(32bit)", "qtractorvst-32bit", "qtractor", "", "1", "DAW"), ("Renoise", "renoise", "renoise", "", "0", "DAW"), + ("Rosegarden", "rosegarden", "rosegarden", "", "0", "DAW"), + ("Traverso", "traverso", "traverso", "", "0", "DAW"), ("Calf%20Jack%20Host", "calfjackhost", "calf", "", "1", "Host"), - ("Ingen", "ingen", "ingen", "", "0", "Host"), - ("Ingen%20(SVN)", "ingen-svn", "ingen-svn", "", "0", "Host"), + ("Ingen", "ingen%20-eg", "ingen", "", "0", "Host"), + ("Ingen%20(SVN)", "ingen-svn%20-eg", "ingen-svn", "", "0", "Host"), ("Jack%20Rack", "jack-rack", "jack-rack-icon", "jack-rack --version | awk '{printf$3}'", "0", "Host"), ("Jost", "jost", "jost", "", "0", "Host"), ("LV2%20Rack", "lv2rack", "lv2rack", "", "0", "Host"), @@ -28,8 +31,8 @@ listOfApps = [ ("Aeolus", "aeolus", "audio-x-generic", "", "0", "Synth"), ("amSynth", "amsynth", "amsynth", "", "0", "Synth"), - ("AZR3", "azr3-jack", "azr3-jack", "", "0", "Synth"), - ("Capsicin", "capsicin", "capsicin", "", "0", "Synth"), + ("AZR3", "azr3", "/usr/share/pixmaps/azr3-jack.xpm", "", "0", "Synth"), + ("Capsaicin", "capsaicin", "capsaicin", "", "0", "Synth"), ("DrumSynth", "drumsynth", "drumsynth", "", "0", "Synth"), ("HighLife", "highlife", "highlife", "", "0", "Synth"), ("MiniComputer", "minicomputer", "minicomputer", "", "0", "Synth"), @@ -46,13 +49,16 @@ listOfApps = [ ("EQinox", "eqinox", "eqinox", "", "0", "Effect"), ("Guitarix", "guitarix", "guitarix", "", "0", "Effect"), ("Jamin", "jamin", "jamin", "", "0", "Effect"), - ("Rakarrack", "rakarrack", "rakarrack", "", "0", "Effect"), + ("Jack%20Mixer", "jack_mixer", "jack_mixer", "", "0", "Effect"), + ("Rakarrack", "rakarrack", "/usr/share/pixmaps/icono_rakarrack_32x32.png", "", "0", "Effect"), - ("ALSA-to-Jack%20MIDI", "audio-midi", "a2jmidid", "", "0", "Tool"), + ("ALSA-to-Jack%20MIDI", "a2j%20-e", "audio-midi", "", "0", "Tool"), ("Arpage", "arpage", "arpage", "", "0", "Tool"), - ("fmit", "fmit", "fmit", "", "0", "Tool"), - ("jkmeter", "jkmeter", "jkmeter", "", "0", "Tool"), ("Jack%20Keyboard", "jack-keyboard", "jack-keyboard", "jack-keyboard -V | awk '{printf$2}'", "0", "Tool"), + ("JKmeter", "jkmeter", "audio-x-generic", "", "0", "Tool"), + ("LADI%20Patchage", "lpatchage", "lpatchage", "", "0", "Tool"), + ("mhWaveEdit", "mhwaveedit", "mhwaveedit", "", "0", "Tool"), + ("Patchage", "patchage", "patchage", "", "0", "Tool"), ] @@ -69,7 +75,7 @@ def findAll(): # Look for Pre-Setup plugins for i in range(len(listOfApps)): - path = findAppInPath(listOfApps[i][1]) + path = findAppInPath(listOfApps[i][1].split("%20")[0]) if (path): if (listOfApps[i][3]): version = getoutput(listOfApps[i][3]) diff --git a/src/tb_apps.py b/src/tb_apps.py index 8bbae6d..0dd57ca 100755 --- a/src/tb_apps.py +++ b/src/tb_apps.py @@ -90,6 +90,8 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): os.mkdir(proj_folder+"/interchange/Ardour/audiofiles") os.mkdir(proj_folder+"/peaks") shared.appBus.RunCustom(False, binary+" "+proj_folder, str(app), 1) + elif (app == "Hydrogen"): + self.NIY() elif (app == "Qtractor" or app == "QtractorVST" or app == "QtractorVST (32bit)"): if (app == "Qtractor"): binary = "tractor" @@ -145,6 +147,8 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): elif (tab == 3): #Effect if (app == "Jamin"): self.NIY() + elif (app == "Jack Mixer"): + self.NIY() else: shared.appBus.RunCustom(False, str(self.listEffects.item(self.listEffects.currentRow(), 3).text()), str(app), 0) elif (tab == 4): #Tool @@ -189,7 +193,7 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): for h in range(len(plugins)): if (plugins[h][5] == "DAW"): name = QTableWidgetItem(plugins[h][0].replace("%20"," ")) - binary = QTableWidgetItem(plugins[h][1]) + binary = QTableWidgetItem(plugins[h][1].replace("%20"," ")) icon = QTableWidgetItem("") icon.setIcon(KIcon(plugins[h][2])) version = QTableWidgetItem(plugins[h][3]) @@ -208,7 +212,7 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): for h in range(len(plugins)): if (plugins[h][5] == "Host"): name = QTableWidgetItem(plugins[h][0].replace("%20"," ")) - binary = QTableWidgetItem(plugins[h][1]) + binary = QTableWidgetItem(plugins[h][1].replace("%20"," ")) icon = QTableWidgetItem("") icon.setIcon(KIcon(plugins[h][2])) version = QTableWidgetItem(plugins[h][3]) @@ -227,7 +231,7 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): for h in range(len(plugins)): if (plugins[h][5] == "Synth"): name = QTableWidgetItem(plugins[h][0].replace("%20"," ")) - binary = QTableWidgetItem(plugins[h][1]) + binary = QTableWidgetItem(plugins[h][1].replace("%20"," ")) icon = QTableWidgetItem("") icon.setIcon(KIcon(plugins[h][2])) version = QTableWidgetItem(plugins[h][3]) @@ -246,7 +250,7 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): for h in range(len(plugins)): if (plugins[h][5] == "Effect"): name = QTableWidgetItem(plugins[h][0].replace("%20"," ")) - binary = QTableWidgetItem(plugins[h][1]) + binary = QTableWidgetItem(plugins[h][1].replace("%20"," ")) icon = QTableWidgetItem("") icon.setIcon(KIcon(plugins[h][2])) version = QTableWidgetItem(plugins[h][3]) @@ -265,7 +269,7 @@ class AppsW(QWidget, ui_tb_apps.Ui_AppsW): for h in range(len(plugins)): if (plugins[h][5] == "Tool"): name = QTableWidgetItem(plugins[h][0].replace("%20"," ")) - binary = QTableWidgetItem(plugins[h][1]) + binary = QTableWidgetItem(plugins[h][1].replace("%20"," ")) icon = QTableWidgetItem("") icon.setIcon(KIcon(plugins[h][2])) version = QTableWidgetItem(plugins[h][3]) -- 2.11.4.GIT