diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-03 16:33:07 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-03 18:28:55 +0200 |
commit | 98e3b6e9e7d2a866a60b1273ee247165455f5178 (patch) | |
tree | cf15128065910b80d9896435bd255883536257df | |
parent | 8e042b47b92956c268e1175379e1e6e8e38ae5ef (diff) |
avmedia cleanup - remove unused code
-rw-r--r-- | avmedia/inc/avmedia/mediawindow.hxx | 28 | ||||
-rw-r--r-- | avmedia/inc/mediacontrol.hxx | 1 | ||||
-rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 19 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 141 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.cxx | 10 | ||||
-rw-r--r-- | avmedia/source/viewer/mediawindow_impl.hxx | 2 |
6 files changed, 0 insertions, 201 deletions
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx index 5b56f1fd3aa2..aee3397c8a8f 100644 --- a/avmedia/inc/avmedia/mediawindow.hxx +++ b/avmedia/inc/avmedia/mediawindow.hxx @@ -88,35 +88,10 @@ namespace avmedia Window* getWindow() const; void setPosSize( const Rectangle& rNewRect ); - Rectangle getPosSize() const; void setPointer( const Pointer& rPointer ); - const Pointer& getPointer() const; - - bool setZoom( ::com::sun::star::media::ZoomLevel eLevel ); - ::com::sun::star::media::ZoomLevel getZoom() const; bool start(); - void stop(); - - bool isPlaying() const; - - double getDuration() const; - - void setMediaTime( double fTime ); - double getMediaTime() const; - - void setStopTime( double fTime ); - double getStopTime() const; - - void setRate( double fRate ); - double getRate() const; - - void setPlaybackLoop( bool bSet ); - bool isPlaybackLoop() const; - - void setMute( bool bSet ); - bool isMute() const; void updateMediaItem( MediaItem& rItem ) const; void executeMediaItem( const MediaItem& rItem ); @@ -124,9 +99,6 @@ namespace avmedia void show(); void hide(); - void enable(); - void disable(); - public: virtual void MouseMove( const MouseEvent& rMEvt ); diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 022a32eb9586..45f0fdf55f88 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -70,7 +70,6 @@ public: const Size& getMinSizePixel() const; void setState( const MediaItem& rItem ); - void getState( MediaItem& rItem ) const; protected: diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index e69d4d3b93a0..e56550505219 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -291,25 +291,6 @@ void MediaControl::setState( const MediaItem& rItem ) // ------------------------------------------------------------------------------ -void MediaControl::getState( MediaItem& rItem ) const -{ - rItem.merge( maItem ); -} - -// ------------------------------------------------------------------------------ - -void MediaControl::update() -{ -} - -// ------------------------------------------------------------------------------ - -void MediaControl::execute( const MediaItem& ) -{ -} - -// ------------------------------------------------------------------------------ - void MediaControl::implUpdateToolboxes() { const bool bValidURL = ( maItem.getURL().getLength() > 0 ); diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 415c1fa216dd..b910a0c2c608 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -170,13 +170,6 @@ void MediaWindow::setPosSize( const Rectangle& rNewRect ) // ------------------------------------------------------------------------- -Rectangle MediaWindow::getPosSize() const -{ - return Rectangle( mpImpl->GetPosPixel(), mpImpl->GetSizePixel() ); -} - -// ------------------------------------------------------------------------- - void MediaWindow::setPointer( const Pointer& rPointer ) { if( mpImpl ) @@ -185,27 +178,6 @@ void MediaWindow::setPointer( const Pointer& rPointer ) // ------------------------------------------------------------------------- -const Pointer& MediaWindow::getPointer() const -{ - return mpImpl->getPointer(); -} - -// ------------------------------------------------------------------------- - -bool MediaWindow::setZoom( ::com::sun::star::media::ZoomLevel eLevel ) -{ - return( mpImpl != NULL && mpImpl->setZoom( eLevel ) ); -} - -// ------------------------------------------------------------------------- - -::com::sun::star::media::ZoomLevel MediaWindow::getZoom() const -{ - return mpImpl->getZoom(); -} - -// ------------------------------------------------------------------------- - bool MediaWindow::start() { return( mpImpl != NULL && mpImpl->start() ); @@ -213,103 +185,6 @@ bool MediaWindow::start() // ------------------------------------------------------------------------- -void MediaWindow::stop() -{ - if( mpImpl ) - mpImpl->stop(); -} - -// ------------------------------------------------------------------------- - -bool MediaWindow::isPlaying() const -{ - return( mpImpl != NULL && mpImpl->isPlaying() ); -} - -// ------------------------------------------------------------------------- - -double MediaWindow::getDuration() const -{ - return mpImpl->getDuration(); -} - -// ------------------------------------------------------------------------- - -void MediaWindow::setMediaTime( double fTime ) -{ - if( mpImpl ) - mpImpl->setMediaTime( fTime ); -} - -// ------------------------------------------------------------------------- - -double MediaWindow::getMediaTime() const -{ - return mpImpl->getMediaTime(); -} - -// ------------------------------------------------------------------------- - -void MediaWindow::setStopTime( double fTime ) -{ - if( mpImpl ) - mpImpl->setStopTime( fTime ); -} - -// ------------------------------------------------------------------------- - -double MediaWindow::getStopTime() const -{ - return mpImpl->getStopTime(); -} - -// ------------------------------------------------------------------------- - -void MediaWindow::setRate( double fRate ) -{ - if( mpImpl ) - mpImpl->setRate( fRate ); -} - -// ------------------------------------------------------------------------- - -double MediaWindow::getRate() const -{ - return mpImpl->getRate(); -} - -// ------------------------------------------------------------------------- - -void MediaWindow::setPlaybackLoop( bool bSet ) -{ - if( mpImpl ) - mpImpl->setPlaybackLoop( bSet ); -} - -// ------------------------------------------------------------------------- - -bool MediaWindow::isPlaybackLoop() const -{ - return mpImpl->isPlaybackLoop(); -} - -// ------------------------------------------------------------------------- - -void MediaWindow::setMute( bool bSet ) -{ - if( mpImpl ) - mpImpl->setMute( bSet ); -} - -// ------------------------------------------------------------------------- - -bool MediaWindow::isMute() const -{ - return mpImpl->isMute(); -} - -// ------------------------------------------------------------------------- - void MediaWindow::updateMediaItem( MediaItem& rItem ) const { if( mpImpl ) @@ -342,22 +217,6 @@ void MediaWindow::hide() // ------------------------------------------------------------------------- -void MediaWindow::enable() -{ - if( mpImpl ) - mpImpl->Enable(); -} - -// ------------------------------------------------------------------------- - -void MediaWindow::disable() -{ - if( mpImpl ) - mpImpl->Disable(); -} - -// ------------------------------------------------------------------------- - Window* MediaWindow::getWindow() const { return mpImpl; diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index e831ad1e88c8..424b7dfa1088 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -280,16 +280,6 @@ void MediaWindowImpl::onURLChanged() // --------------------------------------------------------------------- -void MediaWindowImpl::update() -{ - uno::Reference< media::XPlayerWindow > xPlayerWindow( getPlayerWindow() ); - - if( xPlayerWindow.is() ) - xPlayerWindow->update(); -} - -// --------------------------------------------------------------------- - void MediaWindowImpl::setPosSize( const Rectangle& rRect ) { SetPosSizePixel( rRect.TopLeft(), rRect.GetSize() ); diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index edc8eda5b610..23ad2db0ab4f 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -104,8 +104,6 @@ namespace avmedia public: - void update(); - void setPosSize( const Rectangle& rRect ); void setPointer( const Pointer& rPointer ); |