Update of /cvsroot/freevo/kaa/mplayer/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8675
Modified Files:
__init__.py
Log Message:
Add get_position(); slightly optimize _handle_line()
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/kaa/mplayer/src/__init__.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** __init__.py 2 Aug 2005 02:57:11 -0000 1.1
--- __init__.py 2 Aug 2005 14:23:52 -0000 1.2
***************
*** 52,56 ****
self.filters = {}
self.info = {}
! self.position = 0.0
self.signals = {
--- 52,56 ----
self.filters = {}
self.info = {}
! self._position = 0.0
self.signals = {
***************
*** 114,118 ****
def _handle_line(self, line):
! if line[:3] == "ID_" and line.find("=") != -1:
attr, value = line.split("=")
attr = attr[3:]
--- 114,134 ----
def _handle_line(self, line):
!
! if line[:2] in ("A:", "V:"):
! m = MPlayer.RE_STATUS.match(line)
! if m:
! old_pos = self._position
! self._position = float((m.group(1) or
m.group(2)).replace(",", "."))
! if self._position - old_pos < 0 or self._position - old_pos >
1:
! self.signals["seek"].emit(self._position)
!
! self.signals["tick"].emit(self._position)
! if self._state == MPlayer.STATE_PAUSED:
! self._state = MPlayer.STATE_PLAYING
! self.signals["pause_toggle"].emit()
! self.signals["play"].emit()
!
!
! elif line.startswith("ID_") and line.find("=") != -1:
attr, value = line.split("=")
attr = attr[3:]
***************
*** 130,139 ****
self.info[info[attr][0]] = info[attr][1](value)
! elif line[:12] == "Movie-Aspect":
aspect = line[16:].split(":")[0].replace(",", ".")
if aspect[0].isdigit():
self.info["aspect"] = float(aspect)
! elif line[:3] == "VO:":
m = re.search("=> (\d+)x(\d+)", line)
if m:
--- 146,155 ----
self.info[info[attr][0]] = info[attr][1](value)
! elif line.startswith("Movie-Aspect"):
aspect = line[16:].split(":")[0].replace(",", ".")
if aspect[0].isdigit():
self.info["aspect"] = float(aspect)
! elif line.startswith("VO:"):
m = re.search("=> (\d+)x(\d+)", line)
if m:
***************
*** 142,160 ****
self.signals["start"].emit()
! elif line[:2] in ("A:", "V:"):
! m = MPlayer.RE_STATUS.match(line)
! if m:
! old_pos = self.position
! self.position = float((m.group(1) or m.group(2)).replace(",",
"."))
! if self.position - old_pos < 0 or self.position - old_pos > 1:
! self.signals["seek"].emit(self.position)
!
! self.signals["tick"].emit(self.position)
! if self._state == MPlayer.STATE_PAUSED:
! self._state = MPlayer.STATE_PLAYING
! self.signals["pause_toggle"].emit()
! self.signals["play"].emit()
!
! elif line[:14] == " ===== PAUSE":
self._state = MPlayer.STATE_PAUSED
self.signals["pause_toggle"].emit()
--- 158,162 ----
self.signals["start"].emit()
! elif line.startswith(" ===== PAUSE"):
self._state = MPlayer.STATE_PAUSED
self.signals["pause_toggle"].emit()
***************
*** 162,186 ****
! elif line[:17] == "Starting playback":
self.signals["play"].emit()
self._state = MPlayer.STATE_PLAYING
! elif line[:13] == "Parsing input":
# Delete the temporary key input file.
file = line[line.find("file")+5:]
os.unlink(file)
! elif line[:14] == "File not found":
file = line[line.find(":")+2:]
raise IOError, (2, "No such file or directory: %s" % file)
! if re.search("@@@|outbuf|osd", line, re.I) and DEBUG == 1:
! print line
! elif line[:2] not in ("A:", "V:") and DEBUG == 2:
! print line
! elif DEBUG == 3:
! print line
!
!
--- 164,187 ----
! elif line.startswith("Starting playback"):
self.signals["play"].emit()
self._state = MPlayer.STATE_PLAYING
! elif line.startswith("Parsing input"):
# Delete the temporary key input file.
file = line[line.find("file")+5:]
os.unlink(file)
! elif line.startswith("File not found"):
file = line[line.find(":")+2:]
raise IOError, (2, "No such file or directory: %s" % file)
! if DEBUG:
! if re.search("@@@|outbuf|osd", line, re.I) and DEBUG == 1:
! print line
! elif line[:2] not in ("A:", "V:") and DEBUG == 2:
! print line
! elif DEBUG == 3:
! print line
***************
*** 273,274 ****
--- 274,278 ----
def get_vo_size(self):
return self._vo_size
+
+ def get_position(self):
+ return self._position
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
