Author: dmeyer
Date: Thu Nov 2 19:14:56 2006
New Revision: 1969
Modified:
trunk/popcorn/src/backends/base.py
trunk/popcorn/src/ptypes.py
Log:
move error exceptions to ptypes
Modified: trunk/popcorn/src/backends/base.py
==============================================================================
--- trunk/popcorn/src/backends/base.py (original)
+++ trunk/popcorn/src/backends/base.py Thu Nov 2 19:14:56 2006
@@ -36,12 +36,6 @@
from kaa.popcorn.ptypes import *
from kaa.popcorn.utils import parse_mrl
-class PlayerError(Exception):
- pass
-
-class PlayerCapError(PlayerError):
- pass
-
class MediaPlayer(object):
"""
Base class for players
@@ -63,7 +57,7 @@
# Player released video and audio devices
"release": kaa.notifier.Signal(),
-
+
# Process died (shared memory will go away)
"shm_quit": kaa.notifier.Signal()
}
@@ -72,7 +66,7 @@
self._window = None
self._size = None
self._config = None
-
+
def get_capabilities(self):
"""
@@ -106,7 +100,7 @@
"""
self._config = config
-
+
# state handling
def get_state(self):
@@ -122,6 +116,7 @@
"""
if self._state_object == state:
return
+
old_state = self._state_object
self._state_object = state
@@ -143,7 +138,7 @@
if state == STATE_NOT_RUNNING == self._state_object:
self.signals["release"].emit()
self.signals["shm_quit"].emit()
-
+
# state property based on get_state and _set_state
_state = property(get_state, _set_state, None, 'state of the player')
@@ -225,7 +220,7 @@
"""
self.die()
-
+
def seek_relative(self, offset):
"""
Seek relative.
@@ -292,8 +287,8 @@
def osd_can_update(self):
"""
- Returns True if it's safe to write to the OSD shmem buffer.
-
+ Returns True if it's safe to write to the OSD shmem buffer.
+
See Player class for full doc.
"""
pass
Modified: trunk/popcorn/src/ptypes.py
==============================================================================
--- trunk/popcorn/src/ptypes.py (original)
+++ trunk/popcorn/src/ptypes.py Thu Nov 2 19:14:56 2006
@@ -49,3 +49,8 @@
SEEK_ABSOLUTE = 'SEEK_ABSOLUTE'
SEEK_PERCENTAGE = 'SEEK_PERCENTAGE'
+class PlayerError(Exception):
+ pass
+
+class PlayerCapError(PlayerError):
+ pass
-------------------------------------------------------------------------
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
