Author: tack
Date: Fri Dec 1 16:17:12 2006
New Revision: 2141
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:
Remove set_config and pass config object to backend player via constructor.
Modified: trunk/popcorn/src/backends/base.py
==============================================================================
--- trunk/popcorn/src/backends/base.py (original)
+++ trunk/popcorn/src/backends/base.py Fri Dec 1 16:17:12 2006
@@ -50,7 +50,7 @@
_instance_count = 0
- def __init__(self):
+ def __init__(self, config):
self.signals = {
"elapsed": kaa.notifier.Signal(),
"stream_changed": kaa.notifier.Signal(),
@@ -62,7 +62,7 @@
self._window = None
self._size = None
self._aspect = None
- self._config = None
+ self._config = config
self._instance_id = "popcorn-%d-%d" % (os.getpid(),
self._instance_count)
MediaPlayer._instance_count += 1
@@ -104,15 +104,6 @@
return sets.Set(cap).issubset(sets.Set(supported_caps))
- # config setting
-
- def set_config(self, config):
- """
- Set config object.
- """
- self._config = config
-
-
# state handling
def get_state(self):
Modified: trunk/popcorn/src/backends/gstreamer/player.py
==============================================================================
--- trunk/popcorn/src/backends/gstreamer/player.py (original)
+++ trunk/popcorn/src/backends/gstreamer/player.py Fri Dec 1 16:17:12 2006
@@ -41,8 +41,8 @@
class GStreamer(MediaPlayer):
- def __init__(self):
- super(GStreamer, self).__init__()
+ def __init__(self, config):
+ super(GStreamer, self).__init__(config)
self._state = STATE_NOT_RUNNING
self._gst = None
Modified: trunk/popcorn/src/backends/mplayer/player.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/player.py (original)
+++ trunk/popcorn/src/backends/mplayer/player.py Fri Dec 1 16:17:12 2006
@@ -147,7 +147,6 @@
info['keylist'].append(m.group(1))
- print len(info['video_filters'])
_cache[path] = info
return info
@@ -158,10 +157,10 @@
RE_STATUS = re.compile("V:\s*([\d+\.]+)|A:\s*([\d+\.]+)\s\W")
RE_SWS = re.compile("^SwScaler: [0-9]+x[0-9]+ -> ([0-9]+)x([0-9]+)")
- def __init__(self):
- super(MPlayer, self).__init__()
+ def __init__(self, config):
+ super(MPlayer, self).__init__(config)
self._state = STATE_NOT_RUNNING
- self._mp_cmd = self._config.path
+ self._mp_cmd = self._config.mplayer.path
if not self._mp_cmd:
self._mp_cmd = kaa.utils.which("mplayer")
Modified: trunk/popcorn/src/backends/xine/player.py
==============================================================================
--- trunk/popcorn/src/backends/xine/player.py (original)
+++ trunk/popcorn/src/backends/xine/player.py Fri Dec 1 16:17:12 2006
@@ -52,8 +52,8 @@
class Xine(MediaPlayer):
- def __init__(self):
- super(Xine, self).__init__()
+ def __init__(self, config):
+ super(Xine, self).__init__(config)
self._check_new_frame_timer =
kaa.notifier.WeakTimer(self._check_new_frame)
self._is_in_menu = False
self._cur_frame_output_mode = [True, False, None] # vo, shmem, size
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Fri Dec 1 16:17:12 2006
@@ -227,7 +227,7 @@
"""
Create a player based on cls.
"""
- self._player = cls()
+ self._player = cls(self._config)
self._player._state_changed.connect_weak(self._state_change)
for signal in self._player.signals:
self._player.signals[signal].connect_weak(self.signals[signal].emit)
@@ -238,7 +238,6 @@
"""
The real open function called from 'open'.
"""
- self._player.set_config(self._config)
self._player.set_window(self._window)
self._player.set_size(self._size, self._aspect)
self._player.open(mrl)
-------------------------------------------------------------------------
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
