- reverted some stuff that was erroneously commited by one of the last commits.

- moved DEBUG define from config-*.inc back to switches.inc
- APPTYPE is needed by FPC (for Windows) too. Fixed some crashes with Writeln in FPC (Win) if no console is available.
- Moved thread-safe ULog.SafeWriteln() to UCommon.ConsoleWriteln(), this is used by DebugWriteln() now, so this is thread-safe too
- Added log-levels (sorted by severity): DEBUG, INFO, STATUS, WARN, ERROR, CRITICAL. Default log-level is LOG_LEVEL_ERROR, so warnings and less important logs are not printed by default. You can change this by LOG_LEVEL_DEFAULT or Log.SetLogLevel(Level). Please use Log.LogError/Warn/Status/Info/Debug/... instead of DebugWriteln() to avoid spamming the console. See ULog.pas for further info.

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

1 files changed, 14 insertions, 14 deletions

diff --git a/Game/Code/Classes/UAudioDecoder_FFMpeg.pas b/Game/Code/Classes/UAudioDecoder_FFMpeg.pas
index 8903bc09..209e1838 100644
--- a/Game/Code/Classes/UAudioDecoder_FFMpeg.pas
+++ b/Game/Code/Classes/UAudioDecoder_FFMpeg.pas
@@ -372,7 +372,7 @@ begin
       if(url_feof(pbIOCtx) <> 0) then
       begin
         {$IFDEF DebugFFMpegDecode}
-        SafeWriteLn('feof');
+        DebugWriteln('feof');
         {$ENDIF}
         eofState := true;
         continue;
@@ -382,7 +382,7 @@ begin
       if(url_ferror(pbIOCtx) = 0) then
       begin
         {$IFDEF DebugFFMpegDecode}
-        SafeWriteLn('Errorf');
+        DebugWriteln('Errorf');
         {$ENDIF}
         // no error -> wait for user input
         SDL_Delay(100);
@@ -397,11 +397,11 @@ begin
       end;
     end;
 
-    //SafeWriteLn( 'ffmpeg - av_read_frame' );
+    //DebugWriteln( 'ffmpeg - av_read_frame' );
 
     if(packet.stream_index = ffmpegStreamIndex) then
     begin
-      //SafeWriteLn( 'packet_queue_put' );
+      //DebugWriteln( 'packet_queue_put' );
       packetQueue.put(@packet);
     end
     else
@@ -425,7 +425,7 @@ begin
   begin
     while (audio_pkt_size > 0) do
     begin
-      //SafeWriteLn( 'got audio packet' );
+      //DebugWriteln( 'got audio packet' );
       data_size := bufSize;
 
       {$IF LIBAVCODEC_VERSION >= 51030000} // 51.30.0
@@ -438,13 +438,13 @@ begin
                   data_size, audio_pkt_data, audio_pkt_size);
       {$IFEND}
 
-      //SafeWriteLn('avcodec_decode_audio : ' + inttostr( len1 ));
+      //DebugWriteln('avcodec_decode_audio : ' + inttostr( len1 ));
 
       if(len1 < 0) then
       begin
         // if error, skip frame
         {$IFDEF DebugFFMpegDecode}
-        SafeWriteLn( 'Skip audio frame' );
+        DebugWriteln( 'Skip audio frame' );
         {$ENDIF}
         audio_pkt_size := 0;
         break;
@@ -482,7 +482,7 @@ begin
     begin
       avcodec_flush_buffers(pCodecCtx);
       {$IFDEF DebugFFMpegDecode}
-      SafeWriteLn('Flush');
+      DebugWriteln('Flush');
       {$ENDIF}
       continue;
     end;
@@ -493,13 +493,13 @@ begin
       // end-of-file reached -> set EOF-flag
       SetEOF(true);
       {$IFDEF DebugFFMpegDecode}
-      SafeWriteLn('EOF');
+      DebugWriteln('EOF');
       {$ENDIF}
       // note: buffer is not (even partially) filled -> no data to return
       exit;
     end;
 
-    //SafeWriteLn( 'Audio Packet Size - ' + inttostr(audio_pkt_size) );
+    //DebugWriteln( 'Audio Packet Size - ' + inttostr(audio_pkt_size) );
   end;
 end;
 
@@ -522,14 +522,14 @@ begin
     begin
       // we have already sent all our data; get more
       audio_size := DecodeFrame(audio_buf, sizeof(TAudioBuffer));
-      //SafeWriteLn('audio_decode_frame : '+ inttostr(audio_size));
+      //DebugWriteln('audio_decode_frame : '+ inttostr(audio_size));
 
       if(audio_size < 0) then
       begin
         // if error, output silence
         audio_buf_size := 1024;
         FillChar(audio_buf, audio_buf_size, #0);
-        //SafeWriteLn( 'Silence' );
+        //DebugWriteln( 'Silence' );
       end
       else
       begin
@@ -731,7 +731,7 @@ begin
     Self.lastPkt := pkt1;
     inc(Self.nbPackets);
 
-    //SafeWriteLn('Put: ' + inttostr(nbPackets));
+    //DebugWriteln('Put: ' + inttostr(nbPackets));
 
     Self.size := Self.size + pkt1^.pkt.size;
     SDL_CondSignal(Self.cond);
@@ -765,7 +765,7 @@ begin
           Self.lastPkt := nil;
         dec(Self.nbPackets);
 
-        //SafeWriteLn('Get: ' + inttostr(nbPackets));
+        //DebugWriteln('Get: ' + inttostr(nbPackets));
 
         Self.size := Self.size - pkt1^.pkt.size;
         pkt := pkt1^.pkt;