Author: dmeyer
Date: Mon Apr 16 19:11:42 2007
New Revision: 9468

Modified:
   trunk/core/src/ipc/tvserver.py

Log:
adjust to kaa.epg interface

Modified: trunk/core/src/ipc/tvserver.py
==============================================================================
--- trunk/core/src/ipc/tvserver.py      (original)
+++ trunk/core/src/ipc/tvserver.py      Mon Apr 16 19:11:42 2007
@@ -51,9 +51,6 @@
 # get logging object
 log = logging.getLogger('record')
 
-# deactivate kaa.epg autoconnect
-kaa.epg.autoconnect = False
-
 # status values
 MISSED    = 'missed'
 SAVED     = 'saved'
@@ -485,26 +482,17 @@
         log.info('connected to epg server')
         
 
-    def get_channels(self):
-        if self.guide:
-            return self.guide.get_channels()
-        return []
-
-
-    def search(self, *args, **kwargs):
-        if self.guide:
-            return self.guide.search(*args, **kwargs)
-        return []
-
-
     def update(self):
         if not self.server:
             return False
         self.server.rpc('home-theatre.epg.update')
         return True
 
-    def connected(self):
-        return self.server is not None
+
+    def __getattr__(self, attr):
+        if not self.server and attr != 'is_connected':
+            raise RuntimeError('epg not connected')
+        return getattr(kaa.epg, attr)
 
     
 def ipc_connect(instance):

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to