Kaydet (Commit) 42bfd486 authored tarafından Noel Grandin's avatar Noel Grandin

avmedia: sal_Bool->bool

Change-Id: I4b72cdce6c82b79c6f475d690af03a22bdb32bb1
üst c2161066
...@@ -64,7 +64,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : ...@@ -64,7 +64,7 @@ Player::Player( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) :
GstPlayer_BASE( m_aMutex ), GstPlayer_BASE( m_aMutex ),
mxMgr( rxMgr ), mxMgr( rxMgr ),
mpPlaybin( NULL ), mpPlaybin( NULL ),
mbFakeVideo (sal_False ), mbFakeVideo (false ),
mnUnmutedVolume( 0 ), mnUnmutedVolume( 0 ),
mbPlayPending ( false ), mbPlayPending ( false ),
mbMuted( false ), mbMuted( false ),
...@@ -547,7 +547,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) ...@@ -547,7 +547,7 @@ void SAL_CALL Player::setMute( sal_Bool bSet )
DBG( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume ); DBG( "set mute: %d muted: %d unmuted volume: %lf", bSet, mbMuted, mnUnmutedVolume );
// change the volume to 0 or the unmuted volume // change the volume to 0 or the unmuted volume
if( mpPlaybin && mbMuted != bSet ) if( mpPlaybin && (mbMuted ? 1 : 0) != bSet )
{ {
double nVolume = mnUnmutedVolume; double nVolume = mnUnmutedVolume;
if( bSet ) if( bSet )
......
...@@ -84,13 +84,13 @@ protected: ...@@ -84,13 +84,13 @@ protected:
// Add elements and pipeline here // Add elements and pipeline here
GstElement* mpPlaybin; // the playbin is also a pipeline GstElement* mpPlaybin; // the playbin is also a pipeline
sal_Bool mbFakeVideo; bool mbFakeVideo;
gdouble mnUnmutedVolume; gdouble mnUnmutedVolume;
sal_Bool mbPlayPending; bool mbPlayPending;
sal_Bool mbMuted; bool mbMuted;
sal_Bool mbLooping; bool mbLooping;
sal_Bool mbInitialized; bool mbInitialized;
long mnWindowID; long mnWindowID;
GstVideoOverlay* mpXOverlay; GstVideoOverlay* mpXOverlay;
......
...@@ -77,7 +77,7 @@ void SAL_CALL Window::update( ) ...@@ -77,7 +77,7 @@ void SAL_CALL Window::update( )
sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel )
throw (uno::RuntimeException, std::exception) throw (uno::RuntimeException, std::exception)
{ {
sal_Bool bRet = false; bool bRet = false;
if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel && if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
media::ZoomLevel_NOT_AVAILABLE != eZoomLevel ) media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
......
...@@ -31,7 +31,7 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except ...@@ -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 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 && if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel &&
media::ZoomLevel_NOT_AVAILABLE != eZoomLevel ) media::ZoomLevel_NOT_AVAILABLE != eZoomLevel )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment