Merge branch 'master' of https://github.com/Qirky/FoxDot

Qirky · Jan 23, 2020 · 5d9de95 · 5d9de95
2 parents bc58a31 + 44586b2
commit 5d9de95
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 27 deletions.
diff --git a/FoxDot/__init__.py b/FoxDot/__init__.py
@@ -47,8 +47,6 @@ def boot_supercollider():
 
     if(OS == "Windows"):
 
-        print("OS: Windows")
-
         sclangloc = os.popen('where /R "C:\\Program Files" sclang.exe').read()
 
         thiscwd = str(sclangloc)
@@ -75,8 +73,6 @@ def is_proc_running(name):
 
     elif(OS == "Linux"):
 
-        print("OS: Linux")
-
         def is_proc_running(name):
             for p in psutil.process_iter(attrs=["name","cmdline"]):
                 #print(p);
@@ -111,7 +107,7 @@ def is_proc_running(name):
 
 def main():
     """ Function for starting the GUI when importing the library """
-    FoxDot = Workspace.workspace(FoxDotCode).run()
+    FoxDot = Workspace.Editor.workspace(FoxDotCode).run()
 
 def Go():
     """ Function to be called at the end of Python files with FoxDot code in to keep

diff --git a/FoxDot/__main__.py b/FoxDot/__main__.py
@@ -12,7 +12,6 @@
 from __future__ import absolute_import, division, print_function
 
 from .lib import FoxDotCode, handle_stdin
-from .lib.Workspace import workspace
 
 import argparse
 
@@ -80,6 +79,6 @@
 
     else:
 
-        from .lib.Workspace import workspace
+        from .lib.Workspace.Editor import workspace
 
     FoxDot = workspace(FoxDotCode).run()
diff --git a/FoxDot/lib/TempoClock.py b/FoxDot/lib/TempoClock.py
@@ -182,7 +182,6 @@ def reset(self):
         self.time = self.dtype(0)
         self.beat = self.dtype(0)
         self.start_time = time.time()
-        print("resetting clock")
         return
 
     @classmethod

diff --git a/FoxDot/lib/Workspace/Editor.py b/FoxDot/lib/Workspace/Editor.py
@@ -1195,7 +1195,7 @@ def select_all(self, event=None):
     def killall(self, event=None):
         """ Stops all player objects """
         execute("_Clock.clear()", verbose=False)
-        print("Clearing the scheduling clock.")
+        print("Clock.clear()")
         return "break"
 
     # Zoom in: Ctrl+=

diff --git a/FoxDot/lib/Workspace/Prompt.py b/FoxDot/lib/Workspace/Prompt.py
@@ -16,7 +16,8 @@ def __init__(self, root):
 
         # TODO // sort out the name space to check for suggestions
 
-        keywords = list(self.root.namespace["get_keywords"]())
+        # keywords = list(self.root.namespace["get_keywords"]())
+        keywords = list(get_keywords())
         synthdefs = list(self.root.namespace["SynthDefs"])
         attributes = list(self.root.namespace["Player"].get_attributes())
         player_methods = ["every", "often", "sometimes", "rarely"]

diff --git a/FoxDot/lib/Workspace/__init__.py b/FoxDot/lib/Workspace/__init__.py
@@ -1,3 +0,0 @@
-from __future__ import absolute_import, division, print_function
-
-from .Editor import *

diff --git a/FoxDot/lib/Workspace/tmp/tempfile.txt b/FoxDot/lib/Workspace/tmp/tempfile.txt
@@ -1,13 +0,0 @@
-Clock.bpm=120
-
-
-
-d1 >> play("<X{~[~X]}><[--]><..H( [ d])>", dur=1/2, cut=.8, hpf=00)
-
-b1 >> bass(dur=1/2, amp=[0,1], oct=5, drive=0.5, room=0.2, tremolo=1, sus=1).spread() + var([0,5,3],[8,4,4])
-
-p1 >> spark(b1.pitch + (0, P*(_,[P*(4,5),4,4]), 2), dur=[8,4,4], oct=6, tremolo=4)
-
-p2 >> pulse(PRand([4,2,0,6], seed=0)[:16], dur=1/4, oct=4, formant=linvar([0,4],8)).slider().spread()
-
-nextBar(Clock.clear)

diff --git a/FoxDot/lib/__init__.py b/FoxDot/lib/__init__.py
@@ -23,7 +23,6 @@
 from .SCLang import SynthDefs, Env, SynthDef, CompiledSynthDef
 from .Root import Root
 from .Scale import Scale, Tuning
-from .Workspace import get_keywords
 
 # stdlib imports