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, 14 insertions, 7 deletions

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index b15c5bbf..236d0b1e 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -21,7 +21,7 @@ uses
   {$ifdef UseBass}
   bass          in 'lib\bass\delphi\bass.pas',
   {$endif}
-  {$ifdef UsePortAudio}
+  {$ifdef UsePortaudio}
   portaudio     in 'lib\portaudio\delphi\portaudio.pas',
   {$endif}
   {$ifdef UsePortmixer}
@@ -47,6 +47,7 @@ uses
   rational      in 'lib\ffmpeg\rational.pas',
   opt           in 'lib\ffmpeg\opt.pas',
   avio          in 'lib\ffmpeg\avio.pas',
+  mathematics   in 'lib\ffmpeg\mathematics.pas',
 //  swscale       in 'lib\ffmpeg\swscale.pas',
 
   {$ifdef UseProjectM_0_9}
@@ -142,14 +143,20 @@ uses
   UVisualizer     in 'Classes\UVisualizer.pas',   // MUST be before Video... so video can override...
 {$ENDIF}
   UVideo          in 'Classes\UVideo.pas',
-{$ifdef UseBass}
-  UAudio_bass     in 'Classes\UAudio_bass.pas',
+{$ifdef UseFFMpegDecoder}
+  UAudioDecoder_FFMpeg   in 'Classes\UAudioDecoder_FFMpeg.pas',  // MUST be before Playback-classes
 {$endif}
-{$ifdef UsePortaudio}
-  UAudio_portaudio in 'Classes\UAudio_portaudio.pas',
+{$ifdef UseBASSInput}
+  UAudioInput_Bass       in 'Classes\UAudioInput_Bass.pas',
 {$endif}
-{$ifdef UseFFMpegAudio}
-    UAudio_FFMpeg     in 'Classes\UAudio_FFMpeg.pas',
+{$ifdef UseBASSPlayback}
+  UAudioPlayback_Bass    in 'Classes\UAudioPlayback_Bass.pas',
+{$endif}
+{$ifdef UsePortaudioInput}
+  UAudioInput_Portaudio  in 'Classes\UAudioInput_Portaudio.pas',
+{$endif}
+{$ifdef UsePortaudioPlayback}
+  UAudioPlayback_Portaudio  in 'Classes\UAudioPlayback_Portaudio.pas',
 {$endif}