Changeset - 7d3a0f9107a8
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
dmcc - 21 years ago 2003-07-07 07:07:22

try to resolve version conflict problems
2 files changed with 22 insertions and 29 deletions:
flax/CueFaders.py
7
flax/cues/cuelist1
22
22
0 comments (0 inline, 0 general)
flax/CueFaders.py
➞
Show inline comments
 
@@ -213,11 +213,9 @@ class CueList:
 
                     cur,
 
                     self.next_pointer or cur + 1)]
 
    def get_current_cues(self):
 
        # print "get_current_cue_indices", self.get_current_cue_indices()
 
        return [self.get_cue_by_index(index)
 
            for index in self.get_current_cue_indices()]
 
    def get_cue_by_index(self, index):
 
        # print "get_cue_by_index", index
 
        if index:
 
            return self.cues[self.bound_index(index)]
 
        else:
 
@@ -228,11 +226,6 @@ class CueList:
 
        self.treedict.save(self.filename)
 

			




	
	
	
		
 
if __name__ == "__main__":

			




	
	
	
		
 
    if 0:

			




	
	
	
		
 
        z = CueList('cues/cuelist1')

			




	
	
	
		
 
        z.add_cue(Cue('cue %s' % time.asctime(), time=2, a=7, b=8))

			




	
	
	
		
 
        print 'cues', z.cues

			




	
	
	
		
 
    else:

			




	
	
	
		
 
        cl = CueList('cues/cuelist1')

			




	
	
	
		
 

			




	
	
	
		
 
        # to populate cue list

			




        

    


    
    

    

        

                

                    flax/cues/cuelist1
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
<?xml version="1.0"?>

			




	
	
	
		
 
<!DOCTYPE PyObject SYSTEM "PyObjects.dtd">

			




	
	
	
		
 
<PyObject family="obj" type="builtin_wrapper"  class="_EmptyClass">

			




	
	
	
		
 
<attr name="__toplevel__" family="map" type="__compound__" extra="None TreeDict" id="136600876" >

			




	
	
	
		
 
<attr name="__toplevel__" family="map" type="__compound__" extra="None TreeDict" id="135916956" >

			




	
	
	
		
 
  <entry>

			




	
	
	
		
 
    <key type="string" value="cues" />

			




	
	
	
		
 
    <val type="list" id="138285116" >

			




	
	
	
		
 
      <item type="PyObject" id="138619532" class="Cue">

			




	
	
	
		
 
    <val type="list" id="138285508" >

			




	
	
	
		
 
      <item type="PyObject" id="138620316" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 0" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="0" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138231364" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138232236" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 1" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="1" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138597492" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138598276" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 2" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="2" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138228508" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138229380" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 3" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="3" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138308908" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138309300" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 4" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="4" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138228692" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138229564" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 5" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="5" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138295972" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138296364" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 6" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="6" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138255924" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138256796" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 7" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="7" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="136392732" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="136370908" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 8" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="8" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="136982068" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="136982724" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 9" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="9" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138256044" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138256916" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 10" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="10" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138232364" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138233236" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 11" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="11" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138232548" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138233420" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 12" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="12" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138232788" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138233660" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 13" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="13" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138296188" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138296580" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 14" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="14" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="136857940" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="136859228" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 15" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="15" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138232828" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138233700" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 16" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="16" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138232868" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138233740" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 17" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="17" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138608260" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138609044" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 18" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="18" />

			




	
	
	
		
 
      </item>

			




	
	
	
		
 
      <item type="PyObject" id="138229964" class="Cue">

			




	
	
	
		
 
      <item type="PyObject" id="138230836" class="Cue">

			




	
	
	
		
 
        <attr name="some_attribute" type="numeric" value="3" />

			




	
	
	
		
 
        <attr name="name" type="string" value="cue 19" />

			




	
	
	
		
 
        <attr name="time" type="numeric" value="19" />

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: kallithea-749ff669b6-v9g5f-75
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support