--- a/flax/Submaster.py	Sat Jun 14 14:59:09 2003 +0000
+++ b/flax/Submaster.py	Sat Jun 14 15:00:47 2003 +0000
@@ -8,17 +8,14 @@
 
 class Submaster:
     "Contain a dictionary of levels, but you didn't need to know that"
-    def __init__(self, name, leveldict=None, temporary=0):
+    def __init__(self, name, leveldict=None):
         self.name = name
-        self.temporary = temporary
         if leveldict:
             self.levels = leveldict
         else:
             self.levels = {}
             self.reload()
     def reload(self):
-        if self.temporary:
-            return
         try:
             self.levels.clear()
             subfile = file("subs/%s" % self.name)
@@ -36,9 +33,6 @@
         except IOError:
             print "Can't read file for sub: %s" % self.name
     def save(self):
-        if self.temporary:
-            return
-
         subfile = file("subs/%s" % self.name, 'w')
         names = self.levels.keys()
         names.sort()
@@ -58,62 +52,24 @@
         return self.levels
     def __mul__(self, scalar):
         return Submaster("%s*%s" % (self.name, scalar), 
-            dict_scale(self.levels, scalar), temporary=1)
+            dict_scale(self.levels, scalar))
     __rmul__ = __mul__
     def max(self, *othersubs):
         return sub_maxes(self, *othersubs)
     def __repr__(self):
-        levels = ' '.join(["%s:%.2f" % item for item in self.levels.items()])
-        return "<'%s': [%s]>" % (self.name, levels)
+        return "<%s: %r>" % (self.name, self.levels)
     def get_dmx_list(self):
         leveldict = self.get_levels() # gets levels of sub contents
 
         levels = [0] * 68
         for k, v in leveldict.items():
-            dmxchan = Patch.get_dmx_channel(k) - 1
-            levels[dmxchan] = max(v, levels[dmxchan])
+            levels[Patch.get_dmx_channel(k) - 1] = v
 
         return levels
-    def normalize_patch_names(self):
-        """Use only the primary patch names."""
-        # possibly busted -- don't use unless you know what you're doing
-        self.set_all_levels(self.levels.copy())
-    def get_normalized_copy(self):
-        """Get a copy of this sumbaster that only uses the primary patch 
-        names.  The levels will be the same."""
-        newsub = Submaster("%s (normalized)" % self.name, temporary=1)
-        newsub.set_all_levels(self.levels)
-        return newsub
-    def crossfade(self, othersub, amount):
-        """Returns a new sub that is a crossfade between this sub and
-        another submaster.  
-        
-        NOTE: You should only crossfade between normalized submasters."""
-        otherlevels = othersub.get_levels()
-        keys_set = {}
-        for k in self.levels.keys() + otherlevels.keys():
-            keys_set[k] = 1
-        all_keys = keys_set.keys()
-
-        xfaded_sub = Submaster("xfade", temporary=1)
-        for k in all_keys:
-            xfaded_sub.set_level(k, 
-                                 linear_fade(self.levels.get(k, 0),
-                                             otherlevels.get(k, 0),
-                                             amount))
-
-        return xfaded_sub
-                                            
-def linear_fade(start, end, amount):
-    """Fades between two floats by an amount.  amount is a float between
-    0 and 1.  If amount is 0, it will return the start value.  If it is 1,
-    the end value will be returned."""
-    level = start + (amount * (end - start))
-    return level
 
 def sub_maxes(*subs):
     return Submaster("max(%r)" % (subs,),
-        dict_max(*[sub.levels for sub in subs]), temporary=1)
+        dict_max(*[sub.levels for sub in subs]))
 
 class Submasters:
     "Collection o' Submaster objects"
@@ -124,25 +80,12 @@
         files = os.listdir('subs')
 
         for filename in files:
-            # we don't want these files
-            if filename.startswith('.') or filename.endswith('~') or \
-               filename.startswith('CVS'):
+            if filename.startswith('.') or filename.endswith('~'):
                 continue
             self.submasters[filename] = Submaster(filename)
     def get_all_subs(self):
         "All Submaster objects"
-        l = self.submasters.items()
-        l.sort()
-        l = [x[1] for x in l]
-        songs = []
-        notsongs = []
-        for s in l:
-            if s.name.startswith('song'):
-                songs.append(s)
-            else:
-                notsongs.append(s)
-        combined = notsongs + songs
-        return combined
+        return self.submasters.values()
     def get_sub_by_name(self, name):
         "Makes a new sub if there isn't one."
         return self.submasters.get(name, Submaster(name))
@@ -151,10 +94,6 @@
 if __name__ == "__main__":
     Patch.reload_data()
     s = Submasters()
+    newsub = s['newsub']
+    newsub.set_all_levels({'5' : 1, '7': 0.2})
     print s.get_all_subs()
-    if 0: # turn this on to normalize all subs
-        for sub in s.get_all_subs():
-            print "before", sub
-            sub.normalize_patch_names()
-            sub.save()
-            print "after", sub