diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 299c8f87d7d2..062710c8affb 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -312,7 +312,7 @@ void MediaWindowImpl::Resize() if( xPlayerWindow.is() ) xPlayerWindow->setPosSize( 0, 0, aPlayerWindowSize.Width(), aPlayerWindowSize.Height(), 0 ); - maChildWindow.SetPosSizePixel( Point( nOffset, nOffset ), aPlayerWindowSize ); + maChildWindow.SetPosSizePixel( Point( 0, 0 ), aPlayerWindowSize ); } // --------------------------------------------------------------------- @@ -373,7 +373,7 @@ void MediaWindowImpl::Paint( const Rectangle& ) if( pLogo && !pLogo->IsEmpty() && ( aVideoRect.GetWidth() > 0 ) && ( aVideoRect.GetHeight() > 0 ) ) { Size aLogoSize( pLogo->GetSizePixel() ); - const Color aBackgroundColor( 0, 0, 0 ); + const Color aBackgroundColor( 67, 67, 67 ); SetLineColor( aBackgroundColor ); SetFillColor( aBackgroundColor ); diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index be863335bd98..a1fef95d8613 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -189,7 +189,6 @@ namespace void SAL_CALL VLCPlayer::setWindowID( const intptr_t windowID ) { ::osl::MutexGuard aGuard( m_aMutex ); - mPrevWinID = windowID; mPlayer.stop(); mPlayer.setWindow( windowID ); } @@ -206,14 +205,21 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind ::osl::MutexGuard aGuard( m_aMutex ); const intptr_t winID = GetWindowID( aArguments ); - VLCWindow * const window = new VLCWindow( *this, mPrevWinID ); + VLCWindow * window; + if ( mPrevWinID == 0 ) + { + mPrevWinID = winID; + window = new VLCWindow( *this, 0 ); + } + else + window = new VLCWindow( *this, mPrevWinID ); if ( winID != -1 ) { setWindowID( winID ); } - return uno::Reference< css::media::XPlayerWindow >( window ); + return ::com::sun::star::uno::Reference< css::media::XPlayerWindow >( window ); } uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber() diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index cded4db20ed3..02fa74f46976 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -22,7 +22,8 @@ VLCWindow::VLCWindow( VLCPlayer& player, const intptr_t prevWinID ) VLCWindow::~VLCWindow() { - mPlayer.setWindowID( mPrevWinID ); + if ( mPrevWinID != 0 ) + mPlayer.setWindowID( mPrevWinID ); } void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException)