delphi 7 compatibility (inline was introduced with delphi 2005)

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

3 files changed, 11 insertions, 11 deletions

diff --git a/Game/Code/Classes/UAudioDecoder_FFMpeg.pas b/Game/Code/Classes/UAudioDecoder_FFMpeg.pas
index f4c22254..18d6c03b 100644
--- a/Game/Code/Classes/UAudioDecoder_FFMpeg.pas
+++ b/Game/Code/Classes/UAudioDecoder_FFMpeg.pas
@@ -17,7 +17,7 @@ interface
   {$MODE Delphi}
 {$ENDIF}
 
-{$I ../switches.inc}
+{$I switches.inc}
 
 //{$DEFINE DebugFFMpegDecode}
 
@@ -109,9 +109,9 @@ type
       audio_buf_size  : cardinal;
       audio_buf       : TAudioBuffer;
 
-      procedure Lock(); inline;
-      procedure Unlock(); inline;

-      function GetLockMutex(): PSDL_Mutex; inline;
+      procedure Lock(); {$IFDEF HasInline}inline;{$ENDIF}
+      procedure Unlock(); {$IFDEF HasInline}inline;{$ENDIF}

+      function GetLockMutex(): PSDL_Mutex; {$IFDEF HasInline}inline;{$ENDIF}
 
       procedure ParseAudio();
       function DecodeFrame(var buffer: TAudioBuffer; bufSize: integer): integer;
diff --git a/Game/Code/Classes/UAudioPlayback_SoftMixer.pas b/Game/Code/Classes/UAudioPlayback_SoftMixer.pas
index 1dc28dcd..e145587c 100644
--- a/Game/Code/Classes/UAudioPlayback_SoftMixer.pas
+++ b/Game/Code/Classes/UAudioPlayback_SoftMixer.pas
@@ -39,8 +39,8 @@ type
       class function ConvertAudioFormatToSDL(fmt: TAudioSampleFormat): UInt16;

       function InitFormatConversion(): boolean;

 

-      procedure Lock(); inline;

-      procedure Unlock(); inline;

+      procedure Lock(); {$IFDEF HasInline}inline;{$ENDIF}

+      procedure Unlock(); {$IFDEF HasInline}inline;{$ENDIF}

     public

       constructor Create(Engine: TAudioPlayback_SoftMixer);

       destructor Destroy(); override;

@@ -75,8 +75,8 @@ type
 

       _volume: integer;

 

-      procedure Lock(); inline;

-      procedure Unlock(); inline;

+      procedure Lock(); {$IFDEF HasInline}inline;{$ENDIF}

+      procedure Unlock(); {$IFDEF HasInline}inline;{$ENDIF}

 

       function GetVolume(): integer;

       procedure SetVolume(volume: integer);

@@ -100,7 +100,7 @@ type
       function InitializeAudioPlaybackEngine(): boolean; virtual; abstract;

       function StartAudioPlaybackEngine(): boolean;      virtual; abstract;

       procedure StopAudioPlaybackEngine();               virtual; abstract;

-      procedure AudioCallback(buffer: PChar; size: integer); inline;

+      procedure AudioCallback(buffer: PChar; size: integer); {$IFDEF HasInline}inline;{$ENDIF}

     public

       function  GetName: String;                         virtual; abstract;

 

@@ -130,7 +130,7 @@ type
       // Interface for Visualizer

       function GetPCMData(var data: TPCMData): Cardinal;

 

-      function GetMixer(): TAudioMixerStream; inline;

+      function GetMixer(): TAudioMixerStream; {$IFDEF HasInline}inline;{$ENDIF}

       function GetAudioFormatInfo(): TAudioFormatInfo;

 

       // Sounds

diff --git a/Game/Code/Classes/ULog.pas b/Game/Code/Classes/ULog.pas
index 15c590ae..6380b10a 100644
--- a/Game/Code/Classes/ULog.pas
+++ b/Game/Code/Classes/ULog.pas
@@ -52,7 +52,7 @@ type
     procedure LogBuffer(const buf : Pointer; const bufLength : Integer; filename : string);

   end;

 

-procedure SafeWriteLn(const msg: string); inline;

+procedure SafeWriteLn(const msg: string); {$IFDEF HasInline}inline;{$ENDIF}

 

 var

   Log:    TLog;