Update of /cvsroot/freevo/freevo/src/video
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22095
Modified Files:
videoitem.py
Log Message:
fix/cleanup dvd on hd handling
Index: videoitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** videoitem.py 3 Feb 2004 20:51:12 -0000 1.122
--- videoitem.py 6 Feb 2004 19:28:51 -0000 1.123
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.123 2004/02/06 19:28:51 dischi
+ # fix/cleanup dvd on hd handling
+ #
# Revision 1.122 2004/02/03 20:51:12 dischi
# fix/enhance dvd on disc
***************
*** 178,190 ****
self.network_play = False
self.mimetype = self.url[:self.url.find('://')].lower()
-
if self.url.find('/VIDEO_TS/') > 0:
# dvd on harddisc
! self.filename = self.url[5:self.url.rfind('/VIDEO_TS/')]
! self.info = util.mediainfo.get(self.filename)
! self.files = FileInformation()
! self.files.append(self.filename)
self.num_titles = len(self.info['tracks'])
!
if not self.image or (self.parent and self.image == self.parent.image):
image = vfs.getoverlay(self.filename + '.raw')
--- 181,194 ----
self.network_play = False
self.mimetype = self.url[:self.url.find('://')].lower()
if self.url.find('/VIDEO_TS/') > 0:
# dvd on harddisc
! self.filename = self.url[5:self.url.rfind('/VIDEO_TS/')]
! self.info = util.mediainfo.get(self.filename)
! self.files = FileInformation()
self.num_titles = len(self.info['tracks'])
! self.files.append(self.filename)
! else:
! self.filename = ''
!
if not self.image or (self.parent and self.image == self.parent.image):
image = vfs.getoverlay(self.filename + '.raw')
***************
*** 470,484 ****
util.mount(os.path.dirname(self.filename))
! elif self.url.startswith('dvd://') or self.url.startswith('vcd://'):
! if self.url.rfind('/') < 6 and not self.media:
! media = util.check_media(self.media_id)
! if media:
! self.media = media
! else:
! self.menuw.show()
! ConfirmBox(text=(_('Media not not found for "%s".\n')+
! _('Please insert the media.')) % self.url,
! handler=self.play).show()
! return
if self.player_rating < 10:
--- 474,487 ----
util.mount(os.path.dirname(self.filename))
! elif self.mode in ('dvd', 'vcd') and not self.filename and not self.media:
! media = util.check_media(self.media_id)
! if media:
! self.media = media
! else:
! self.menuw.show()
! ConfirmBox(text=(_('Media not not found for "%s".\n')+
! _('Please insert the media.')) % self.url,
! handler=self.play).show()
! return
if self.player_rating < 10:
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
