diff --git a/bin/curvecalc b/bin/curvecalc --- a/bin/curvecalc +++ b/bin/curvecalc @@ -19,7 +19,7 @@ from light9.TLUtility import make_attrib from light9.zoomcontrol import Zoomcontrol from light9.curve import Curve, Curveview, Curveset, Curvesetview -sys.path.append("../../semprini") +sys.path.extend(["../semprini","../../semprini"]) from lengther import wavelength # for measuring duration of .wav class Music: @@ -249,7 +249,7 @@ curveset.load(basename=os.path.join(show subterms = [] subterm_adder(root, curveset, subterms, root, ssv).pack(side='top',fill='x') -for line in file(showconfig.subtermsForSong()): +for line in file(showconfig.subtermsForSong(song)): subname,expr = line.strip().split(" ",1) term = add_one_subterm(subname, curveset, subterms, root, ssv, expr) diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer --- a/bin/keyboardcomposer +++ b/bin/keyboardcomposer @@ -11,7 +11,7 @@ import math, atexit, pickle import run_local from light9.Fadable import Fadable from light9.Submaster import Submasters, sub_maxes -from light9 import dmxclient +from light9 import dmxclient, showconfig from light9.uihelpers import toplevelat nudge_keys = { diff --git a/light9/Patch.py b/light9/Patch.py --- a/light9/Patch.py +++ b/light9/Patch.py @@ -1,4 +1,5 @@ import os +from light9 import showconfig def resolve_name(channelname): "Ensure that we're talking about the primary name of the light."