# HG changeset patch
# User drewp@bigasterisk.com
# Date 2005-04-10 20:54:14
# Node ID f41004d5a5077802a6a2535af75b9667c67605dc
# Parent  1a84c5e83d3e4c489692f13e1bb6b9c6e96e8105

factored out some networking, new show/ layout, curvecalc works

diff --git a/flax/curvecalc b/bin/curvecalc
rename from flax/curvecalc
rename to bin/curvecalc
--- a/flax/curvecalc
+++ b/bin/curvecalc
@@ -5,7 +5,7 @@ todo: curveview should preserve more obj
 
 """
 from __future__ import division
-import xmlrpclib,time,socket,sys,textwrap,math,glob,random
+import xmlrpclib,time,socket,sys,textwrap,math,glob,random,os
 from bisect import bisect_left,bisect,bisect_right
 import Tkinter as tk
 from dispatch import dispatcher
@@ -13,14 +13,13 @@ from twisted.internet import reactor,tks
 import twisted
 from twisted.web.xmlrpc import Proxy
 
-sys.path.append("../light8")
-import dmxclient
+import run_local
+from light9 import Submaster, dmxclient
+from light9.TLUtility import make_attributes_from_args
+from light9.zoomcontrol import Zoomcontrol
+
 sys.path.append("../../semprini")
-from lengther import wavelength
-import Submaster
-from TLUtility import make_attributes_from_args
-
-from zoomcontrol import Zoomcontrol
+from lengther import wavelength # for measuring duration of .wav
 
 class Curve:
     """curve does not know its name. see Curveset"""
@@ -486,23 +485,23 @@ class SubtermSetView(tk.Frame):
         if self.cur_col == 0:
             self.cur_row += 1
 
-def add_one_subterm(subname, curveset, subterms, root, expr=''):
+def add_one_subterm(subname, curveset, subterms, root, ssv, expr=''):
     term = Subterm(Submaster.Submaster(subname), Subexpr(curveset,expr))
     subterms.append(term)
 
     stv=Subtermview(ssv,term)
     # stv.pack(side='top',fill='x')
-    global ssv
+
     ssv.add_subtermview(stv)
 
     return term
 
-def subterm_adder(master, curveset, subterms, root):
+def subterm_adder(master, curveset, subterms, root, ssv):
     f=tk.Frame(master,relief='raised',bd=1)
     newname = tk.StringVar()
 
     def add_cmd():
-        add_one_subterm(newname.get(), curveset, subterms, root, '')
+        add_one_subterm(newname.get(), curveset, subterms, root, ssv, '')
 
     tk.Button(f,text="new subterm named:", command=add_cmd).pack(side='left')
     tk.Entry(f,textvariable=newname).pack(side='left',fill='x',exp=1)
@@ -529,18 +528,21 @@ ssv.pack(side='top', fill='x')
 song = sys.argv[1]
 root.title("Curemaster 2000MX - %s" % song)
 
-musicfilename = "/my/music/projects/sharlyn2004/%s.wav" % song
+musicfilename = os.path.join(os.getenv("LIGHT9_SHOW"),'music',
+                             "%s.wav" % song)
 maxtime = wavelength(musicfilename)
 dispatcher.send("max time",maxtime=maxtime)
 dispatcher.connect(lambda: maxtime, "get max time",weak=0)
-curveset.load(basename="curves/"+song)
+curveset.load(basename=os.path.join(os.getenv("LIGHT9_SHOW"),"curves",song))
 
 subterms = []
-subterm_adder(root, curveset, subterms, root).pack(side='top',fill='x')
-for line in file("subterms/"+song):
+subterm_adder(root, curveset, subterms, root, ssv).pack(side='top',fill='x')
+for line in file(os.path.join(os.getenv("LIGHT9_SHOW"),
+                              "subterms",
+                              song)):
     subname,expr = line.strip().split(" ",1)
 
-    term = add_one_subterm(subname, curveset, subterms, root, expr)
+    term = add_one_subterm(subname, curveset, subterms, root, ssv, expr)
     
     # stv=Subtermview(root,term)
     # stv.pack(side='top',fill='x')
@@ -549,7 +551,8 @@ out = Output(subterms)
 
 def savekey(*args):
     print "saving",song
-    savesubterms("subterms/"+song,subterms)
+    savesubterms(os.path.join(os.getenv("LIGHT9_SHOW"),"subterms",song),
+                 subterms)
     curveset.save(basename="curves/"+song)
     print "saved"
 
diff --git a/bin/dmxserver b/bin/dmxserver
--- a/bin/dmxserver
+++ b/bin/dmxserver
@@ -30,6 +30,7 @@ from optparse import OptionParser
 import run_local
 from light9.io import ParportDMX
 from light9.updatefreq import Updatefreq
+from light9 import networking
 
 class XMLRPCServe(xmlrpc.XMLRPC):
     def __init__(self,options):
@@ -181,7 +182,8 @@ parser.add_option("-r","--updates-per-se
 
 print options
 
-print "starting xmlrpc server on port 8030"
-reactor.listenTCP(8030,server.Site(XMLRPCServe(options)))
+port = networking.dmxServerPort()
+print "starting xmlrpc server on port %s" % port
+reactor.listenTCP(port,server.Site(XMLRPCServe(options)))
 reactor.run()
 
diff --git a/light9/Patch.py b/light9/Patch.py
--- a/light9/Patch.py
+++ b/light9/Patch.py
@@ -26,10 +26,10 @@ def get_channel_name(dmxnum):
 
 def reload_data():
     global patch, reverse_patch
-    import patchdata
+    import light9.patchdata
 
-    reload(patchdata)
-    loadedpatch = patchdata.patch
+    reload(light9.patchdata)
+    loadedpatch = light9.patchdata.patch
     patch = {}
     reverse_patch = {}
     for k, v in loadedpatch.items():
diff --git a/light9/Submaster.py b/light9/Submaster.py
--- a/light9/Submaster.py
+++ b/light9/Submaster.py
@@ -1,4 +1,5 @@
 from __future__ import division
+import os
 from light9.TLUtility import dict_scale, dict_max
 from light9 import Patch
 
@@ -17,7 +18,8 @@ class Submaster:
             return
         try:
             self.levels.clear()
-            subfile = file("subs/%s" % self.name)
+            subfile = file(os.path.join(os.getenv("LIGHT9_SHOW"),
+                                        "subs",self.name))
             for line in subfile.readlines():
                 if not line.strip(): # if line is only whitespace
                     continue # "did i say newspace?"
@@ -36,7 +38,8 @@ class Submaster:
             print "not saving temporary sub named",self.name
             return
 
-        subfile = file("subs/%s" % self.name, 'w')
+        subfile = file(os.path.join(os.getenv("LIGHT9_SHOW"),
+                                    "subs",self.name), 'w')
         names = self.levels.keys()
         names.sort()
         for name in names:
diff --git a/light9/__init__.py b/light9/__init__.py
new file mode 100644
diff --git a/light9/dmxchanedit.py b/light9/dmxchanedit.py
--- a/light9/dmxchanedit.py
+++ b/light9/dmxchanedit.py
@@ -6,13 +6,16 @@ not actually match what dmxserver is out
 """
 from __future__ import nested_scopes,division
 import Tkinter as tk
-import sys
-sys.path.append("../light8")
-import Patch
-from uihelpers import make_frame, colorlabel, eventtoparent
+import time
+from light9 import Patch
+from light9.uihelpers import make_frame, colorlabel, eventtoparent
 from dispatch import dispatcher
 
+# this font makes each label take 16ms to create, so startup is slow.
+# with default font, each labl takes about .5ms to create.
 stdfont = ('Arial', 12)
+import tkFont
+# see replacement stdfont below
 
 class Onelevel(tk.Frame):
     """a name/level pair"""
@@ -34,14 +37,16 @@ class Onelevel(tk.Frame):
 
         # text description of channel
         self.desc_lab=tk.Label(self, text=Patch.get_channel_name(channelnum),
-                               width=14, font=stdfont, anchor='w',
+                               width=14, font=stdfont,
+                               anchor='w',
                                padx=0, pady=0, bd=0, 
                  height=1, bg='black', fg='white')
         self.desc_lab.pack(side='left')
-        
+
         # current level of channel, shows intensity with color
         self.level_lab = tk.Label(self, width=3, bg='lightBlue',
-                                  font=stdfont, anchor='e', 
+                                  font=stdfont,
+                                  anchor='e', 
                                   padx=1, pady=0, bd=0, height=1)
         self.level_lab.pack(side='left')
 
@@ -108,7 +113,8 @@ class Onelevel(tk.Frame):
 class Levelbox(tk.Frame):
     def __init__(self, parent, num_channels=68):
         tk.Frame.__init__(self,parent)
-
+        global stdfont
+        stdfont = tkFont.Font(size=9)
         self.levels = [] # Onelevel objects
 
         frames = (make_frame(self), make_frame(self))
@@ -120,7 +126,6 @@ class Levelbox(tk.Frame):
 
             self.levels.append(f)
             f.pack(side='top')
-
         #dispatcher.connect(setalevel,"setlevel")
 
     def setlevels(self,newlevels):
diff --git a/light9/dmxclient.py b/light9/dmxclient.py
--- a/light9/dmxclient.py
+++ b/light9/dmxclient.py
@@ -6,6 +6,7 @@ client id is formed from sys.argv[0] and
 
 import xmlrpclib,os,sys,socket,time
 from twisted.web.xmlrpc import Proxy
+from light9 import networking
 _dmx=None
 
 _id="%s-%s" % (sys.argv[0].replace('.py','').replace('./',''),os.getpid())
@@ -21,8 +22,7 @@ def outputlevels(levellist,twisted=0,cli
     global _dmx,_id
 
     if _dmx is None:
-        host = os.getenv('DMXHOST', 'localhost')
-        url = "http://%s:8030" % host
+        url = networking.dmxServerUrl()
         if not twisted:
             _dmx=xmlrpclib.Server(url)
         else:
diff --git a/light9/networking.py b/light9/networking.py
new file mode 100644
--- /dev/null
+++ b/light9/networking.py
@@ -0,0 +1,11 @@
+from ConfigParser import SafeConfigParser
+# my intent was to pull these from a file in the LIGHT9_SHOW/ directory
+
+def dmxServerUrl():
+    #host = os.getenv('DMXHOST', 'localhost')
+    #url = "http://%s:8030" % host
+    return "http://localhost:%s" % dmxServerPort()
+
+def dmxServerPort():
+    return 8030
+    
diff --git a/light8/patchdata.py b/light9/patchdata.py
rename from light8/patchdata.py
rename to light9/patchdata.py
diff --git a/light8/uihelpers.py b/light9/uihelpers.py
rename from light8/uihelpers.py
rename to light9/uihelpers.py
diff --git a/flax/zoomcontrol.py b/light9/zoomcontrol.py
rename from flax/zoomcontrol.py
rename to light9/zoomcontrol.py
diff --git a/flax/curves/01bandstand-bow b/show/dance2004/curves/01bandstand-bow
rename from flax/curves/01bandstand-bow
rename to show/dance2004/curves/01bandstand-bow
diff --git a/flax/curves/01bandstand-music b/show/dance2004/curves/01bandstand-music
rename from flax/curves/01bandstand-music
rename to show/dance2004/curves/01bandstand-music
diff --git a/flax/curves/01bandstand-smooth_music b/show/dance2004/curves/01bandstand-smooth_music
rename from flax/curves/01bandstand-smooth_music
rename to show/dance2004/curves/01bandstand-smooth_music
diff --git a/flax/curves/01bandstand-song b/show/dance2004/curves/01bandstand-song
rename from flax/curves/01bandstand-song
rename to show/dance2004/curves/01bandstand-song
diff --git a/flax/curves/02shaking-bow b/show/dance2004/curves/02shaking-bow
rename from flax/curves/02shaking-bow
rename to show/dance2004/curves/02shaking-bow
diff --git a/flax/curves/02shaking-music b/show/dance2004/curves/02shaking-music
rename from flax/curves/02shaking-music
rename to show/dance2004/curves/02shaking-music
diff --git a/flax/curves/02shaking-smooth_music b/show/dance2004/curves/02shaking-smooth_music
rename from flax/curves/02shaking-smooth_music
rename to show/dance2004/curves/02shaking-smooth_music
diff --git a/flax/curves/02shaking-song b/show/dance2004/curves/02shaking-song
rename from flax/curves/02shaking-song
rename to show/dance2004/curves/02shaking-song
diff --git a/flax/curves/03mix-bow b/show/dance2004/curves/03mix-bow
rename from flax/curves/03mix-bow
rename to show/dance2004/curves/03mix-bow
diff --git a/flax/curves/03mix-dark b/show/dance2004/curves/03mix-dark
rename from flax/curves/03mix-dark
rename to show/dance2004/curves/03mix-dark
diff --git a/flax/curves/03mix-flash b/show/dance2004/curves/03mix-flash
rename from flax/curves/03mix-flash
rename to show/dance2004/curves/03mix-flash
diff --git a/flax/curves/03mix-music b/show/dance2004/curves/03mix-music
rename from flax/curves/03mix-music
rename to show/dance2004/curves/03mix-music
diff --git a/flax/curves/03mix-smooth_music b/show/dance2004/curves/03mix-smooth_music
rename from flax/curves/03mix-smooth_music
rename to show/dance2004/curves/03mix-smooth_music
diff --git a/flax/curves/03mix-song b/show/dance2004/curves/03mix-song
rename from flax/curves/03mix-song
rename to show/dance2004/curves/03mix-song
diff --git a/flax/curves/04lovepiano-bow b/show/dance2004/curves/04lovepiano-bow
rename from flax/curves/04lovepiano-bow
rename to show/dance2004/curves/04lovepiano-bow
diff --git a/flax/curves/04lovepiano-music b/show/dance2004/curves/04lovepiano-music
rename from flax/curves/04lovepiano-music
rename to show/dance2004/curves/04lovepiano-music
diff --git a/flax/curves/04lovepiano-smooth_music b/show/dance2004/curves/04lovepiano-smooth_music
rename from flax/curves/04lovepiano-smooth_music
rename to show/dance2004/curves/04lovepiano-smooth_music
diff --git a/flax/curves/04lovepiano-song b/show/dance2004/curves/04lovepiano-song
rename from flax/curves/04lovepiano-song
rename to show/dance2004/curves/04lovepiano-song
diff --git a/flax/curves/05hawaii-blacklight b/show/dance2004/curves/05hawaii-blacklight
rename from flax/curves/05hawaii-blacklight
rename to show/dance2004/curves/05hawaii-blacklight
diff --git a/flax/curves/05hawaii-bow b/show/dance2004/curves/05hawaii-bow
rename from flax/curves/05hawaii-bow
rename to show/dance2004/curves/05hawaii-bow
diff --git a/flax/curves/05hawaii-music b/show/dance2004/curves/05hawaii-music
rename from flax/curves/05hawaii-music
rename to show/dance2004/curves/05hawaii-music
diff --git a/flax/curves/05hawaii-smooth_music b/show/dance2004/curves/05hawaii-smooth_music
rename from flax/curves/05hawaii-smooth_music
rename to show/dance2004/curves/05hawaii-smooth_music
diff --git a/flax/curves/05hawaii-song b/show/dance2004/curves/05hawaii-song
rename from flax/curves/05hawaii-song
rename to show/dance2004/curves/05hawaii-song
diff --git a/flax/curves/06mix-bow b/show/dance2004/curves/06mix-bow
rename from flax/curves/06mix-bow
rename to show/dance2004/curves/06mix-bow
diff --git a/flax/curves/06mix-music b/show/dance2004/curves/06mix-music
rename from flax/curves/06mix-music
rename to show/dance2004/curves/06mix-music
diff --git a/flax/curves/06mix-smooth_music b/show/dance2004/curves/06mix-smooth_music
rename from flax/curves/06mix-smooth_music
rename to show/dance2004/curves/06mix-smooth_music
diff --git a/flax/curves/06mix-song b/show/dance2004/curves/06mix-song
rename from flax/curves/06mix-song
rename to show/dance2004/curves/06mix-song
diff --git a/flax/curves/07mission-blacklight b/show/dance2004/curves/07mission-blacklight
rename from flax/curves/07mission-blacklight
rename to show/dance2004/curves/07mission-blacklight
diff --git a/flax/curves/07mission-bow b/show/dance2004/curves/07mission-bow
rename from flax/curves/07mission-bow
rename to show/dance2004/curves/07mission-bow
diff --git a/flax/curves/07mission-cyc b/show/dance2004/curves/07mission-cyc
rename from flax/curves/07mission-cyc
rename to show/dance2004/curves/07mission-cyc
diff --git a/flax/curves/07mission-down b/show/dance2004/curves/07mission-down
rename from flax/curves/07mission-down
rename to show/dance2004/curves/07mission-down
diff --git a/flax/curves/07mission-music b/show/dance2004/curves/07mission-music
rename from flax/curves/07mission-music
rename to show/dance2004/curves/07mission-music
diff --git a/flax/curves/07mission-smooth_music b/show/dance2004/curves/07mission-smooth_music
rename from flax/curves/07mission-smooth_music
rename to show/dance2004/curves/07mission-smooth_music
diff --git a/flax/curves/07mission-song b/show/dance2004/curves/07mission-song
rename from flax/curves/07mission-song
rename to show/dance2004/curves/07mission-song
diff --git a/flax/curves/08mix-blacklight b/show/dance2004/curves/08mix-blacklight
rename from flax/curves/08mix-blacklight
rename to show/dance2004/curves/08mix-blacklight
diff --git a/flax/curves/08mix-blueredc b/show/dance2004/curves/08mix-blueredc
rename from flax/curves/08mix-blueredc
rename to show/dance2004/curves/08mix-blueredc
diff --git a/flax/curves/08mix-bow b/show/dance2004/curves/08mix-bow
rename from flax/curves/08mix-bow
rename to show/dance2004/curves/08mix-bow
diff --git a/flax/curves/08mix-music b/show/dance2004/curves/08mix-music
rename from flax/curves/08mix-music
rename to show/dance2004/curves/08mix-music
diff --git a/flax/curves/08mix-smooth_music b/show/dance2004/curves/08mix-smooth_music
rename from flax/curves/08mix-smooth_music
rename to show/dance2004/curves/08mix-smooth_music
diff --git a/flax/curves/08mix-song b/show/dance2004/curves/08mix-song
rename from flax/curves/08mix-song
rename to show/dance2004/curves/08mix-song
diff --git a/flax/curves/09flintstones-bow b/show/dance2004/curves/09flintstones-bow
rename from flax/curves/09flintstones-bow
rename to show/dance2004/curves/09flintstones-bow
diff --git a/flax/curves/09flintstones-music b/show/dance2004/curves/09flintstones-music
rename from flax/curves/09flintstones-music
rename to show/dance2004/curves/09flintstones-music
diff --git a/flax/curves/09flintstones-smooth_music b/show/dance2004/curves/09flintstones-smooth_music
rename from flax/curves/09flintstones-smooth_music
rename to show/dance2004/curves/09flintstones-smooth_music
diff --git a/flax/curves/09flintstones-song b/show/dance2004/curves/09flintstones-song
rename from flax/curves/09flintstones-song
rename to show/dance2004/curves/09flintstones-song
diff --git a/flax/curves/10broadway-bow b/show/dance2004/curves/10broadway-bow
rename from flax/curves/10broadway-bow
rename to show/dance2004/curves/10broadway-bow
diff --git a/flax/curves/10broadway-main b/show/dance2004/curves/10broadway-main
rename from flax/curves/10broadway-main
rename to show/dance2004/curves/10broadway-main
diff --git a/flax/curves/10broadway-music b/show/dance2004/curves/10broadway-music
rename from flax/curves/10broadway-music
rename to show/dance2004/curves/10broadway-music
diff --git a/flax/curves/10broadway-smooth_music b/show/dance2004/curves/10broadway-smooth_music
rename from flax/curves/10broadway-smooth_music
rename to show/dance2004/curves/10broadway-smooth_music
diff --git a/flax/curves/10broadway-song b/show/dance2004/curves/10broadway-song
rename from flax/curves/10broadway-song
rename to show/dance2004/curves/10broadway-song
diff --git a/flax/curves/11mix-blacklight b/show/dance2004/curves/11mix-blacklight
rename from flax/curves/11mix-blacklight
rename to show/dance2004/curves/11mix-blacklight
diff --git a/flax/curves/11mix-blue b/show/dance2004/curves/11mix-blue
rename from flax/curves/11mix-blue
rename to show/dance2004/curves/11mix-blue
diff --git a/flax/curves/11mix-bow b/show/dance2004/curves/11mix-bow
rename from flax/curves/11mix-bow
rename to show/dance2004/curves/11mix-bow
diff --git a/flax/curves/11mix-cycscl b/show/dance2004/curves/11mix-cycscl
rename from flax/curves/11mix-cycscl
rename to show/dance2004/curves/11mix-cycscl
diff --git a/flax/curves/11mix-music b/show/dance2004/curves/11mix-music
rename from flax/curves/11mix-music
rename to show/dance2004/curves/11mix-music
diff --git a/flax/curves/11mix-red b/show/dance2004/curves/11mix-red
rename from flax/curves/11mix-red
rename to show/dance2004/curves/11mix-red
diff --git a/flax/curves/11mix-smooth_music b/show/dance2004/curves/11mix-smooth_music
rename from flax/curves/11mix-smooth_music
rename to show/dance2004/curves/11mix-smooth_music
diff --git a/flax/curves/11mix-song b/show/dance2004/curves/11mix-song
rename from flax/curves/11mix-song
rename to show/dance2004/curves/11mix-song
diff --git a/flax/curves/11mix-upcyc b/show/dance2004/curves/11mix-upcyc
rename from flax/curves/11mix-upcyc
rename to show/dance2004/curves/11mix-upcyc
diff --git a/flax/curves/12mix-bow b/show/dance2004/curves/12mix-bow
rename from flax/curves/12mix-bow
rename to show/dance2004/curves/12mix-bow
diff --git a/flax/curves/12mix-music b/show/dance2004/curves/12mix-music
rename from flax/curves/12mix-music
rename to show/dance2004/curves/12mix-music
diff --git a/flax/curves/12mix-smooth_music b/show/dance2004/curves/12mix-smooth_music
rename from flax/curves/12mix-smooth_music
rename to show/dance2004/curves/12mix-smooth_music
diff --git a/flax/curves/12mix-song b/show/dance2004/curves/12mix-song
rename from flax/curves/12mix-song
rename to show/dance2004/curves/12mix-song
diff --git a/flax/curves/13mix-blacklight b/show/dance2004/curves/13mix-blacklight
rename from flax/curves/13mix-blacklight
rename to show/dance2004/curves/13mix-blacklight
diff --git a/flax/curves/13mix-bow b/show/dance2004/curves/13mix-bow
rename from flax/curves/13mix-bow
rename to show/dance2004/curves/13mix-bow
diff --git a/flax/curves/13mix-music b/show/dance2004/curves/13mix-music
rename from flax/curves/13mix-music
rename to show/dance2004/curves/13mix-music
diff --git a/flax/curves/13mix-smooth_music b/show/dance2004/curves/13mix-smooth_music
rename from flax/curves/13mix-smooth_music
rename to show/dance2004/curves/13mix-smooth_music
diff --git a/flax/curves/13mix-song b/show/dance2004/curves/13mix-song
rename from flax/curves/13mix-song
rename to show/dance2004/curves/13mix-song
diff --git a/flax/curves/14mix-bow b/show/dance2004/curves/14mix-bow
rename from flax/curves/14mix-bow
rename to show/dance2004/curves/14mix-bow
diff --git a/flax/curves/14mix-music b/show/dance2004/curves/14mix-music
rename from flax/curves/14mix-music
rename to show/dance2004/curves/14mix-music
diff --git a/flax/curves/14mix-smooth_music b/show/dance2004/curves/14mix-smooth_music
rename from flax/curves/14mix-smooth_music
rename to show/dance2004/curves/14mix-smooth_music
diff --git a/flax/curves/14mix-song b/show/dance2004/curves/14mix-song
rename from flax/curves/14mix-song
rename to show/dance2004/curves/14mix-song
diff --git a/flax/curves/15happy-bow b/show/dance2004/curves/15happy-bow
rename from flax/curves/15happy-bow
rename to show/dance2004/curves/15happy-bow
diff --git a/flax/curves/15happy-main b/show/dance2004/curves/15happy-main
rename from flax/curves/15happy-main
rename to show/dance2004/curves/15happy-main
diff --git a/flax/curves/15happy-music b/show/dance2004/curves/15happy-music
rename from flax/curves/15happy-music
rename to show/dance2004/curves/15happy-music
diff --git a/flax/curves/15happy-smooth_music b/show/dance2004/curves/15happy-smooth_music
rename from flax/curves/15happy-smooth_music
rename to show/dance2004/curves/15happy-smooth_music
diff --git a/flax/curves/15happy-song b/show/dance2004/curves/15happy-song
rename from flax/curves/15happy-song
rename to show/dance2004/curves/15happy-song
diff --git a/flax/curves/16mix-bigfade b/show/dance2004/curves/16mix-bigfade
rename from flax/curves/16mix-bigfade
rename to show/dance2004/curves/16mix-bigfade
diff --git a/flax/curves/16mix-blacklight b/show/dance2004/curves/16mix-blacklight
rename from flax/curves/16mix-blacklight
rename to show/dance2004/curves/16mix-blacklight
diff --git a/flax/curves/16mix-bow b/show/dance2004/curves/16mix-bow
rename from flax/curves/16mix-bow
rename to show/dance2004/curves/16mix-bow
diff --git a/flax/curves/16mix-cyc b/show/dance2004/curves/16mix-cyc
rename from flax/curves/16mix-cyc
rename to show/dance2004/curves/16mix-cyc
diff --git a/flax/curves/16mix-greentoblue b/show/dance2004/curves/16mix-greentoblue
rename from flax/curves/16mix-greentoblue
rename to show/dance2004/curves/16mix-greentoblue
diff --git a/flax/curves/16mix-hots b/show/dance2004/curves/16mix-hots
rename from flax/curves/16mix-hots
rename to show/dance2004/curves/16mix-hots
diff --git a/flax/curves/16mix-justinl b/show/dance2004/curves/16mix-justinl
rename from flax/curves/16mix-justinl
rename to show/dance2004/curves/16mix-justinl
diff --git a/flax/curves/16mix-music b/show/dance2004/curves/16mix-music
rename from flax/curves/16mix-music
rename to show/dance2004/curves/16mix-music
diff --git a/flax/curves/16mix-sidemusic b/show/dance2004/curves/16mix-sidemusic
rename from flax/curves/16mix-sidemusic
rename to show/dance2004/curves/16mix-sidemusic
diff --git a/flax/curves/16mix-smooth_music b/show/dance2004/curves/16mix-smooth_music
rename from flax/curves/16mix-smooth_music
rename to show/dance2004/curves/16mix-smooth_music
diff --git a/flax/curves/16mix-song b/show/dance2004/curves/16mix-song
rename from flax/curves/16mix-song
rename to show/dance2004/curves/16mix-song
diff --git a/flax/curves/16mix-upflicker b/show/dance2004/curves/16mix-upflicker
rename from flax/curves/16mix-upflicker
rename to show/dance2004/curves/16mix-upflicker
diff --git a/flax/curves/17mix-bow b/show/dance2004/curves/17mix-bow
rename from flax/curves/17mix-bow
rename to show/dance2004/curves/17mix-bow
diff --git a/flax/curves/17mix-music b/show/dance2004/curves/17mix-music
rename from flax/curves/17mix-music
rename to show/dance2004/curves/17mix-music
diff --git a/flax/curves/17mix-posts b/show/dance2004/curves/17mix-posts
rename from flax/curves/17mix-posts
rename to show/dance2004/curves/17mix-posts
diff --git a/flax/curves/17mix-red b/show/dance2004/curves/17mix-red
rename from flax/curves/17mix-red
rename to show/dance2004/curves/17mix-red
diff --git a/flax/curves/17mix-smooth_music b/show/dance2004/curves/17mix-smooth_music
rename from flax/curves/17mix-smooth_music
rename to show/dance2004/curves/17mix-smooth_music
diff --git a/flax/curves/17mix-song b/show/dance2004/curves/17mix-song
rename from flax/curves/17mix-song
rename to show/dance2004/curves/17mix-song
diff --git a/flax/subs/1-1 b/show/dance2004/subs/1-1
rename from flax/subs/1-1
rename to show/dance2004/subs/1-1
diff --git a/flax/subs/1-1_sill b/show/dance2004/subs/1-1_sill
rename from flax/subs/1-1_sill
rename to show/dance2004/subs/1-1_sill
diff --git a/flax/subs/1-2 b/show/dance2004/subs/1-2
rename from flax/subs/1-2
rename to show/dance2004/subs/1-2
diff --git a/flax/subs/1-2_outside b/show/dance2004/subs/1-2_outside
rename from flax/subs/1-2_outside
rename to show/dance2004/subs/1-2_outside
diff --git a/flax/subs/1-2_register b/show/dance2004/subs/1-2_register
rename from flax/subs/1-2_register
rename to show/dance2004/subs/1-2_register
diff --git a/flax/subs/1-2_song_downstairs b/show/dance2004/subs/1-2_song_downstairs
rename from flax/subs/1-2_song_downstairs
rename to show/dance2004/subs/1-2_song_downstairs
diff --git a/flax/subs/1-3-36_dance b/show/dance2004/subs/1-3-36_dance
rename from flax/subs/1-3-36_dance
rename to show/dance2004/subs/1-3-36_dance
diff --git a/flax/subs/1-3_inside b/show/dance2004/subs/1-3_inside
rename from flax/subs/1-3_inside
rename to show/dance2004/subs/1-3_inside
diff --git a/flax/subs/1-3_outside b/show/dance2004/subs/1-3_outside
rename from flax/subs/1-3_outside
rename to show/dance2004/subs/1-3_outside
diff --git a/flax/subs/2-1_darker b/show/dance2004/subs/2-1_darker
rename from flax/subs/2-1_darker
rename to show/dance2004/subs/2-1_darker
diff --git a/flax/subs/2-1_outside b/show/dance2004/subs/2-1_outside
rename from flax/subs/2-1_outside
rename to show/dance2004/subs/2-1_outside
diff --git a/flax/subs/2-2_all b/show/dance2004/subs/2-2_all
rename from flax/subs/2-2_all
rename to show/dance2004/subs/2-2_all
diff --git a/flax/subs/2-2_l_table b/show/dance2004/subs/2-2_l_table
rename from flax/subs/2-2_l_table
rename to show/dance2004/subs/2-2_l_table
diff --git a/flax/subs/2-2_r_table b/show/dance2004/subs/2-2_r_table
rename from flax/subs/2-2_r_table
rename to show/dance2004/subs/2-2_r_table
diff --git a/flax/subs/2-3_brighter b/show/dance2004/subs/2-3_brighter
rename from flax/subs/2-3_brighter
rename to show/dance2004/subs/2-3_brighter
diff --git a/flax/subs/2-3_cold b/show/dance2004/subs/2-3_cold
rename from flax/subs/2-3_cold
rename to show/dance2004/subs/2-3_cold
diff --git a/flax/subs/2-4_money b/show/dance2004/subs/2-4_money
rename from flax/subs/2-4_money
rename to show/dance2004/subs/2-4_money
diff --git a/flax/subs/allstage b/show/dance2004/subs/allstage
rename from flax/subs/allstage
rename to show/dance2004/subs/allstage
diff --git a/flax/subs/blacklight b/show/dance2004/subs/blacklight
rename from flax/subs/blacklight
rename to show/dance2004/subs/blacklight
diff --git a/flax/subs/blueredc b/show/dance2004/subs/blueredc
rename from flax/subs/blueredc
rename to show/dance2004/subs/blueredc
diff --git a/flax/subs/bluetogreen b/show/dance2004/subs/bluetogreen
rename from flax/subs/bluetogreen
rename to show/dance2004/subs/bluetogreen
diff --git a/flax/subs/bottom_of_stairs b/show/dance2004/subs/bottom_of_stairs
rename from flax/subs/bottom_of_stairs
rename to show/dance2004/subs/bottom_of_stairs
diff --git a/flax/subs/bow b/show/dance2004/subs/bow
rename from flax/subs/bow
rename to show/dance2004/subs/bow
diff --git a/flax/subs/candles b/show/dance2004/subs/candles
rename from flax/subs/candles
rename to show/dance2004/subs/candles
diff --git a/flax/subs/candles-bright b/show/dance2004/subs/candles-bright
rename from flax/subs/candles-bright
rename to show/dance2004/subs/candles-bright
diff --git a/flax/subs/curtain b/show/dance2004/subs/curtain
rename from flax/subs/curtain
rename to show/dance2004/subs/curtain
diff --git a/flax/subs/curtain_warmers b/show/dance2004/subs/curtain_warmers
rename from flax/subs/curtain_warmers
rename to show/dance2004/subs/curtain_warmers
diff --git a/flax/subs/cyc b/show/dance2004/subs/cyc
rename from flax/subs/cyc
rename to show/dance2004/subs/cyc
diff --git a/flax/subs/deeps b/show/dance2004/subs/deeps
rename from flax/subs/deeps
rename to show/dance2004/subs/deeps
diff --git a/flax/subs/dolly_runway_left b/show/dance2004/subs/dolly_runway_left
rename from flax/subs/dolly_runway_left
rename to show/dance2004/subs/dolly_runway_left
diff --git a/flax/subs/dolly_runway_right b/show/dance2004/subs/dolly_runway_right
rename from flax/subs/dolly_runway_right
rename to show/dance2004/subs/dolly_runway_right
diff --git a/flax/subs/dolly_stairs_right b/show/dance2004/subs/dolly_stairs_right
rename from flax/subs/dolly_stairs_right
rename to show/dance2004/subs/dolly_stairs_right
diff --git a/flax/subs/downfront b/show/dance2004/subs/downfront
rename from flax/subs/downfront
rename to show/dance2004/subs/downfront
diff --git a/flax/subs/edge-l b/show/dance2004/subs/edge-l
rename from flax/subs/edge-l
rename to show/dance2004/subs/edge-l
diff --git a/flax/subs/edge-r b/show/dance2004/subs/edge-r
rename from flax/subs/edge-r
rename to show/dance2004/subs/edge-r
diff --git a/flax/subs/edges b/show/dance2004/subs/edges
rename from flax/subs/edges
rename to show/dance2004/subs/edges
diff --git a/flax/subs/finale b/show/dance2004/subs/finale
rename from flax/subs/finale
rename to show/dance2004/subs/finale
diff --git a/flax/subs/finale_with_dolly b/show/dance2004/subs/finale_with_dolly
rename from flax/subs/finale_with_dolly
rename to show/dance2004/subs/finale_with_dolly
diff --git a/flax/subs/floor b/show/dance2004/subs/floor
rename from flax/subs/floor
rename to show/dance2004/subs/floor
diff --git a/flax/subs/front_c b/show/dance2004/subs/front_c
rename from flax/subs/front_c
rename to show/dance2004/subs/front_c
diff --git a/flax/subs/front_lc b/show/dance2004/subs/front_lc
rename from flax/subs/front_lc
rename to show/dance2004/subs/front_lc
diff --git a/flax/subs/front_of_stage b/show/dance2004/subs/front_of_stage
rename from flax/subs/front_of_stage
rename to show/dance2004/subs/front_of_stage
diff --git a/flax/subs/front_rc b/show/dance2004/subs/front_rc
rename from flax/subs/front_rc
rename to show/dance2004/subs/front_rc
diff --git a/flax/subs/frontwhite b/show/dance2004/subs/frontwhite
rename from flax/subs/frontwhite
rename to show/dance2004/subs/frontwhite
diff --git a/flax/subs/frontwhite-dolly b/show/dance2004/subs/frontwhite-dolly
rename from flax/subs/frontwhite-dolly
rename to show/dance2004/subs/frontwhite-dolly
diff --git a/flax/subs/garden_stairs b/show/dance2004/subs/garden_stairs
rename from flax/subs/garden_stairs
rename to show/dance2004/subs/garden_stairs
diff --git a/flax/subs/generic b/show/dance2004/subs/generic
rename from flax/subs/generic
rename to show/dance2004/subs/generic
diff --git a/flax/subs/god b/show/dance2004/subs/god
rename from flax/subs/god
rename to show/dance2004/subs/god
diff --git a/flax/subs/greentoblue b/show/dance2004/subs/greentoblue
rename from flax/subs/greentoblue
rename to show/dance2004/subs/greentoblue
diff --git a/flax/subs/house b/show/dance2004/subs/house
rename from flax/subs/house
rename to show/dance2004/subs/house
diff --git a/flax/subs/left1 b/show/dance2004/subs/left1
rename from flax/subs/left1
rename to show/dance2004/subs/left1
diff --git a/flax/subs/left2 b/show/dance2004/subs/left2
rename from flax/subs/left2
rename to show/dance2004/subs/left2
diff --git a/flax/subs/narrow-c b/show/dance2004/subs/narrow-c
rename from flax/subs/narrow-c
rename to show/dance2004/subs/narrow-c
diff --git a/flax/subs/nsi_cue_1 b/show/dance2004/subs/nsi_cue_1
rename from flax/subs/nsi_cue_1
rename to show/dance2004/subs/nsi_cue_1
diff --git a/flax/subs/nsi_cue_2 b/show/dance2004/subs/nsi_cue_2
rename from flax/subs/nsi_cue_2
rename to show/dance2004/subs/nsi_cue_2
diff --git a/flax/subs/nsi_cue_3 b/show/dance2004/subs/nsi_cue_3
rename from flax/subs/nsi_cue_3
rename to show/dance2004/subs/nsi_cue_3
diff --git a/flax/subs/parade b/show/dance2004/subs/parade
rename from flax/subs/parade
rename to show/dance2004/subs/parade
diff --git a/flax/subs/patio b/show/dance2004/subs/patio
rename from flax/subs/patio
rename to show/dance2004/subs/patio
diff --git a/flax/subs/posts b/show/dance2004/subs/posts
rename from flax/subs/posts
rename to show/dance2004/subs/posts
diff --git a/flax/subs/right1 b/show/dance2004/subs/right1
rename from flax/subs/right1
rename to show/dance2004/subs/right1
diff --git a/flax/subs/right2 b/show/dance2004/subs/right2
rename from flax/subs/right2
rename to show/dance2004/subs/right2
diff --git a/flax/subs/runway b/show/dance2004/subs/runway
rename from flax/subs/runway
rename to show/dance2004/subs/runway
diff --git a/flax/subs/runway_stairs b/show/dance2004/subs/runway_stairs
rename from flax/subs/runway_stairs
rename to show/dance2004/subs/runway_stairs
diff --git a/flax/subs/runway_stairs_left b/show/dance2004/subs/runway_stairs_left
rename from flax/subs/runway_stairs_left
rename to show/dance2004/subs/runway_stairs_left
diff --git a/flax/subs/sharlyn b/show/dance2004/subs/sharlyn
rename from flax/subs/sharlyn
rename to show/dance2004/subs/sharlyn
diff --git a/flax/subs/sky b/show/dance2004/subs/sky
rename from flax/subs/sky
rename to show/dance2004/subs/sky
diff --git a/flax/subs/sky-outside_store b/show/dance2004/subs/sky-outside_store
rename from flax/subs/sky-outside_store
rename to show/dance2004/subs/sky-outside_store
diff --git a/flax/subs/song01 b/show/dance2004/subs/song01
rename from flax/subs/song01
rename to show/dance2004/subs/song01
diff --git a/flax/subs/song02 b/show/dance2004/subs/song02
rename from flax/subs/song02
rename to show/dance2004/subs/song02
diff --git a/flax/subs/song03 b/show/dance2004/subs/song03
rename from flax/subs/song03
rename to show/dance2004/subs/song03
diff --git a/flax/subs/song03-dark b/show/dance2004/subs/song03-dark
rename from flax/subs/song03-dark
rename to show/dance2004/subs/song03-dark
diff --git a/flax/subs/song04 b/show/dance2004/subs/song04
rename from flax/subs/song04
rename to show/dance2004/subs/song04
diff --git a/flax/subs/song05 b/show/dance2004/subs/song05
rename from flax/subs/song05
rename to show/dance2004/subs/song05
diff --git a/flax/subs/song06 b/show/dance2004/subs/song06
rename from flax/subs/song06
rename to show/dance2004/subs/song06
diff --git a/flax/subs/song07 b/show/dance2004/subs/song07
rename from flax/subs/song07
rename to show/dance2004/subs/song07
diff --git a/flax/subs/song07-down b/show/dance2004/subs/song07-down
rename from flax/subs/song07-down
rename to show/dance2004/subs/song07-down
diff --git a/flax/subs/song08 b/show/dance2004/subs/song08
rename from flax/subs/song08
rename to show/dance2004/subs/song08
diff --git a/flax/subs/song09 b/show/dance2004/subs/song09
rename from flax/subs/song09
rename to show/dance2004/subs/song09
diff --git a/flax/subs/song10 b/show/dance2004/subs/song10
rename from flax/subs/song10
rename to show/dance2004/subs/song10
diff --git a/flax/subs/song11 b/show/dance2004/subs/song11
rename from flax/subs/song11
rename to show/dance2004/subs/song11
diff --git a/flax/subs/song12 b/show/dance2004/subs/song12
rename from flax/subs/song12
rename to show/dance2004/subs/song12
diff --git a/flax/subs/song13 b/show/dance2004/subs/song13
rename from flax/subs/song13
rename to show/dance2004/subs/song13
diff --git a/flax/subs/song14 b/show/dance2004/subs/song14
rename from flax/subs/song14
rename to show/dance2004/subs/song14
diff --git a/flax/subs/song15 b/show/dance2004/subs/song15
rename from flax/subs/song15
rename to show/dance2004/subs/song15
diff --git a/flax/subs/song16 b/show/dance2004/subs/song16
rename from flax/subs/song16
rename to show/dance2004/subs/song16
diff --git a/flax/subs/song17 b/show/dance2004/subs/song17
rename from flax/subs/song17
rename to show/dance2004/subs/song17
diff --git a/flax/subs/stairs b/show/dance2004/subs/stairs
rename from flax/subs/stairs
rename to show/dance2004/subs/stairs
diff --git a/flax/subs/trap b/show/dance2004/subs/trap
rename from flax/subs/trap
rename to show/dance2004/subs/trap
diff --git a/flax/subs/upcyc b/show/dance2004/subs/upcyc
rename from flax/subs/upcyc
rename to show/dance2004/subs/upcyc
diff --git a/flax/subs/upstage b/show/dance2004/subs/upstage
rename from flax/subs/upstage
rename to show/dance2004/subs/upstage
diff --git a/flax/subs/upstairs b/show/dance2004/subs/upstairs
rename from flax/subs/upstairs
rename to show/dance2004/subs/upstairs
diff --git a/flax/subs/worklights b/show/dance2004/subs/worklights
rename from flax/subs/worklights
rename to show/dance2004/subs/worklights
diff --git a/flax/subs/zip_blue b/show/dance2004/subs/zip_blue
rename from flax/subs/zip_blue
rename to show/dance2004/subs/zip_blue
diff --git a/flax/subs/zip_green b/show/dance2004/subs/zip_green
rename from flax/subs/zip_green
rename to show/dance2004/subs/zip_green
diff --git a/flax/subs/zip_orange b/show/dance2004/subs/zip_orange
rename from flax/subs/zip_orange
rename to show/dance2004/subs/zip_orange
diff --git a/flax/subs/zip_red b/show/dance2004/subs/zip_red
rename from flax/subs/zip_red
rename to show/dance2004/subs/zip_red
diff --git a/flax/subterms/01bandstand b/show/dance2004/subterms/01bandstand
rename from flax/subterms/01bandstand
rename to show/dance2004/subterms/01bandstand
diff --git a/flax/subterms/02shaking b/show/dance2004/subterms/02shaking
rename from flax/subterms/02shaking
rename to show/dance2004/subterms/02shaking
diff --git a/flax/subterms/03mix b/show/dance2004/subterms/03mix
rename from flax/subterms/03mix
rename to show/dance2004/subterms/03mix
diff --git a/flax/subterms/04lovepiano b/show/dance2004/subterms/04lovepiano
rename from flax/subterms/04lovepiano
rename to show/dance2004/subterms/04lovepiano
diff --git a/flax/subterms/05hawaii b/show/dance2004/subterms/05hawaii
rename from flax/subterms/05hawaii
rename to show/dance2004/subterms/05hawaii
diff --git a/flax/subterms/06mix b/show/dance2004/subterms/06mix
rename from flax/subterms/06mix
rename to show/dance2004/subterms/06mix
diff --git a/flax/subterms/07mission b/show/dance2004/subterms/07mission
rename from flax/subterms/07mission
rename to show/dance2004/subterms/07mission
diff --git a/flax/subterms/08mix b/show/dance2004/subterms/08mix
rename from flax/subterms/08mix
rename to show/dance2004/subterms/08mix
diff --git a/flax/subterms/09flintstones b/show/dance2004/subterms/09flintstones
rename from flax/subterms/09flintstones
rename to show/dance2004/subterms/09flintstones
diff --git a/flax/subterms/10broadway b/show/dance2004/subterms/10broadway
rename from flax/subterms/10broadway
rename to show/dance2004/subterms/10broadway
diff --git a/flax/subterms/11mix b/show/dance2004/subterms/11mix
rename from flax/subterms/11mix
rename to show/dance2004/subterms/11mix
diff --git a/flax/subterms/12mix b/show/dance2004/subterms/12mix
rename from flax/subterms/12mix
rename to show/dance2004/subterms/12mix
diff --git a/flax/subterms/13mix b/show/dance2004/subterms/13mix
rename from flax/subterms/13mix
rename to show/dance2004/subterms/13mix
diff --git a/flax/subterms/14mix b/show/dance2004/subterms/14mix
rename from flax/subterms/14mix
rename to show/dance2004/subterms/14mix
diff --git a/flax/subterms/15happy b/show/dance2004/subterms/15happy
rename from flax/subterms/15happy
rename to show/dance2004/subterms/15happy
diff --git a/flax/subterms/16mix b/show/dance2004/subterms/16mix
rename from flax/subterms/16mix
rename to show/dance2004/subterms/16mix
diff --git a/flax/subterms/17mix b/show/dance2004/subterms/17mix
rename from flax/subterms/17mix
rename to show/dance2004/subterms/17mix