[Libreoffice-commits] core.git: 2 commits - avmedia/source
Minh Ngo
nlminhtl at gmail.com
Fri Sep 20 10:16:20 PDT 2013
avmedia/source/viewer/mediawindow_impl.cxx | 2 +-
avmedia/source/vlc/vlcplayer.cxx | 12 +++++++++---
avmedia/source/vlc/vlcwindow.cxx | 3 ++-
3 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 3d246af83bacacedb7c6a15e082210a67cd5566d
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Fri Sep 20 20:14:11 2013 +0300
Avmedia/VLC: Fixing a bug with a keyframe attaching
Change-Id: Iee28b510a79600e20a7e711d78ca20a216ccc3aa
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 299c8f8..062710c 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 be86333..a1fef95 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 cded4db..02fa74f 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)
commit ccea730aefde5a74abb5c1525d25e7f96ea0a58e
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Fri Sep 20 15:30:08 2013 +0300
Avmedia: Change a background to the black color.
Change-Id: I1edccc2436ae000571551e8d23f432a152081f7f
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx
index 274f58a..299c8f8 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -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( 67, 67, 67 );
+ const Color aBackgroundColor( 0, 0, 0 );
SetLineColor( aBackgroundColor );
SetFillColor( aBackgroundColor );
More information about the Libreoffice-commits
mailing list