Audio/Video engine update:

- lyrics<->audio synchronisation (TSyncSource)
- better resampling (optional support for libsamplerate)
- cleaner termination of audio/video streams/devices
- improved decoders and decoder infrastructure
- many other improvements/cleanups

Currently just for testing (not enabled by default):
- Background music
- Voice-Passthrough (hear what you sing)
- Video VSync

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

1 files changed, 8 insertions, 2 deletions

diff --git a/Game/Code/switches.inc b/Game/Code/switches.inc
index 52df7e7d..bb9a50fe 100644
--- a/Game/Code/switches.inc
+++ b/Game/Code/switches.inc
@@ -74,10 +74,11 @@
 // audio config
 {$IF Defined(HaveBASS)}
   {$DEFINE UseBASSPlayback}
+  {$DEFINE UseBASSDecoder}
   {$DEFINE UseBASSInput}
 {$ELSEIF Defined(HavePortaudio)}
-  {.$DEFINE UsePortaudioPlayback}
   {$DEFINE UseSDLPlayback}
+  {.$DEFINE UsePortaudioPlayback}
   {$DEFINE UsePortaudioInput}
   {$IFDEF HavePortmixer}
     {$DEFINE UsePortmixer}
@@ -87,12 +88,17 @@
 // ffmpeg config
 {$IFDEF HaveFFMpeg}
   {$DEFINE UseFFMpegDecoder}
+  {$DEFINE UseFFMpegResample}
   {$DEFINE UseFFMpegVideo}
   {$IFDEF HaveSWScale}
     {$DEFINE UseSWScale}
   {$ENDIF}
 {$ENDIF}
 
+{$IFDEF HaveLibsamplerate}
+  {$DEFINE UseSRCResample}
+{$ENDIF}
+
 // projectM config
 {$IF Defined(HaveProjectM)}
   {$DEFINE UseProjectM}
@@ -104,7 +110,7 @@
   {$DEFINE UseFFMpeg}
 {$IFEND}
 
-{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback)}
+{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback) or Defined(UseBASSDecoder)}
   {$DEFINE UseBASS}
 {$IFEND}