From 549fd3677bd451169bb45a97ae2da3ee5514622b Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 17 Dec 2007 11:24:51 +0000
Subject: disabled the FFMPEG_AUDIO stuff for the moment

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@709 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Classes/UVideo.pas | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'Game/Code/Classes')

diff --git a/Game/Code/Classes/UVideo.pas b/Game/Code/Classes/UVideo.pas
index 644c62a8..94c8d7ab 100644
--- a/Game/Code/Classes/UVideo.pas
+++ b/Game/Code/Classes/UVideo.pas
@@ -14,9 +14,6 @@ unit UVideo;
 //{$define DebugFrames}
 //{$define Info}
 
-// {$define FFMpegAudio}
-{}
-
 
 interface
 
@@ -49,7 +46,7 @@ uses SDL,
      dialogs,
      {$endif}
      {$ENDIF}
-     {$ifdef FFMpegAudio}
+     {$ifdef UseFFMpegAudio}
      UAudio_FFMpeg,
      {$endif}
      UIni,
@@ -279,14 +276,16 @@ begin
     if (AVPacket.stream_index=VideoStreamIndex) then
     begin
       errnum := avcodec_decode_video(VideoCodecContext, AVFrame,  frameFinished , AVPacket.data, AVPacket.size); // JB-ffmpeg
-    {$ifdef FFMpegAudio}
+    (* FIXME
+    {$ifdef UseFFMpegAudio}
     end
     else
     if (AVPacket.stream_index = AudioStreamIndex ) then
     begin
       writeln('Encue Audio packet');
-      UAudio_FFMpeg.packet_queue_put(UAudio_FFMpeg.audioq, AVPacket);
+      audioq.put(AVPacket);
     {$endif}
+    *)
     end;
 
       try
@@ -485,7 +484,8 @@ begin
     if( AudioStreamIndex >= 0) then
       aCodecCtx := VideoFormatContext.streams[ AudioStreamIndex ].codec;
 
-    {$ifdef FFMpegAudio}
+    (* FIXME
+    {$ifdef UseFFMpegAudio}
   // This is the audio ffmpeg audio support Jay is working on.
     if aCodecCtx <> nil then
     begin
@@ -516,15 +516,16 @@ begin
       avcodec_open(aCodecCtx, aCodec);
 
       writeln( 'Opened the codec' );
-  
+
       packet_queue_init( audioq );
       SDL_PauseAudio(0);
-  
+
       writeln( 'SDL_PauseAudio' );
-  
+
 
     end;
     {$endif}
+    *)
 
     if(VideoStreamIndex >= 0) then
     begin
-- 
cgit v1.2.3