[Libreoffice-commits] core.git: avmedia/source

[Stephan Bergmann]

 avmedia/source/quicktime/player.hxx |    4 ++--
 avmedia/source/quicktime/player.mm  |    2 +-
 avmedia/source/vlc/vlcwindow.cxx    |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4776da791f69fa14104f054923be25618c297398
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 1 23:31:39 2014 +0200

    avmedia: sal_Bool -> bool
    
    Change-Id: Ief9b2cc517e9c0666e656737cee9a953c676a1d9

diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx
index 513bb89..df31ecf 100644
--- a/avmedia/source/quicktime/player.hxx
+++ b/avmedia/source/quicktime/player.hxx
@@ -76,8 +76,8 @@ private:
     float                   mnUnmutedVolume;
     double                  mnStopTime;
 
-    sal_Bool                mbMuted;
-    sal_Bool                mbInitialized;
+    bool                mbMuted;
+    bool                mbInitialized;
 
     oslCondition            maSizeCondition;
 };
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index 5582b03..d4a0eb0 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -236,7 +236,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
     OSL_TRACE( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume );
 
     // change the volume to 0 or the unmuted volume
-    if(  mpMovie && mbMuted != bSet )
+    if(  mpMovie && mbMuted != bool(bSet) )
     {
         [mpMovie setMuted: bSet ];
         mbMuted = bSet;
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 3375020..b7b63a8 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -34,7 +34,7 @@ void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException, std::except
 
 sal_Bool SAL_CALL VLCWindow::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 )