[Freevo-cvslog] freevo ChangeLog,1.14,1.15 osd.py,1.25,1.26

[<kr...@us...>]

Update of /cvsroot/freevo/freevo
In directory usw-pr-cvs1:/tmp/cvs-serv16049

Modified Files:
	ChangeLog osd.py 
Log Message:
Bugfix for 8-bit chars in bitmap filenames by Alex Polite

Index: ChangeLog
===================================================================
RCS file: /cvsroot/freevo/freevo/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ChangeLog	23 Sep 2002 18:05:04 -0000	1.14
--- ChangeLog	28 Sep 2002 04:36:09 -0000	1.15
***************
*** 25,29 ****
  o Skin improvements
  o configure now checks for external programs
! 
  	
  Release 1.2.5 (2002-08-21):
--- 25,30 ----
  o Skin improvements
  o configure now checks for external programs
! o Bugfix for 8-bit chars in bitmap filenames by Alex Polite 
! 	
  	
  Release 1.2.5 (2002-08-21):

Index: osd.py
===================================================================
RCS file: /cvsroot/freevo/freevo/osd.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** osd.py	25 Sep 2002 01:41:09 -0000	1.25
--- osd.py	28 Sep 2002 04:36:09 -0000	1.26
***************
*** 13,16 ****
--- 13,19 ----
  # -----------------------------------------------------------------------
  # $Log$
+ # Revision 1.26  2002/09/28 04:36:09  krister
+ # Bugfix for 8-bit chars in bitmap filenames by Alex Polite
+ #
  # Revision 1.25  2002/09/25 01:41:09  gsbarbieri
  # Updated osd.drawstringframed() with new break points to words that are
***************
*** 85,89 ****
  #endif
  
! import socket, time, sys, os, re
  
  # Configuration file. Determines where to look for AVI/MP3 files, etc
--- 88,97 ----
  #endif
  
! import socket
! import time
! import sys
! import os
! import re
! from types import *
  
  # Configuration file. Determines where to look for AVI/MP3 files, etc
***************
*** 200,203 ****
--- 208,221 ----
  
          
+ #
+ # Return a unicode representation of a String or Unicode object
+ #
+ def stringproxy(str):
+     result = str
+     if type(str) == StringType:
+         result = unicode(str, 'unicode-escape')
+         return result
+ 
+ 
  class Font:
  
***************
*** 884,888 ****
          for i in range(len(self.bitmapcache)):
              fname, image = self.bitmapcache[i]
!             if fname == filename:
                  # Move to front of FIFO
                  del self.bitmapcache[i]
--- 902,906 ----
          for i in range(len(self.bitmapcache)):
              fname, image = self.bitmapcache[i]
!             if stringproxy(fname) == stringproxy(filename):
                  # Move to front of FIFO
                  del self.bitmapcache[i]
***************
*** 905,913 ****
          return image
  
      def _deletefromcache(self, filename):
          for i in range(len(self.bitmapcache)):
              fname, image = self.bitmapcache[i]
!             if fname == filename:
                  del self.bitmapcache[i]
          
      def _helpscreen(self):
--- 923,933 ----
          return image
  
+ 
      def _deletefromcache(self, filename):
          for i in range(len(self.bitmapcache)):
              fname, image = self.bitmapcache[i]
!             if stringproxy(fname) == stringproxy(filename):
                  del self.bitmapcache[i]
+ 
          
      def _helpscreen(self):