Author: dmeyer
Date: Mon Jan 15 16:53:48 2007
New Revision: 2397
Modified:
trunk/popcorn/src/backends/mplayer/player.py
trunk/popcorn/src/generic.py
Log:
add cache property
Modified: trunk/popcorn/src/backends/mplayer/player.py
==============================================================================
--- trunk/popcorn/src/backends/mplayer/player.py (original)
+++ trunk/popcorn/src/backends/mplayer/player.py Mon Jan 15 16:53:48 2007
@@ -339,7 +339,7 @@
# open the stream and provide information about it. After that, the
# caller can still change stuff before calling play. Mplayer doesn't
# work that way so we have to run mplayer with -identify first.
- args = "-nolirc -nojoystick -identify -vo null -ao null -frames 0"
+ args = "-nolirc -nojoystick -identify -vo null -ao null -frames 0
-nocache"
ident = kaa.notifier.Process(self._mp_cmd)
ident.start(args.split(' ') + self._media.mplayer_args)
ident.signals["stdout"].connect_weak(self._child_handle_line)
@@ -517,6 +517,20 @@
elif self._properties.get('subtitle-track') != None:
args.add(sid=self._properties.get('subtitle-track'))
+ if self._properties.get('cache') == 'auto':
+ if self._media.scheme == "dvd":
+ args.add(cache=8192)
+ if self._media.scheme == "vcd":
+ args.add(cache=4096)
+ if self._media.scheme == "dvb":
+ args.add(cache=1024)
+ if self._media.scheme == "http":
+ args.add(cache=8192, cache_min=5)
+ else:
+ args.add(cache=5000)
+ else:
+ args.add(cache=self._properties.get('cache'))
+
# connect to signals
self._mplayer.signals["stdout"].connect_weak(self._child_handle_line)
self._mplayer.signals["stderr"].connect_weak(self._child_handle_line)
Modified: trunk/popcorn/src/generic.py
==============================================================================
--- trunk/popcorn/src/generic.py (original)
+++ trunk/popcorn/src/generic.py Mon Jan 15 16:53:48 2007
@@ -111,7 +111,10 @@
'audio-delay': 0.0,
# fit method. One of 'bars', 'scale', 'zoom'
- 'fit-method': config.video.fit_method
+ 'fit-method': config.video.fit_method,
+
+ # pre-caching, use 'auto' for defaults based on filetype / schema
+ 'cache' : 'auto'
}
self.signals = {
-------------------------------------------------------------------------
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
