Skip to content

C
core
Kaydet (Commit) 4359ec6b authored tarafından Zolnai Tamás's avatar Zolnai Tamás
Dosyalara gözat
Seçenekler

avmedia: remove unused code related to fast-forward 

One part of that was removed by:
55d52165
e.g. setRate()

Change-Id: Ia5def0150029c1597cd505bbaf740a42819a7c73
üst 4ec3554a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 121 deletions
avmedia/source/framework/mediacontrol.cxx
Dosyayı görüntüle @ 4359ec6b
......@@ -40,7 +40,6 @@
#define AVMEDIA_PAGEINCREMENT 10.0
#define AVMEDIA_TOOLBOXITEM_PLAY 0x0001
#define AVMEDIA_TOOLBOXITEM_PLAYFFW 0x0002
#define AVMEDIA_TOOLBOXITEM_PAUSE 0x0004
#define AVMEDIA_TOOLBOXITEM_STOP 0x0008
#define AVMEDIA_TOOLBOXITEM_MUTE 0x0010
......@@ -290,7 +289,6 @@ void MediaControl::implUpdateToolboxes()
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_INSERT, bValidURL );
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAY, bValidURL );
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, bValidURL );
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_PAUSE, bValidURL );
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_STOP, bValidURL );
maPlayToolBox.EnableItem( AVMEDIA_TOOLBOXITEM_LOOP, bValidURL );
......@@ -310,24 +308,21 @@ void MediaControl::implUpdateToolboxes()
maPlayToolBox.Enable();
maMuteToolBox.Enable();
if( MEDIASTATE_PLAY == maItem.getState() || MEDIASTATE_PLAYFFW == maItem.getState() )
if( MEDIASTATE_PLAY == maItem.getState() )
{
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, true );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, MEDIASTATE_PLAYFFW == maItem.getState() );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false );
}
else if( maItem.getTime() > 0.0 && ( maItem.getTime() < maItem.getDuration() ) )
{
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, false );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, true );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, false );
}
else
{
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAY, false );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PLAYFFW, false );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_PAUSE, false );
maPlayToolBox.CheckItem( AVMEDIA_TOOLBOXITEM_STOP, true );
}
......@@ -516,9 +511,8 @@ IMPL_LINK( MediaControl, implSelectHdl, ToolBox*, p )
break;
case( AVMEDIA_TOOLBOXITEM_PLAY ):
case( AVMEDIA_TOOLBOXITEM_PLAYFFW ):
{
aExecItem.setState( ( AVMEDIA_TOOLBOXITEM_PLAYFFW == p->GetCurItemId() ) ? MEDIASTATE_PLAYFFW : MEDIASTATE_PLAY );
aExecItem.setState( MEDIASTATE_PLAY );
if( maItem.getTime() == maItem.getDuration() )
aExecItem.setTime( 0.0 );
......
avmedia/source/gstreamer/gstplayer.cxx
Dosyayı görüntüle @ 4359ec6b
......@@ -502,23 +502,6 @@ double SAL_CALL Player::getMediaTime()
return position;
}
double SAL_CALL Player::getRate()
throw (uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard(m_aMutex);
double rate = 1.0;
// TODO get the window rate - but no need since
// higher levels never set rate > 1
return rate;
}
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException, std::exception)
{
......
avmedia/source/gstreamer/gstplayer.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -58,7 +58,6 @@ public:
virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getRate( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
......
avmedia/source/macavf/player.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -54,8 +54,6 @@ public:
virtual double SAL_CALL getMediaTime() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setStopTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getStopTime() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setRate( double fRate ) throw (::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getRate() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaybackLoop() throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
......
avmedia/source/macavf/player.mm
Dosyayı görüntüle @ 4359ec6b
......@@ -268,30 +268,6 @@ double SAL_CALL Player::getStopTime()
// ------------------------------------------------------------------------------
void SAL_CALL Player::setRate( double fRate )
throw (uno::RuntimeException)
{
OSL_TRACE ("Player::setRate( %.3f)", fRate);
if( !mpPlayer )
return;
// playback rate: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
[mpPlayer setRate: fRate];
}
// ------------------------------------------------------------------------------
double SAL_CALL Player::getRate()
throw (uno::RuntimeException)
{
// macavf: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
const double fRate = mpPlayer ? (double)[mpPlayer rate] : 1.0;
OSL_TRACE ("Player::getRate() = %.3f", fRate);
return fRate;
}
// ------------------------------------------------------------------------------
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
{
......
avmedia/source/opengl/oglplayer.cxx
Dosyayı görüntüle @ 4359ec6b
......@@ -150,13 +150,6 @@ double SAL_CALL OGLPlayer::getMediaTime() throw ( ::com::sun::star::uno::Runtime
return 0.0; //gltf_animation_get_time(m_pHandle);
}
double SAL_CALL OGLPlayer::getRate() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
// Seems unused
return 1.0;
}
void SAL_CALL OGLPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
......
avmedia/source/opengl/oglplayer.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -42,7 +42,6 @@ public:
virtual double SAL_CALL getDuration() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setMediaTime( double fTime ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getMediaTime() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual double SAL_CALL getRate() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaybackLoop() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
......
avmedia/source/quicktime/player.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -50,7 +50,6 @@ public:
virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual double SAL_CALL getRate( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE;
......
avmedia/source/quicktime/player.mm
Dosyayı görüntüle @ 4359ec6b
......@@ -201,26 +201,6 @@ double SAL_CALL Player::getMediaTime( )
return position;
}
double SAL_CALL Player::getRate( )
throw (uno::RuntimeException)
{
// Quicktime: 0 = stop, 1 = normal speed, 2 = double speed, -1 = normal speed backwards
double rate = 1.0;
OSL_TRACE ("Player::getRate");
if ( mpMovie )
{
rate = (double) [mpMovie rate];
}
return rate;
}
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
{
......
avmedia/source/viewer/mediawindow_impl.cxx
Dosyayı görüntüle @ 4359ec6b
......@@ -343,7 +343,7 @@ bool MediaWindowImpl::start()
void MediaWindowImpl::updateMediaItem( MediaItem& rItem ) const
{
if( isPlaying() )
rItem.setState( ( getRate() > 1.0 ) ? MEDIASTATE_PLAYFFW : MEDIASTATE_PLAY );
rItem.setState( MEDIASTATE_PLAY );
else
rItem.setState( ( 0.0 == getMediaTime() ) ? MEDIASTATE_STOP : MEDIASTATE_PAUSE );
......@@ -389,7 +389,6 @@ void MediaWindowImpl::executeMediaItem( const MediaItem& rItem )
switch( rItem.getState() )
{
case( MEDIASTATE_PLAY ):
case( MEDIASTATE_PLAYFFW ):
{
if( !isPlaying() )
......@@ -455,11 +454,6 @@ double MediaWindowImpl::getMediaTime() const
return( mxPlayer.is() ? mxPlayer->getMediaTime() : 0.0 );
}
double MediaWindowImpl::getRate() const
{
return( mxPlayer.is() ? mxPlayer->getRate() : 0.0 );
}
void MediaWindowImpl::setPlaybackLoop( bool bSet )
{
if( mxPlayer.is() )
......
avmedia/source/viewer/mediawindow_impl.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -147,8 +147,6 @@ namespace avmedia
void setMediaTime( double fTime );
double getMediaTime() const;
double getRate() const;
void setPlaybackLoop( bool bSet );
bool isPlaybackLoop() const;
......
avmedia/source/vlc/vlcplayer.cxx
Dosyayı görüntüle @ 4359ec6b
......@@ -97,12 +97,6 @@ double SAL_CALL VLCPlayer::getMediaTime() throw ( ::com::sun::star::uno::Runtime
return static_cast<double>( mPlayer.getTime() ) / MS_IN_SEC;
}
double SAL_CALL VLCPlayer::getRate() throw ( ::com::sun::star::uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard(m_aMutex);
return mPlayer.getRate();
}
void VLCPlayer::replay()
{
setPlaybackLoop( false );
......
avmedia/source/vlc/vlcplayer.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -68,7 +68,6 @@ public:
double SAL_CALL getDuration() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
double SAL_CALL getMediaTime() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
double SAL_CALL getRate() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
sal_Bool SAL_CALL isPlaybackLoop() throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
......
avmedia/source/win/player.cxx
Dosyayı görüntüle @ 4359ec6b
......@@ -349,19 +349,6 @@ double SAL_CALL Player::getMediaTime( )
return aRefTime;
}
double SAL_CALL Player::getRate( )
throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
double fRet( 0.0 );
if( mpMP )
mpMP->get_Rate( &fRet );
return fRet;
}
void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet )
throw (uno::RuntimeException)
{
......
avmedia/source/win/player.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -72,7 +72,6 @@ public:
virtual double SAL_CALL getDuration( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMediaTime( double fTime ) throw (::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getMediaTime( ) throw (::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getRate( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setMute( sal_Bool bSet ) throw (::com::sun::star::uno::RuntimeException);
......
include/avmedia/mediaitem.hxx
Dosyayı görüntüle @ 4359ec6b
......@@ -54,8 +54,7 @@ enum MediaState
{
MEDIASTATE_STOP = 0,
MEDIASTATE_PLAY = 1,
MEDIASTATE_PLAYFFW = 2,
MEDIASTATE_PAUSE = 3
MEDIASTATE_PAUSE = 2
};
......
offapi/com/sun/star/media/XPlayer.idl
Dosyayı görüntüle @ 4359ec6b
......@@ -68,14 +68,6 @@ interface XPlayer
*/
double getMediaTime();
/** gets the speed of the stream reading relatively to the normal
reading.
@returns
the relative speed. <code>1.0</code> is the normal speed.
*/
double getRate();
/** sets whether the stream reading should restart at the stream
start after the end of the stream.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment