mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing warnings

Browse Source 
Change-Id: I71a8deaf814f89d2dca62fe5cb67b76a59ed31bd
This commit is contained in:
Minh Ngo
2013-08-22 08:48:20 +03:00
parent e90549f3fd
commit 2ec159f691
5 changed files with 66 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
avmedia/source/vlc/vlcframegrabber.cxx
View File

@@ -31,7 +31,7 @@ SAL_CALL VLCFrameGrabber::VLCFrameGrabber( VLC::Player& player, boost::shared_pt
{ {
} }
::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime ) ::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime ) throw ( ::com::sun::star::uno::RuntimeException )
{ {
osl::Condition condition; osl::Condition condition;
@@ -82,17 +82,17 @@ SAL_CALL VLCFrameGrabber::VLCFrameGrabber( VLC::Player& player, boost::shared_pt
return Graphic( bitmap ).GetXGraphic(); return Graphic( bitmap ).GetXGraphic();
} }
::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() ::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException )
{ {
return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME; return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME;
} }
::sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName ) ::sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName ) throw ( ::com::sun::star::uno::RuntimeException )
{ {
return AVMEDIA_VLC_GRABBER_SERVICENAME == serviceName; return AVMEDIA_VLC_GRABBER_SERVICENAME == serviceName;
} }
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::uno::Sequence< OUString > aRet(1); ::uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_VLC_GRABBER_SERVICENAME; aRet[0] = AVMEDIA_VLC_GRABBER_SERVICENAME;

8
avmedia/source/vlc/vlcframegrabber.hxx
View File

@@ -45,11 +45,11 @@ class VLCFrameGrabber : public FrameGrabber_BASE
public: public:
SAL_CALL VLCFrameGrabber( VLC::Player& player, boost::shared_ptr<VLC::EventHandler> eh, const rtl::OUString& url ); SAL_CALL VLCFrameGrabber( VLC::Player& player, boost::shared_ptr<VLC::EventHandler> eh, const rtl::OUString& url );
::com::sun::star::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ); ::com::sun::star::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw ( ::com::sun::star::uno::RuntimeException );
::rtl::OUString SAL_CALL getImplementationName(); ::rtl::OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException );
::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ); ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException );
}; };
} }

33
avmedia/source/vlc/vlcplayer.cxx
View File

@@ -45,31 +45,31 @@ const rtl::OUString& VLCPlayer::url() const
return mUrl; return mUrl;
} }
void SAL_CALL VLCPlayer::start() void SAL_CALL VLCPlayer::start() throw (::com::sun::star::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlayer.play(); mPlayer.play();
} }
void SAL_CALL VLCPlayer::stop() void SAL_CALL VLCPlayer::stop() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlayer.pause(); mPlayer.pause();
} }
::sal_Bool SAL_CALL VLCPlayer::isPlaying() ::sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.isPlaying(); return mPlayer.isPlaying();
} }
double SAL_CALL VLCPlayer::getDuration() double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mPlayer.getLength() ) / MS_IN_SEC; return static_cast<double>( mPlayer.getLength() ) / MS_IN_SEC;
} }
void SAL_CALL VLCPlayer::setMediaTime( double fTime ) void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
@@ -81,13 +81,13 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime )
mPlayer.setTime( fTime * MS_IN_SEC ); mPlayer.setTime( fTime * MS_IN_SEC );
} }
double SAL_CALL VLCPlayer::getMediaTime() double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC; return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC;
} }
double SAL_CALL VLCPlayer::getRate() double SAL_CALL VLCPlayer::getRate() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.getRate(); return mPlayer.getRate();
@@ -101,7 +101,7 @@ void VLCPlayer::replay()
start(); start();
} }
void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlaybackLoop = bSet; mPlaybackLoop = bSet;
@@ -112,37 +112,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( ::sal_Bool bSet )
mEventManager.onEndReached(); mEventManager.onEndReached();
} }
::sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() ::sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return mPlaybackLoop; return mPlaybackLoop;
} }
void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0 / 4 ) ); mPlayer.setVolume( static_cast<sal_Int16>( ( nDB + 40 ) * 10.0 / 4 ) );
} }
::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() ::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return static_cast<sal_Int16>( mPlayer.getVolume() / 10.0 * 4 - 40 ); return static_cast<sal_Int16>( mPlayer.getVolume() / 10.0 * 4 - 40 );
} }
void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet ) void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
mPlayer.setMute( bSet ); mPlayer.setMute( bSet );
} }
::sal_Bool SAL_CALL VLCPlayer::isMute() ::sal_Bool SAL_CALL VLCPlayer::isMute() throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.getMute(); return mPlayer.getMute();
} }
css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException )
{ {
return css::awt::Size( 480, 360 ); return css::awt::Size( 480, 360 );
} }
@@ -175,6 +175,7 @@ namespace
} }
uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments )
throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
@@ -191,6 +192,7 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind
} }
uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber() uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber()
throw ( ::com::sun::star::uno::RuntimeException )
{ {
::osl::MutexGuard aGuard(m_aMutex); ::osl::MutexGuard aGuard(m_aMutex);
VLCFrameGrabber *frameGrabber = new VLCFrameGrabber( mPlayer, mEventHandler, mUrl ); VLCFrameGrabber *frameGrabber = new VLCFrameGrabber( mPlayer, mEventHandler, mUrl );
@@ -198,16 +200,19 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb
} }
::rtl::OUString SAL_CALL VLCPlayer::getImplementationName() ::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException )
{ {
return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME; return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME;
} }
::sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName ) ::sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName )
throw ( ::com::sun::star::uno::RuntimeException )
{ {
return serviceName == AVMEDIA_VLC_PLAYER_SERVICENAME; return serviceName == AVMEDIA_VLC_PLAYER_SERVICENAME;
} }
::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames()
throw ( ::com::sun::star::uno::RuntimeException )
{ {
uno::Sequence< OUString > aRet(1); uno::Sequence< OUString > aRet(1);
aRet[0] = AVMEDIA_VLC_PLAYER_SERVICENAME; aRet[0] = AVMEDIA_VLC_PLAYER_SERVICENAME;

39
avmedia/source/vlc/vlcplayer.hxx
View File

@@ -53,26 +53,27 @@ public:
const rtl::OUString& url() const; const rtl::OUString& url() const;
void SAL_CALL start(); void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException );
void SAL_CALL stop(); void SAL_CALL stop() throw ( ::com::sun::star::uno::RuntimeException );
::sal_Bool SAL_CALL isPlaying(); ::sal_Bool SAL_CALL isPlaying() throw ( ::com::sun::star::uno::RuntimeException );
double SAL_CALL getDuration(); double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException );
void SAL_CALL setMediaTime( double fTime ); void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException );
double SAL_CALL getMediaTime(); double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException );
double SAL_CALL getRate(); double SAL_CALL getRate() throw ( ::com::sun::star::uno::RuntimeException );
void SAL_CALL setPlaybackLoop( ::sal_Bool bSet ); void SAL_CALL setPlaybackLoop( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException );
::sal_Bool SAL_CALL isPlaybackLoop(); ::sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException );
void SAL_CALL setVolumeDB( ::sal_Int16 nDB ); void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException );
::sal_Int16 SAL_CALL getVolumeDB(); ::sal_Int16 SAL_CALL getVolumeDB() throw ( ::com::sun::star::uno::RuntimeException );
void SAL_CALL setMute( ::sal_Bool bSet ); void SAL_CALL setMute( ::sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException );
::sal_Bool SAL_CALL isMute(); ::sal_Bool SAL_CALL isMute() throw ( ::com::sun::star::uno::RuntimeException );
css::awt::Size SAL_CALL getPreferredPlayerWindowSize(); css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); ::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber(); throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() throw ( ::com::sun::star::uno::RuntimeException );
::rtl::OUString SAL_CALL getImplementationName(); ::rtl::OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException );;
::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ); ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw ( ::com::sun::star::uno::RuntimeException );;
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException );;
private: private:
void replay(); void replay();

38
avmedia/source/vlc/vlcwindow.cxx
View File

@@ -18,7 +18,7 @@ void SAL_CALL VLCWindow::update()
{ {
} }
::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel ZoomLevel ) ::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel )
{ {
return false; return false;
} }
@@ -28,7 +28,7 @@ css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel()
return css::media::ZoomLevel_NOT_AVAILABLE; return css::media::ZoomLevel_NOT_AVAILABLE;
} }
void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 SystemPointerType ) void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 )
{ {
} }
@@ -53,17 +53,17 @@ void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) void SAL_CALL VLCWindow::addEventListener( const uno::Reference< lang::XEventListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEventListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) void SAL_CALL VLCWindow::setPosSize( sal_Int32, sal_Int32, sal_Int32, sal_Int32, sal_Int16 )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
@@ -74,12 +74,12 @@ awt::Rectangle SAL_CALL VLCWindow::getPosSize()
return awt::Rectangle(); return awt::Rectangle();
} }
void SAL_CALL VLCWindow::setVisible( sal_Bool Visible ) void SAL_CALL VLCWindow::setVisible( sal_Bool )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::setEnable( sal_Bool Enable ) void SAL_CALL VLCWindow::setEnable( sal_Bool )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
@@ -89,62 +89,62 @@ void SAL_CALL VLCWindow::setFocus()
{ {
} }
void SAL_CALL VLCWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) void SAL_CALL VLCWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) void SAL_CALL VLCWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) void SAL_CALL VLCWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) void SAL_CALL VLCWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) void SAL_CALL VLCWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) void SAL_CALL VLCWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) void SAL_CALL VLCWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) void SAL_CALL VLCWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) void SAL_CALL VLCWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) void SAL_CALL VLCWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) void SAL_CALL VLCWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }
void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& )
throw (uno::RuntimeException) throw (uno::RuntimeException)
{ {
} }