1 files changed, 57 insertions, 40 deletions

diff --git a/Lua/src/base/UXMLSong.pas b/Lua/src/base/UXMLSong.pas
index 58b48789..e9751eba 100644
--- a/Lua/src/base/UXMLSong.pas
+++ b/Lua/src/base/UXMLSong.pas
@@ -34,7 +34,9 @@ interface
 {$I switches.inc}
 
 uses
-  Classes;
+  Classes,
+  UPath,
+  UUnicodeUtils;
 
 type
   TNote = record
@@ -42,30 +44,30 @@ type
     Duration: Cardinal;
     Tone:     Integer;
     NoteTyp:  Byte;
-    Lyric:    String;
+    Lyric:    UTF8String;
   end;
-  ANote = Array of TNote;
+  ANote = array of TNote;
 
   TSentence = record
     Singer:   Byte;
     Duration: Cardinal;
     Notes:    ANote;
   end;
-  ASentence = Array of TSentence;
+  ASentence = array of TSentence;
 
-  TSongInfo = Record
+  TSongInfo = record
     ID: Cardinal;
     DualChannel: Boolean;
-    Header: Record
-      Artist:     String;
-      Title:      String;
+    Header: record
+      Artist:     UTF8String;
+      Title:      UTF8String;
       Gap:        Cardinal;
       BPM:        Real;
       Resolution: Byte;
-      Edition:    String;
-      Genre:      String;
-      Year:       String;
-      Language:   String;
+      Edition:    UTF8String;
+      Genre:      UTF8String;
+      Year:       UTF8String;
+      Language:   UTF8String;
     end;
     CountSentences: Cardinal;
     Sentences: ASentence;
@@ -81,23 +83,23 @@ type
       BindLyrics: Boolean;    //Should the Lyrics be bind to the last Word (no Space)
       FirstNote: Boolean;     //Is this the First Note found? For Gap calculating
 
-      Function  ParseLine(Line: String): Boolean;
+      function  ParseLine(Line: RawByteString): Boolean;
     public
       SongInfo: TSongInfo;
-      ErrorMessage: String;
-      Edition: String;
-      SingstarVersion: String;
+      ErrorMessage: string;
+      Edition: UTF8String;
+      SingstarVersion: string;
 
-      Settings: Record
+      Settings: record
         DashReplacement: Char;
       end;
 
-      Constructor Create;
+      constructor Create;
 
-      Function  ParseConfigforEdition(const Filename: String): String;
+      function  ParseConfigForEdition(const Filename: IPath): String;
 
-      Function  ParseSongHeader(const Filename: String): Boolean; //Parse Song Header only
-      Function  ParseSong (const Filename: String): Boolean;      //Parse whole Song
+      function  ParseSongHeader(const Filename: IPath): Boolean; //Parse Song Header only
+      function  ParseSong (const Filename: IPath): Boolean;      //Parse whole Song
   end;
 
 const
@@ -114,9 +116,12 @@ const
   DS_Both    = 3;
 
 implementation
-uses SysUtils, StrUtils;
 
-Constructor TParser.Create;
+uses
+  SysUtils,
+  StrUtils;
+
+constructor TParser.Create;
 begin
   inherited Create;
   ErrorMessage := '';
@@ -124,19 +129,24 @@ begin
   DecimalSeparator := '.';
 end;
 
-Function  TParser.ParseSong (const Filename: String): Boolean;
-var I: Integer;
+function TParser.ParseSong(const Filename: IPath): Boolean;
+var
+  I: Integer;
+  FileStream: TBinaryFileStream;
 begin
   Result := False;
-  if FileExists(Filename) then
+  if Filename.IsFile() then
   begin
-    SSFile := TStringList.Create;
+    ErrorMessage := 'Can''t open melody.xml file';
 
+    SSFile := TStringList.Create;
+    FileStream := TBinaryFileStream.Create(Filename, fmOpenRead);
     try
-      ErrorMessage := 'Can''t open melody.xml file';
-      SSFile.LoadFromFile(Filename);
+      SSFile.LoadFromStream(FileStream);
+
       ErrorMessage := '';
       Result := True;
+
       I := 0;
 
       SongInfo.CountSentences := 0;
@@ -153,7 +163,7 @@ begin
 
       SetLength(SongInfo.Sentences, 0);
 
-      While Result And (I < SSFile.Count) do
+      while Result and (I < SSFile.Count) do
       begin
         Result := ParseLine(SSFile.Strings[I]);
 
@@ -162,21 +172,24 @@ begin
 
     finally
       SSFile.Free;
+      FileStream.Free;
     end;
   end;
 end;
 
-Function  TParser.ParseSongHeader (const Filename: String): Boolean;
-var I: Integer;
+function  TParser.ParseSongHeader (const Filename: IPath): Boolean;
+var
+  I: Integer;
+  Stream: TBinaryFileStream;
 begin
   Result := False;
-  if FileExists(Filename) then
+
+  if Filename.IsFile() then
   begin
     SSFile := TStringList.Create;
-    SSFile.Clear;
-    
+    Stream := TBinaryFileStream.Create(Filename, fmOpenRead);
     try
-      SSFile.LoadFromFile(Filename);
+      SSFile.LoadFromStream(Stream);
 
       If (SSFile.Count > 0) then
       begin
@@ -207,6 +220,7 @@ begin
 
     finally
       SSFile.Free;
+      Stream.Free;
     end;
   end
   else
@@ -569,18 +583,20 @@ begin
     Result := true;
 end;
 
-Function  TParser.ParseConfigforEdition(const Filename: String): String;
+Function  TParser.ParseConfigForEdition(const Filename: IPath): String;
 var
   txt: TStringlist;
+  Stream: TBinaryFileStream;
   I: Integer;
   J, K: Integer;
   S: String;
 begin
   Result := '';
-  txt := TStringlist.Create;
-  try
-    txt.LoadFromFile(Filename);
 
+  Stream := TBinaryFileStream.Create(Filename, fmOpenRead);
+  try
+    txt := TStringlist.Create;
+    txt.LoadFromStream(Stream);
     For I := 0 to txt.Count-1 do
     begin
       S := Trim(txt.Strings[I]);
@@ -600,6 +616,7 @@ begin
     Edition := Result;
   finally
     txt.Free;
+    Stream.Free;
   end;
 end;