[Freevo-cvslog] freevo/src main.py,1.15,1.16 rc.py,1.4,1.5

[<kr...@us...>]

Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16800/src

Modified Files:
	main.py rc.py 
Log Message:
Applied Aubins new pylirc code after testing it (seems to work with keyboard at least), and adding the pylircmodule to the runtime build environment (not required for keyboard operation).

Index: main.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/main.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** main.py	18 Feb 2003 23:08:25 -0000	1.15
--- main.py	19 Feb 2003 08:08:30 -0000	1.16
***************
*** 10,13 ****
--- 10,20 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.16  2003/02/19 08:08:30  krister
+ # Applied Aubins new pylirc code after testing it (seems to work with keyboard at least), and adding the pylircmodule to the runtime build environment (not required for keyboard operation).
+ #
+ # Revision 1.5  2003/02/18 23:47:56  outlyer
+ # Synced pylirc version of main to Rob's latest changes, added some
+ # error handling to weather checker.
+ #
  # Revision 1.15  2003/02/18 23:08:25  rshortt
  # Hooking up the code in src/gui.  Added osd.focused_app to keep track of
***************
*** 115,118 ****
--- 122,127 ----
  import signal
  
+ import idle
+ 
  from mediamenu import MediaMenu
  from item import Item
***************
*** 296,299 ****
--- 305,311 ----
      muted = 0
      mainVolume = 0 # XXX We are using this for PcmVolume as well.
+     
+     #m = idle.IdleTool()
+     #m.refresh()
      while 1:
          
***************
*** 303,313 ****
              event = osd._cb()
              if event: break
-             
              event = rc.poll()
!             if event == rc.NONE:
!                 time.sleep(0.1) # give a little time for buffers to fill
!             else:
!                 break
  
          # Handle volume control   XXX move to the skin
          if event == rc.VOLUP:
--- 315,325 ----
              event = osd._cb()
              if event: break
              event = rc.poll()
!             if event: break
!             #if not rc.app: m.poll()
!             time.sleep(0.1)
  
+ 
+         #m.refresh()
          # Handle volume control   XXX move to the skin
          if event == rc.VOLUP:

Index: rc.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/rc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rc.py	11 Feb 2003 06:10:03 -0000	1.4
--- rc.py	19 Feb 2003 08:08:30 -0000	1.5
***************
*** 10,15 ****
  # -----------------------------------------------------------------------
  # $Log$
! # Revision 1.4  2003/02/11 06:10:03  krister
! # Display an error if the DVD is protected and cannot be played.
  #
  # Revision 1.3  2003/01/11 10:37:48  dischi
--- 10,29 ----
  # -----------------------------------------------------------------------
  # $Log$
! # Revision 1.5  2003/02/19 08:08:30  krister
! # Applied Aubins new pylirc code after testing it (seems to work with keyboard at least), and adding the pylircmodule to the runtime build environment (not required for keyboard operation).
! #
! # Revision 1.4  2003/01/29 19:21:55  outlyer
! # Changed to use config.LIRCRC directive in freevo_config
! #
! # Revision 1.2  2003/01/29 05:53:33  outlyer
! # Ok, I'm compromising until I can figure out an elegant way to do this.
! #
! # o This now works, movies play, etc.
! # o We are non-blocking, so we still use time.sleep, need to fix that.
! # o No UDP daemon, and we use an lircrc file, hardcoded to /etc/freevo for now.
! #
! # As it stands, this works the same as the old code, except keyboard support
! # is missing. I don't have a keyboard on my Freevo machine so I can't implement
! # the keyboard stuff just yet.
  #
  # Revision 1.3  2003/01/11 10:37:48  dischi
***************
*** 49,52 ****
--- 63,74 ----
  import config
  
+ 
+ PYLIRC = 1
+ try:
+     import pylirc
+ except ImportError:
+     print 'WARNING: PyLirc not found, lirc remote control disabled!'
+     PYLIRC = 0
+ 
  # Set to 1 for debug output
  DEBUG = config.DEBUG
***************
*** 129,141 ****
  
      def __init__(self, port=config.REMOTE_CONTROL_PORT):
!         self.port = port
!         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
!         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
!         self.sock.setblocking(0)
!         self.sock.bind(('', self.port))
          self.app = None
          self.queue = []
          
- 
      def post_event(self, event):
          self.queue += [event]
--- 151,166 ----
  
      def __init__(self, port=config.REMOTE_CONTROL_PORT):
!         self.pylirc = PYLIRC
!         
!         if self.pylirc:
!             try:
!                 pylirc.init('freevo', config.LIRCRC)
!                 pylirc.blocking(0)
!             except RuntimeError:
!                 print 'WARNING: Could not initialize PyLirc!'
!                 self.pylirc = 0
          self.app = None
          self.queue = []
          
      def post_event(self, event):
          self.queue += [event]
***************
*** 147,159 ****
              del self.queue[0]
              return ret
!         try:
!             data = self.sock.recv(100)
!             if data == '':
!                 print 'Lost the connection'
!                 self.conn.close()
!             else:
                  return data
!         except:
!             # No data available
!             return self.NONE
! 
--- 172,182 ----
              del self.queue[0]
              return ret
!         if self.pylirc:
!             list = pylirc.nextcode()
!             if list == None:
!                 return None
!             for code in list:
!                 data = code
                  return data
!         else:
!             return None