From 42bfd486a457d327f640263ccc3ee02a380f3566 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 7 Apr 2014 13:58:12 +0200
Subject: avmedia: sal_Bool->bool

Change-Id: I4b72cdce6c82b79c6f475d690af03a22bdb32bb1
---
 avmedia/source/gstreamer/gstplayer.cxx |  4 ++--
 avmedia/source/gstreamer/gstplayer.hxx | 10 +++++-----
 avmedia/source/gstreamer/gstwindow.cxx |  2 +-
 avmedia/source/opengl/oglwindow.cxx    |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'avmedia')

diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 713b900e59ad..11b26519051e 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -64,7 +64,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
     GstPlayer_BASE( m_aMutex ),
     mxMgr( rxMgr ),
     mpPlaybin( NULL ),
-    mbFakeVideo (sal_False ),
+    mbFakeVideo (false ),
     mnUnmutedVolume( 0 ),
     mbPlayPending ( false ),
     mbMuted( false ),
@@ -547,7 +547,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
     DBG( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume );
 
     // change the volume to 0 or the unmuted volume
-    if(  mpPlaybin && mbMuted != bSet )
+    if(  mpPlaybin && (mbMuted ? 1 : 0) != bSet )
     {
         double nVolume = mnUnmutedVolume;
         if( bSet )
diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx
index 32e68db030e3..23f325d8a37a 100644
--- a/avmedia/source/gstreamer/gstplayer.hxx
+++ b/avmedia/source/gstreamer/gstplayer.hxx
@@ -84,13 +84,13 @@ protected:
 
     // Add elements and pipeline here
     GstElement*             mpPlaybin;  // the playbin is also a pipeline
-    sal_Bool                mbFakeVideo;
+    bool                mbFakeVideo;
 
     gdouble                 mnUnmutedVolume;
-    sal_Bool                mbPlayPending;
-    sal_Bool                mbMuted;
-    sal_Bool                mbLooping;
-    sal_Bool                mbInitialized;
+    bool                mbPlayPending;
+    bool                mbMuted;
+    bool                mbLooping;
+    bool                mbInitialized;
 
     long                    mnWindowID;
     GstVideoOverlay*        mpXOverlay;
diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx
index b9f3e321e7e4..b95c33edaf7f 100644
--- a/avmedia/source/gstreamer/gstwindow.cxx
+++ b/avmedia/source/gstreamer/gstwindow.cxx
@@ -77,7 +77,7 @@ void SAL_CALL Window::update(  )
 sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
     throw (uno::RuntimeException, std::exception)
 {
-        sal_Bool bRet = false;
+        bool bRet = false;
 
         if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
             media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 30844b97b080..3a024ef64aca 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -31,7 +31,7 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except
 
 sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException, std::exception)
 {
-    sal_Bool bRet = false;
+    bool bRet = false;
 
     if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
         media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
-- 
cgit