Author: dmeyer
Date: Mon Nov  6 15:06:18 2006
New Revision: 1985

Modified:
   trunk/popcorn/src/backends/xine/player.py

Log:
use get_position and get_info from base.py

Modified: trunk/popcorn/src/backends/xine/player.py
==============================================================================
--- trunk/popcorn/src/backends/xine/player.py   (original)
+++ trunk/popcorn/src/backends/xine/player.py   Mon Nov  6 15:06:18 2006
@@ -56,8 +56,6 @@
         super(Xine, self).__init__()
         self._check_new_frame_timer = 
kaa.notifier.WeakTimer(self._check_new_frame)
         self._is_in_menu = False
-        self._stream_info = {}
-        self._position = 0.0
         self._cur_frame_output_mode = [True, False, None] # vo, shmem, size
         self._child_spawn()
 
@@ -106,7 +104,7 @@
     def _child_set_status(self, pos, time, length, status, speed):
         old_pos = self._position
         self._position = float(time)
-        self._stream_info["length"] = length
+        self._streaminfo["length"] = length
 
         if status == 2:
             if self.get_state() not in (STATE_PAUSED, STATE_PLAYING):
@@ -149,14 +147,14 @@
         #self._window.resize(size)
 
 
-    def _child_set_stream_info(self, status, info):
+    def _child_set_streaminfo(self, status, info):
         if not status:
             # failed playback
             self._state = STATE_IDLE
             return
 
-        changed = info != self._stream_info
-        self._stream_info = info
+        changed = info != self._streaminfo
+        self._streaminfo = info
 
         if self._state == STATE_OPENING:
             self._state = STATE_OPEN
@@ -197,7 +195,7 @@
         """
         old_window = self._window
         super(Xine, self).set_window(window)
-
+        
         if old_window and old_window != self._window:
             # Disconnect signals from existing window.
             
old_window.signals["configure_event"].disconnect(self._window_configure_event)
@@ -289,20 +287,6 @@
         self._xine.seek(value, type)
 
 
-    def get_position(self):
-        """
-        Get current playing position.
-        """
-        return self._position
-
-
-    def get_info(self):
-        """
-        Get information about the stream.
-        """
-        return self._stream_info
-
-
     def nav_command(self, input):
         """
         Issue the navigation command to the player.

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to