Author: dmeyer
Date: Tue Jan 2 16:25:47 2007
New Revision: 2330
Modified:
trunk/popcorn/src/backends/base.py
trunk/popcorn/src/backends/gstreamer/player.py
trunk/popcorn/src/backends/mplayer/player.py
trunk/popcorn/src/backends/xine/player.py
trunk/popcorn/src/generic.py
Log:
make audio-delay a property
Modified: trunk/popcorn/src/backends/base.py
==============================================================================
--- trunk/popcorn/src/backends/base.py (original)
+++ trunk/popcorn/src/backends/base.py Tue Jan 2 16:25:47 2007
@@ -66,7 +66,6 @@
MediaPlayer._instance_count += 1
# some variables for the inherting class
- self._audio_delay = 0.0
self._position_value = 0.0
self._streaminfo = {}
@@ -94,7 +93,7 @@
"""
Set state and emit 'failed', 'start' or 'end' signal if needed.
"""
- if self._state_object == state or \:
+ if self._state_object == state:
return
if state == STATE_IDLE and self._state_object == STATE_SHUTDOWN:
return
@@ -159,13 +158,6 @@
# interface for generic
#
- def get_audio_delay(self):
- """
- Returns the audio delay set by set_audio_delay()
- """
- return self._audio_delay
-
-
def set_window(self, window):
"""
Set a window for the player.
@@ -327,7 +319,9 @@
"""
Set a property to a new value.
"""
- self._properties[prop] = value
+ func = getattr(self, '_prop_%s' % prop.replace('-', '_'), None)
+ if not func or not func(value) == False:
+ self._properties[prop] = value
#
Modified: trunk/popcorn/src/backends/gstreamer/player.py
==============================================================================
--- trunk/popcorn/src/backends/gstreamer/player.py (original)
+++ trunk/popcorn/src/backends/gstreamer/player.py Tue Jan 2 16:25:47 2007
@@ -124,9 +124,8 @@
self._gst.seek(value, type)
- def set_audio_delay(self, delay):
+ def _prop_audio_delay(self, delay):
"""
- Sets audio delay. Positive value defers audio by delay.
+ Sets audio delay. Positive value defers audio by delay.
"""
- self._audio_delay = delay
self._gst.set_audio_delay(delay)
Modified: trunk/popcorn/src/backends/mplayer/player.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/player.py (original)
+++ trunk/popcorn/src/backends/mplayer/player.py Tue Jan 2 16:25:47 2007
@@ -364,7 +364,6 @@
self._file = media.url
self._state = STATE_OPENING
- self._audio_delay = 0.0
# We have a problem at this point. The 'open' function is used to
# open the stream and provide information about it. After that, the
@@ -525,11 +524,10 @@
self._child_write("seek %f %s" % (value, s.index(type)))
- def set_audio_delay(self, delay):
+ def _prop_audio_delay(self, delay):
"""
- Sets audio delay. Positive value defers audio by delay.
+ Sets audio delay. Positive value defers audio by delay.
"""
- self._audio_delay = delay
self._child_write("audio_delay %f 1" % -delay)
Modified: trunk/popcorn/src/backends/xine/player.py
==============================================================================
--- trunk/popcorn/src/backends/xine/player.py (original)
+++ trunk/popcorn/src/backends/xine/player.py Tue Jan 2 16:25:47 2007
@@ -254,7 +254,6 @@
self.configure()
self._position = 0.0
- self._audio_delay = 0.0
log.debug('xine open %s' % self._mrl)
self._xine.open(self._mrl)
self._state = STATE_OPENING
@@ -308,11 +307,10 @@
self._xine.seek(value, type)
- def set_audio_delay(self, delay):
+ def _prop_audio_delay(self, delay):
"""
- Sets audio delay. Positive value defers audio by delay.
+ Sets audio delay. Positive value defers audio by delay.
"""
- self._audio_delay = delay
self._xine.set_audio_delay(delay)
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Tue Jan 2 16:25:47 2007
@@ -106,6 +106,11 @@
'audio-filename': None,
'subtitle-track': None,
'subtitle-filename': None,
+
+ # Sets the audio delay relative to the video. A positive
+ # value causes audio to come later, while a negative value
+ # plays the audio before.
+ 'audio-delay': 0.0
}
self.signals = {
@@ -391,24 +396,6 @@
return 0.0
- @required_states(STATE_PLAYING, STATE_PAUSED)
- def set_audio_delay(self, delay):
- """
- Sets the audio delay relative to the video. A positive value causes
- audio to come later, while a negative value plays the audio before.
- """
- self._player.set_audio_delay(delay)
-
-
- def get_audio_delay(self):
- """
- Returns the audio delay.
- """
- if self._player:
- return self._player.get_audio_delay()
- return 0.0
-
-
def get_info(self):
"""
Get information about the stream.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
