fluidsynth plugin stub, changed plugin exporting

Author: flipcoder

textbeat/instrument.py

@@ -13,11 +13,11 @@ def stop(self):
         pass
 
 PLUGINS = []
-# plugins call this method
-def export(s):
-    global PLUGINS
-    if s not in PLUGINS:
-        PLUGINS.append(s())
-def plugins():
-    return PLUGINS
+# # plugins call this method
+# def export(s):
+#     global PLUGINS
+#     if s not in PLUGINS:
+#         PLUGINS.append(s())
+# def plugins():
+#     return PLUGINS
 

textbeat/plugins/sonicpi.py

@@ -12,17 +12,18 @@ class SonicPi(Instrument):
     NAME = 'sonicpi'
     def __init__(self):
         Instrument.__init__(self, SonicPi.NAME)
-        self.enabled = False
+        self.initalized = False
     def init(self):
-        self.enabled = True
+        self.initalized = True
     def inited(self):
-        return self.enabled
+        return self.initalized
     def supported(self):
         return not ERROR
     def support(self):
         return ['sonicpi']
     def stop(self):
         pass
 
-instrument.export(SonicPi)
+# instrument.export(SonicPi)
+export = SonicPi
 

textbeat/plugins/supercollider.py

@@ -16,17 +16,17 @@ class SuperCollider(Instrument):
     NAME = 'supercollider'
     def __init__(self):
         Instrument.__init__(self, SuperCollider.NAME)
-        self.enabled = False
+        self.initalized = False
     def init(self):
-        self.enabled = True
+        self.initalized = True
     def inited(self):
-        return self.enabled
+        return self.initalized
     def supported(self):
         return not ERROR
     def support(self):
         return ['supercollider']
     def stop(self):
         pass
 
-instrument.export(SuperCollider)
+export = SuperCollider
 

textbeat/support.py

@@ -13,10 +13,19 @@
 
 SUPPORT_PLUGINS = {}
 
-# load new-style plugins from plugins dir
+# load plugins from plugins dir
+
+import textbeat.plugins as tbp
 from textbeat.plugins import *
-# get plugins from instrument modules's export list
-plugs = instrument.plugins()
+# search module exports for plugins
+plugs = []
+for p in tbp.__dict__:
+    try:
+        pattr = getattr(tbp, p)
+        plugs += [pattr.export()]
+    except:
+        pass
+# plugs = instrument.plugins()
 for plug in plugs:
     # plug.init()
     ps = plug.support()
@@ -29,6 +38,11 @@
         if 'auto' in s:
             AUTO = True
             auto_inited = True
+        if 'soundfonts' in s:
+            SOUNDFONTS = True
+
+# Note: the plugins below are old-style (contained within this file).  New style
+#   plugins are in the plugins folder and are loaded above
 
 SUPPORT_ALL.add('carla')
 if which('carla'):
@@ -43,17 +57,17 @@
 # except ImportError:
 #     pass
 
-try:
-    SUPPORT_ALL.add('fluidsynth')
-    if which('fluidsynth'):
-        import fluidsynth # https://github.com/flipcoder/pyfluidsynth
-        SUPPORT.add('fluidsynth')
-        SUPPORT.add('soundfonts')
-        SOUNDFONTS = True
-# except AttributeError:
-#     error("pyFluidSynth AttributeError detected. Use this pyFluidSynth version: https://github.com/flipcoder/pyfluidsynth")
-except ImportError:
-    pass
+# try:
+#     SUPPORT_ALL.add('fluidsynth')
+#     if which('fluidsynth'):
+#         import fluidsynth # https://github.com/flipcoder/pyfluidsynth
+#         SUPPORT.add('fluidsynth')
+#         SUPPORT.add('soundfonts')
+#         SOUNDFONTS = True
+# # except AttributeError:
+# #     error("pyFluidSynth AttributeError detected. Use this pyFluidSynth version: https://github.com/flipcoder/pyfluidsynth")
+# except ImportError:
+#     pass
 
 csound = None
 # if which('csound'):
@@ -209,6 +223,7 @@ def supports(tech):
     return tech in SUPPORT
 
 def support_stop():
+    # stop old-style plugins
     global carla_temp_proj
     if carla_temp_proj:
         os.unlink(carla_temp_proj)
@@ -219,7 +234,8 @@ def support_stop():
     if BGPROC:
         BGPIPE.send((BGCMD.QUIT,))
         BGPROC.join()
-    global plugs
+
+    # stop plugins from plugins folder
     for plug in plugs:
         if plug.inited():
             plug.stop()