diff options
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/gstreamer/gstplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/gstreamer/gstwindow.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/gstreamer/gstwindow.hxx | 10 |
3 files changed, 3 insertions, 13 deletions
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index d12e8e932467..eb64d1d870d6 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -887,7 +887,7 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co if( aSize.Width > 0 && aSize.Height > 0 ) { - ::avmedia::gstreamer::Window* pWindow = new ::avmedia::gstreamer::Window( mxMgr, *this ); + ::avmedia::gstreamer::Window* pWindow = new ::avmedia::gstreamer::Window( mxMgr ); xRet = pWindow; diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index b95c33edaf7f..e3c5cc96f980 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -52,14 +52,12 @@ static ::osl::Mutex& ImplGetOwnStaticMutex() // Window -Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) : +Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr ) : mxMgr( rxMgr ), meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ), - mrPlayer( rPlayer ), mnPointerType( awt::SystemPointer::ARROW ) { ::osl::MutexGuard aGuard( ImplGetOwnStaticMutex() ); - } Window::~Window() diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index 60e1d9f69a24..cc784cbf70af 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -39,14 +39,9 @@ class Window : public ::cppu::WeakImplHelper< css::media::XPlayerWindow, { public: - Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr, - Player& rPlayer ); + Window( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); virtual ~Window(); - bool create( const css::uno::Sequence< css::uno::Any >& aArguments ); - void processGraphEvent(); - void updatePointer(); - // XPlayerWindow virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -88,10 +83,7 @@ private: ::osl::Mutex maMutex; css::media::ZoomLevel meZoomLevel; - Player& mrPlayer; int mnPointerType; - - void ImplLayoutVideoWindow(); }; } // namespace gstreamer |