[Libreoffice-commits] .: avmedia/source

[Caolán McNamara]

 avmedia/source/gstreamer/gstmanager.cxx |    2 +-
 avmedia/source/gstreamer/gstplayer.cxx  |   15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit aeaf96072c46853fbde5fcf266808a40f14000c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 1 12:22:06 2011 +0100

    tweak some of the DBGS to trigger at different levels
    
    i.e. errors at level 1 and the rest at crazy verbose level

diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx
index 558b949..e3b2c15 100644
--- a/avmedia/source/gstreamer/gstmanager.cxx
+++ b/avmedia/source/gstreamer/gstmanager.cxx
@@ -34,7 +34,7 @@
 #define AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_GStreamer"
 #define AVMEDIA_GST_MANAGER_SERVICENAME "com.sun.star.media.Manager"
 
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 2
 #define DBG OSL_TRACE
 #else
 #define DBG(...)
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 0368c0b..1e2d0b7 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -43,7 +43,7 @@
 #define AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Player_GStreamer"
 #define AVMEDIA_GST_PLAYER_SERVICENAME "com.sun.star.media.Player_GStreamer"
 
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 2
 #define DBG OSL_TRACE
 #else
 #define DBG(...)
@@ -159,13 +159,14 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
 {
     DBG( "%p processSyncMessage: %s", this, GST_MESSAGE_TYPE_NAME( message ) );
 
-#if DEBUG
-    if ( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) {
+#if OSL_DEBUG_LEVEL > 0
+    if ( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR )
+    {
         GError* error;
         gchar* error_debug;
 
         gst_message_parse_error( message, &error, &error_debug );
-        DBG("error: '%s' debug: '%s'", error->message, error_debug);
+        OSL_TRACE("gstreamer error: '%s' debug: '%s'", error->message, error_debug);
     }
 #endif
 
@@ -230,7 +231,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
                         }
                     }
 
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 2
                     sal_Bool aSuccess =
 #endif
                                           osl_setCondition( maSizeCondition );
@@ -241,7 +242,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message )
     } else if( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) {
         if( mnWidth == 0 ) {
             // an error occurred, set condition so that OOo thread doesn't wait for us
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 2
             sal_Bool aSuccess =
 #endif
                                 osl_setCondition( maSizeCondition );
@@ -536,7 +537,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize(  )
     DBG( "%p Player::getPreferredPlayerWindowSize, member %d x %d", this, mnWidth, mnHeight );
 
     TimeValue aTimeout = { 10, 0 };
-#if DEBUG
+#if OSL_DEBUG_LEVEL > 2
     oslConditionResult aResult =
 #endif
                                  osl_waitCondition( maSizeCondition, &aTimeout );