changed from ffmpeg-free (audio) to ffmpeg-enabled (if turned on in switches.inc) version.

BASS is used by default.

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

1 files changed, 7 insertions, 5 deletions

diff --git a/Game/Code/Classes/UVideo.pas b/Game/Code/Classes/UVideo.pas
index 4f6b566a..bbd03d84 100644
--- a/Game/Code/Classes/UVideo.pas
+++ b/Game/Code/Classes/UVideo.pas
@@ -45,9 +45,11 @@ uses SDL,
      dialogs,
      {$endif}
      {$ENDIF}
+     (* FIXME
      {$ifdef UseFFMpegAudio}
-     UAudio_FFMpeg,
+     UAudioDecoder_FFMpeg,
      {$endif}
+     *)
      UIni,
      UMusic,
      UGraphic;
@@ -101,8 +103,8 @@ type
       procedure   Pause;
       procedure   Stop;
 
-      procedure   MoveTo(Time: real);
-      function    getPosition: real;
+      procedure   SetPosition(Time: real);
+      function    GetPosition: real;
 
       procedure   GetFrame(Time: Extended);
       procedure   DrawGL(Screen: integer);
@@ -626,7 +628,7 @@ procedure TVideoPlayback_ffmpeg.Stop;
 begin
 end;
 
-procedure TVideoPlayback_ffmpeg.MoveTo(Time: real);
+procedure TVideoPlayback_ffmpeg.SetPosition(Time: real);
 begin
   fVideoSkipTime := Time;
 
@@ -639,7 +641,7 @@ begin
 end;
 
 // what is this supposed to do? return VideoTime?
-function  TVideoPlayback_ffmpeg.getPosition: real;
+function  TVideoPlayback_ffmpeg.GetPosition: real;
 begin
   result := 0;
 end;