[vdrpylib-cvslog] vdrpylib/vdr channel.py,1.6,1.7

[Rob S. <rs...@us...>]

Update of /cvsroot/vdrpylib/vdrpylib/vdr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8305/vdr

Modified Files:
	channel.py 
Log Message:
Clean up how we add events a bit.


Index: channel.py
===================================================================
RCS file: /cvsroot/vdrpylib/vdrpylib/vdr/channel.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** channel.py	1 Dec 2004 18:48:46 -0000	1.6
--- channel.py	2 Dec 2004 02:13:06 -0000	1.7
***************
*** 180,197 ****
  		given restrictions and was added, else None is returned.
  		"""
!                 # print 'adding event: %s' % ev.__str__()
!                 # print 'events len: %d' % len(self.events)
! 		if len(self.events) == 0 or \
!                    self.events[-1].start + self.events[-1].dur <= ev.start:
! 			self.events.append(ev)
! 			if ev.id is None:
! 				if len(self.events) > 1:
! 					ev.id = (self.events[-2].id + 1) % 65536
! 				else:
! 					ev.id = 0
! 			return ev.id
! 		else:
! 			print 'event not later: %s %s %s' % (self.events[-1].start, self.events[-1].dur, ev.start)
! 			return None
  	
  	
--- 180,200 ----
  		given restrictions and was added, else None is returned.
  		"""
!                 
!                 if len(self.events):
!                     if ev.start <= self.events[-1].start:
!                         return None
! 
!                     if self.events[-1].start + self.events[-1].dur > ev.start:
!                         self.events[-1].dur = ev.start - self.events[-1].start
! 
! 		if ev.id is None:
! 		    if len(self.events) > 1:
! 		        ev.id = (self.events[-2].id + 1) % 65536
! 		    else:
! 		        ev.id = 0
! 
!                 self.events.append(ev)
! 
! 		return ev.id