Changeset 872

Timestamp:

06/10/07 12:28:08 (2 years ago)

Author:

lilo_booter

Message:

+ Server side queuing enhancements (part 1) - notification of queue changes via status and corrections to queue reporting/disposal

Files:

• trunk/jahtools/jbatch/jbatch_server.py (modified) (6 diffs)

trunk/jahtools/jbatch/jbatch_server.py

@@ -84 +84 @@
                 self.playing = False
                 self.checked = False
-                self.id = 0
+                self.id_clip = 0
+                self.id_queue = 0
                 self.current_input = [ ]
                 self.input = None
@@ -93 +94 @@
                 while self.running:
                         while self.running and len( self.queue ) > 0:
-                                self.id += 1
+                                self.id_queue += 1
+                                self.id_clip += 1
                                 pos = self.position
                                 input = self.queue.pop( 0 )
@@ -233 +235 @@
 
         def drop_all( self, **args ):
-                self.queue = []
-                self.rpn.stack = []
+                self.not_empty.acquire( )
+                while len( self.queue ) > 0:
+                        media = self.queue.pop( )
+                        self.rpn.deposit( media )
+                self.rpn.clear( **args )
+                self.id_queue += 1
+                self.not_empty.release( )
 
         def current( self, **args ):
@@ -269 +276 @@
                                 if input is not None:
                                         self.not_empty.acquire( )
+                                        self.id_queue += 1
                                         self.queue.append( input )
                                         self.not_empty.release( )
@@ -347 +355 @@
 
         def info( self ):
-                return "%d %d %d %d %d %d" % ( self.speed, self.position, self.length, self.fps_num, self.fps_den, self.id )
+                return "%d %d %d %d %d %d %d" % ( self.speed, self.position, self.length, self.fps_num, self.fps_den, self.id_clip, self.id_queue )
 
         def send_info( self, **args ):
@@ -416 +424 @@
 
         def query_queue( self, **args ):
-                args[ "socket" ].sendall( str( self.queue ) + "\n" )
+                for media in self.queue:
+                        args[ "socket" ].sendall( self.dump( media ) )
+                        args[ "socket" ].sendall( "\n" )
 
         def query_stack( self, **args ):