Update of /cvsroot/freevo/freevo/src/audio
In directory sc8-pr-cvs1:/tmp/cvs-serv30580

Modified Files:
        audiodiskitem.py 
Log Message:
better support for mixed discs

Index: audiodiskitem.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/audio/audiodiskitem.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** audiodiskitem.py    5 Nov 2003 21:18:42 -0000       1.23
--- audiodiskitem.py    8 Nov 2003 12:58:41 -0000       1.24
***************
*** 10,13 ****
--- 10,16 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.24  2003/11/08 12:58:41  dischi
+ # better support for mixed discs
+ #
  # Revision 1.23  2003/11/05 21:18:42  dischi
  # mixed disc support (needs mmpython cvs)
***************
*** 98,113 ****
          """
          items = [ ( self.cwd, _('Browse disc') ) ]
-         if self.info and hasattr(self.info, 'mixed'):
-             items.append(( self.cwd_files, _('Browse data files on disc')))
          return items
  
      
-     def cwd_files(self, arg=None, menuw=None):
-         """
-         make a menu for data files on disc
-         """
-         DirItem('/mnt/cdrom', self).cwd(menuw=menuw)
- 
-         
      def cwd(self, arg=None, menuw=None):
          """
--- 101,107 ----
***************
*** 115,119 ****
          """
          play_items = []
!         for i in range(0, len(self.info['tracks'])):
              title=self.info['tracks'][i]['title']
              item = AudioItem('cdda://%d' % (i+1), self, title, scan=False)
--- 109,117 ----
          """
          play_items = []
!         number = len(self.info['tracks'])
!         if hasattr(self.info, 'mixed'):
!             number -= 1
!             
!         for i in range(0, number):
              title=self.info['tracks'][i]['title']
              item = AudioItem('cdda://%d' % (i+1), self, title, scan=False)
***************
*** 147,150 ****
--- 145,153 ----
          items += play_items
  
+         if hasattr(self.info, 'mixed'):
+             d = DirItem(self.media.mountdir, self)
+             d.name = _('Data files on disc')
+             items.append(d)
+             
          self.play_items = play_items
  




-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to