diff options
| author | David Tardon <dtardon@redhat.com> | 2012-08-10 08:11:46 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-08-10 08:11:46 +0200 |
| commit | 982babf0488d5afcfadf78dc7eda7d0d47dda0e5 (patch) | |
| tree | eb58e0c33cb54e35c72a9f3510e67f8153d563ae /avmedia/source/gstreamer | |
| parent | 2c2d6e261c538cc8f78a6b69d1d1d8cb0f4ab0c0 (diff) | |
make avmedia build with gstreamer-0.10
Change-Id: I6124904cecdb8ea66477f40b6771a103a8058c10
Diffstat (limited to 'avmedia/source/gstreamer')
| -rw-r--r-- | avmedia/source/gstreamer/gstmanager.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index 6b3ffffd33ca..f04e5ccd2f3d 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -34,11 +34,13 @@ #define AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Manager_GStreamer" #define AVMEDIA_GST_MANAGER_SERVICENAME "com.sun.star.media.Manager" +#if !defined DBG #if OSL_DEBUG_LEVEL > 2 #define DBG OSL_TRACE #else #define DBG(...) #endif +#endif using namespace ::com::sun::star; diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 28e5d343bfaf..36544100072d 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -50,11 +50,13 @@ # define AVVERSION "gst 1.0: " #endif -#if 1 //OSL_DEBUG_LEVEL > 2 +#if !defined DBG +#if OSL_DEBUG_LEVEL > 2 #define DBG(...) do { fprintf (stderr, "%s", AVVERSION); fprintf (stderr, __VA_ARGS__); fprintf (stderr, "\n"); } while (0); #else #define DBG(...) #endif +#endif using namespace ::com::sun::star; @@ -192,7 +194,7 @@ GstBusSyncReply Player::processSyncMessage( GstMessage *message ) { // DBG( "%p processSyncMessage has handle: %s", this, GST_MESSAGE_TYPE_NAME( message ) ); -#if 1 // OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 if ( GST_MESSAGE_TYPE( message ) == GST_MESSAGE_ERROR ) { GError* error; @@ -575,7 +577,7 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() DBG( "%p Player::getPreferredPlayerWindowSize, member %d x %d", this, mnWidth, mnHeight ); TimeValue aTimeout = { 10, 0 }; -#if 1 // OSL_DEBUG_LEVEL > 2 +#if OSL_DEBUG_LEVEL > 2 osl::Condition::Result aResult = #endif maSizeCondition.wait( &aTimeout ); |