mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avmedia102: try use gconfvideosink at preferred video sink

Browse Source
This commit is contained in:
ka
2010-07-07 20:39:52 +02:00
parent 4e0e548c67
commit 6a95ce1c7f
2 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avmedia/source/framework/mediacontrol.cxx
View File

@@ -91,8 +91,6 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle ) if( MEDIACONTROLSTYLE_SINGLELINE != meControlStyle )
{ {
maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) );
maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN ); maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN );
@@ -103,8 +101,6 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) :
} }
else else
{ {
maTimeSlider.SetBackground();
maVolumeSlider.SetBackground();
mpZoomListBox->SetBackground(); mpZoomListBox->SetBackground();
maZoomToolBox.SetBackground(); maZoomToolBox.SetBackground();

54
avmedia/source/gstreamer/gstplayer.cxx
View File

@@ -279,49 +279,50 @@ double SAL_CALL Player::getMediaTime()
void SAL_CALL Player::setStopTime( double /* fTime */ ) void SAL_CALL Player::setStopTime( double /* fTime */ )
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
OSL_TRACE( "GStreamer method avmedia::gst::Player::setStopTime needs to be implemented" );
/* Currently no need for implementation since higher levels of code don't use this method at all
!!! TODO: needs to be implemented if this functionality is needed at a later point of time
if( implInitPlayer() ) if( implInitPlayer() )
{ {
// TBD!!!
} }
*/
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
double SAL_CALL Player::getStopTime() double SAL_CALL Player::getStopTime()
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
double fRet = 0.0; /*
Currently no need for implementation since higher levels of code don't set a stop time ATM
!!! TODO: needs to be fully implemented if this functionality is needed at a later point of time
*/
if( implInitPlayer() ) return( getDuration() );
{
// TBD!!!
fRet = getDuration();
}
return( fRet );
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
void SAL_CALL Player::setRate( double /* fRate */ ) void SAL_CALL Player::setRate( double /* fRate */ )
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
if( implInitPlayer() ) OSL_TRACE( "GStreamer method avmedia::gst::Player::setRate needs to be implemented" );
{
// TBD!!! /* Currently no need for implementation since higher levels of code don't use this method at all
} !!! TODO: needs to be implemented if this functionality is needed at a later point of time
*/
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
double SAL_CALL Player::getRate() double SAL_CALL Player::getRate()
throw( uno::RuntimeException ) throw( uno::RuntimeException )
{ {
double fRet = 1.0; /*
Currently no need for implementation since higher levels of code don't set a different rate than 1 ATM
!!! TODO: needs to be fully implemented if this functionality is needed at a later point of time
*/
if( implInitPlayer() ) return( 1.0 );
{
// TBD!!!;
}
return( fRet );
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
@@ -443,14 +444,13 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow(
} }
else else
{ {
GstElement* pVideoSink = gst_element_factory_make( "xvimagesink", NULL ); // try to use gconf user configurable video sink first
GstElement* pVideoSink = gst_element_factory_make( "gconfvideosink", NULL );
if( !pVideoSink ) if( ( NULL != pVideoSink ) ||
{ ( NULL != ( pVideoSink = gst_element_factory_make( "autovideosink", NULL ) ) ) ||
pVideoSink = gst_element_factory_make( "ximagesink", NULL ); ( NULL != ( pVideoSink = gst_element_factory_make( "xvimagesink", NULL ) ) ) ||
} ( NULL != ( pVideoSink = gst_element_factory_make( "ximagesink", NULL ) ) ) )
if( pVideoSink )
{ {
GstState aOldState = GST_STATE_NULL; GstState aOldState = GST_STATE_NULL;