minor changes and fixes for USDX on linux.

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

1 files changed, 29 insertions, 29 deletions

diff --git a/Game/Code/Classes/UVideo.pas b/Game/Code/Classes/UVideo.pas
index 05496fbc..4c27867d 100644
--- a/Game/Code/Classes/UVideo.pas
+++ b/Game/Code/Classes/UVideo.pas
@@ -94,9 +94,9 @@ type
       procedure init();
 
       function  Open( aFileName : string): boolean; // true if succeed
-      procedure Close;

-

-      procedure Play;

+      procedure Close;
+
+      procedure Play;
       procedure Pause;
       procedure Stop;
 
@@ -126,7 +126,7 @@ asdf
 
 function  TVideoPlayback_ffmpeg.GetName: String;
 begin
-  result := 'FFMpeg';

+  result := 'FFMpeg';
 end;
 
 {
@@ -281,7 +281,7 @@ begin
           av_free_packet( AVPacket );  // JB-ffmpeg
       except
         // TODO : JB_FFMpeg ... why does this now AV sometimes ( or always !! )
-      end;

+      end;
 
   end;
 
@@ -402,29 +402,29 @@ end;
 
 constructor TVideoPlayback_ffmpeg.create();
 begin
-  writeln( 'UVideo_FFMpeg - TVideoPlayback_ffmpeg.create()' );

-

-  writeln( 'UVideo_FFMpeg - av_register_all' );

-  av_register_all;

+  writeln( 'UVideo_FFMpeg - TVideoPlayback_ffmpeg.create()' );
+
+  writeln( 'UVideo_FFMpeg - av_register_all' );
+  av_register_all;
 
   fVideoOpened := False;
   fVideoPaused := False;
 
-end;

-

-procedure TVideoPlayback_ffmpeg.init();

+end;
+
+procedure TVideoPlayback_ffmpeg.init();
 begin
-  writeln( 'UVideo_FFMpeg - glGenTextures(1, PglUint(@fVideoTex))' );

+  writeln( 'UVideo_FFMpeg - glGenTextures(1, PglUint(@fVideoTex))' );
   glGenTextures(1, PglUint(@fVideoTex));
 
   writeln( 'UVideo_FFMpeg - SetLength(fTexData,0)' );
   SetLength(fTexData,0);
-end;

-

-

-function TVideoPlayback_ffmpeg.Open( aFileName : string): boolean; // true if succeed

-var

-  errnum, i, x,y: Integer;

+end;
+
+
+function TVideoPlayback_ffmpeg.Open( aFileName : string): boolean; // true if succeed
+var
+  errnum, i, x,y: Integer;
   lStreamsCount : Integer;
 
 begin
@@ -474,7 +474,7 @@ begin
     if aCodecCtx <> nil then
     begin
 
-    WantedAudioCodecContext.freq     := aCodecCtx^.sample_rate;
+//    WantedAudioCodecContext.freq     := aCodecCtx^.sample_rate;
 //    WantedAudioCodecContext.format   := AUDIO_S16SYS;
 //    WantedAudioCodecContext.channels := aCodecCtx^.channels;
 (*    WantedAudioCodecContext.silence  := 0;
@@ -591,10 +591,10 @@ begin
                     'be prepared to experience some timing problems');
 {$endif}
     end;
-  end;

-end;

-

-procedure TVideoPlayback_ffmpeg.Close;

+  end;
+end;
+
+procedure TVideoPlayback_ffmpeg.Close;
 begin
   if fVideoOpened then
   begin
@@ -610,8 +610,8 @@ begin
     fVideoOpened:=False;
   end;
 end;
-

-procedure TVideoPlayback_ffmpeg.Play;

+
+procedure TVideoPlayback_ffmpeg.Play;
 begin
 end;
 
@@ -638,7 +638,7 @@ end;
 
 function  TVideoPlayback_ffmpeg.getPosition: real;
 begin
-  result := 0;  

+  result := 0;  
 end;
 
 initialization
@@ -648,8 +648,8 @@ initialization
   AudioManager.add( IVideoPlayback( singleton_VideoFFMpeg ) );
 
 
-finalization

-  AudioManager.Remove( IVideoPlayback( singleton_VideoFFMpeg ) );

+finalization
+  AudioManager.Remove( IVideoPlayback( singleton_VideoFFMpeg ) );
 
 
 end.