- IPath integration

- BASS is now unicode compatible

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1875 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 10 insertions, 9 deletions

diff --git a/unicode/src/media/UVideo.pas b/unicode/src/media/UVideo.pas
index f55690b2..de01fd68 100644
--- a/unicode/src/media/UVideo.pas
+++ b/unicode/src/media/UVideo.pas
@@ -69,8 +69,9 @@ type
 implementation
 
 uses
+  SysUtils,
+  Math,
   SDL,
-  textgl,
   avcodec,
   avformat,
   avutil,
@@ -79,17 +80,17 @@ uses
   {$IFDEF UseSWScale}
   swscale,
   {$ENDIF}
-  UMediaCore_FFmpeg,
-  math,
   gl,
   glext,
-  SysUtils,
+  textgl,
+  UMediaCore_FFmpeg,
   UCommon,
   UConfig,
   ULog,
   UMusic,
   UGraphicClasses,
-  UGraphic;
+  UGraphic,
+  UPath;
 
 const
 {$IFDEF PIXEL_FMT_BGR}
@@ -154,7 +155,7 @@ type
     function    Init(): boolean;
     function    Finalize: boolean;
 
-    function    Open(const aFileName : string): boolean; // true if succeed
+    function    Open(const FileName : IPath): boolean; // true if succeed
     procedure   Close;
 
     procedure   Play;
@@ -252,7 +253,7 @@ begin
   fAspectCorrection := acoCrop;
 end;
 
-function TVideoPlayback_FFmpeg.Open(const aFileName : string): boolean; // true if succeed
+function TVideoPlayback_FFmpeg.Open(const FileName : IPath): boolean; // true if succeed
 var
   errnum: Integer;
   AudioStreamIndex: integer;
@@ -261,10 +262,10 @@ begin
 
   Reset();
 
-  errnum := av_open_input_file(fFormatContext, PChar(aFileName), nil, 0, nil);
+  errnum := av_open_input_file(fFormatContext, PChar(FileName.ToNative), nil, 0, nil);
   if (errnum <> 0) then
   begin
-    Log.LogError('Failed to open file "'+aFileName+'" ('+FFmpegCore.GetErrorString(errnum)+')');
+    Log.LogError('Failed to open file "'+ FileName.ToNative +'" ('+FFmpegCore.GetErrorString(errnum)+')');
     Exit;
   end;