[Libreoffice-commits] .: avmedia/inc avmedia/source
Matus Kukan
mkukan at kemper.freedesktop.org
Wed Aug 3 09:29:14 PDT 2011
avmedia/inc/avmedia/mediawindow.hxx | 28 -----
avmedia/inc/mediacontrol.hxx | 1
avmedia/source/framework/mediacontrol.cxx | 19 ---
avmedia/source/viewer/mediawindow.cxx | 141 -----------------------------
avmedia/source/viewer/mediawindow_impl.cxx | 10 --
avmedia/source/viewer/mediawindow_impl.hxx | 2
6 files changed, 201 deletions(-)
New commits:
commit f0aed9ebe7f815b767b27799632b2694d1a06718
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Aug 3 16:33:07 2011 +0200
avmedia cleanup - remove unused code
diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx
index dc4ea62..7e95c27 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 20e90c4..7ce86cb 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 832fb1f..8bc9b29 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 3137b14..d66a3d9 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 353ac83..197d2d4 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 ee7807d..575eae9 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 );
More information about the Libreoffice-commits
mailing list