summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avmedia/inc/avmedia/mediaitem.hxx8
-rw-r--r--avmedia/source/framework/mediaitem.cxx12
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.cxx10
-rw-r--r--avmedia/source/gstreamer/gstframegrabber.hxx10
-rw-r--r--avmedia/source/win/player.hxx4
5 files changed, 22 insertions, 22 deletions
diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx
index 6cf0063ed25b..c6d0f5b4fee1 100644
--- a/avmedia/inc/avmedia/mediaitem.hxx
+++ b/avmedia/inc/avmedia/mediaitem.hxx
@@ -93,11 +93,11 @@ public:
void setTime( double fTime );
double getTime() const;
- void setLoop( sal_Bool bLoop );
- sal_Bool isLoop() const;
+ void setLoop( bool bLoop );
+ bool isLoop() const;
- void setMute( sal_Bool bMute );
- sal_Bool isMute() const;
+ void setMute( bool bMute );
+ bool isMute() const;
void setVolumeDB( sal_Int16 nDB );
sal_Int16 getVolumeDB() const;
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 15c3aba7ba71..2776809d255a 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -58,8 +58,8 @@ struct MediaItem::Impl
double m_fTime;
double m_fDuration;
sal_Int16 m_nVolumeDB;
- sal_Bool m_bLoop;
- sal_Bool m_bMute;
+ bool m_bLoop;
+ bool m_bMute;
::com::sun::star::media::ZoomLevel m_eZoom;
Impl(sal_uInt32 const nMaskSet)
@@ -302,7 +302,7 @@ double MediaItem::getTime() const
//------------------------------------------------------------------------
-void MediaItem::setLoop( sal_Bool bLoop )
+void MediaItem::setLoop( bool bLoop )
{
m_pImpl->m_bLoop = bLoop;
m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_LOOP;
@@ -310,14 +310,14 @@ void MediaItem::setLoop( sal_Bool bLoop )
//------------------------------------------------------------------------
-sal_Bool MediaItem::isLoop() const
+bool MediaItem::isLoop() const
{
return m_pImpl->m_bLoop;
}
//------------------------------------------------------------------------
-void MediaItem::setMute( sal_Bool bMute )
+void MediaItem::setMute( bool bMute )
{
m_pImpl->m_bMute = bMute;
m_pImpl->m_nMaskSet |= AVMEDIA_SETMASK_MUTE;
@@ -325,7 +325,7 @@ void MediaItem::setMute( sal_Bool bMute )
//------------------------------------------------------------------------
-sal_Bool MediaItem::isMute() const
+bool MediaItem::isMute() const
{
return m_pImpl->m_bMute;
}
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 05d4d87e661b..d9a4ed14dee3 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -201,22 +201,22 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe
return xRet;
}
-::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
+OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
-sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ServiceName == AVMEDIA_GST_FRAMEGRABBER_SERVICENAME;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames()
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
+ uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_GST_FRAMEGRABBER_SERVICENAME;
return aRet;
diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx
index af23cca1ab7a..0b87c7430862 100644
--- a/avmedia/source/gstreamer/gstframegrabber.hxx
+++ b/avmedia/source/gstreamer/gstframegrabber.hxx
@@ -39,7 +39,7 @@ class FrameGrabber : public FrameGrabber_BASE
void disposePipeline();
public:
// static create method instead of public Ctor
- static FrameGrabber* create( const rtl::OUString &rURL );
+ static FrameGrabber* create( const OUString &rURL );
virtual ~FrameGrabber();
@@ -47,12 +47,12 @@ public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (::com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
private:
- FrameGrabber( const rtl::OUString &aURL );
+ FrameGrabber( const OUString &aURL );
FrameGrabber( const FrameGrabber& );
FrameGrabber& operator=( const FrameGrabber& );
};
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index 5b8844a4d818..d9ec915002c6 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -108,9 +108,9 @@ private:
IDDrawExclModeVideo* mpEV;
long mnUnmutedVolume;
int mnFrameWnd;
- sal_Bool mbMuted;
+ bool mbMuted;
bool mbLooping;
- sal_Bool mbAddWindow;
+ bool mbAddWindow;
void ImplLayoutVideoWindow();
};