avmedia/source/framework/mediacontrol.cxx | 10 +----- avmedia/source/gstreamer/gstplayer.cxx | 17 ----------- avmedia/source/gstreamer/gstplayer.hxx | 1 avmedia/source/macavf/player.hxx | 2 - avmedia/source/macavf/player.mm | 24 ---------------- avmedia/source/opengl/oglplayer.cxx | 7 ---- avmedia/source/opengl/oglplayer.hxx | 1 avmedia/source/quicktime/player.hxx | 1 avmedia/source/quicktime/player.mm | 20 ------------- avmedia/source/viewer/mediawindow_impl.cxx | 14 +++------ avmedia/source/viewer/mediawindow_impl.hxx | 4 -- avmedia/source/vlc/vlcplayer.cxx | 6 ---- avmedia/source/vlc/vlcplayer.hxx | 1 avmedia/source/win/player.cxx | 13 -------- avmedia/source/win/player.hxx | 1 external/collada2gltf/patches/wrong_uri_usage.patch.1 | 14 +++++---- include/avmedia/mediaitem.hxx | 3 -- offapi/com/sun/star/media/XPlayer.idl | 8 ----- sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2 - 19 files changed, 18 insertions(+), 131 deletions(-)
New commits: commit 3191d7d1302dbde2445b9f300b3eb853120ede65 Author: Zolnai Tamás <tamas.zol...@collabora.com> Date: Fri May 23 19:25:37 2014 +0200 collada2gltf: one more URL usage fix This one caused empty images and so textures were missing. Change-Id: Ia1e93270b7f5ec560b39a41d207e84171bb2434a diff --git a/external/collada2gltf/patches/wrong_uri_usage.patch.1 b/external/collada2gltf/patches/wrong_uri_usage.patch.1 index 050fdaa..f42f435 100644 --- a/external/collada2gltf/patches/wrong_uri_usage.patch.1 +++ b/external/collada2gltf/patches/wrong_uri_usage.patch.1 @@ -1,6 +1,6 @@ diff -ur collada2gltf.org/GLTF/GLTFAsset.cpp collada2gltf/GLTF/GLTFAsset.cpp ---- collada2gltf.org/GLTF/GLTFAsset.cpp 2014-05-22 11:12:21.823216900 +0200 -+++ collada2gltf/GLTF/GLTFAsset.cpp 2014-05-22 14:59:04.963439700 +0200 +--- collada2gltf.org/GLTF/GLTFAsset.cpp 2014-05-23 19:19:39.505246750 +0200 ++++ collada2gltf/GLTF/GLTFAsset.cpp 2014-05-23 19:20:05.005245669 +0200 @@ -191,12 +191,9 @@ shared_ptr<GLTFOutputStream> GLTFAsset::createOutputStreamIfNeeded(const std::string& streamName) { @@ -31,7 +31,7 @@ diff -ur collada2gltf.org/GLTF/GLTFAsset.cpp collada2gltf/GLTF/GLTFAsset.cpp } COLLADABU::Utils::createDirectoryIfNeeded(this->_bundleOutputPath.c_str()); } -@@ -376,9 +373,9 @@ +@@ -376,10 +373,10 @@ COLLADABU::URI outputImagePathURI(inputImagePath.c_str()); COLLADABU::URI outputURI(this->getOutputFilePath().c_str()); @@ -39,10 +39,12 @@ diff -ur collada2gltf.org/GLTF/GLTFAsset.cpp collada2gltf/GLTF/GLTFAsset.cpp + std::string folder = COLLADABU::URI(outputURI.getPathDir()).toNativePath(); std::string outputPath = folder + outputImagePathURI.getPathFile(); - +- std::ifstream f1(inputImagePath.c_str(), std::fstream::binary); + - std::ifstream f1(inputImagePath.c_str(), std::fstream::binary); ++ std::ifstream f1(COLLADABU::URI(inputImagePath).toNativePath().c_str(), std::fstream::binary); std::ofstream f2(outputPath.c_str(), std::fstream::binary); + if (this->_converterConfig->boolForKeyPath("verboseLogging")) { @@ -397,8 +394,8 @@ this->_root = shared_ptr <GLTF::JSONObject> (new GLTF::JSONObject()); this->_root->setString(kProfile, profile->id()); @@ -64,8 +66,8 @@ diff -ur collada2gltf.org/GLTF/GLTFAsset.cpp collada2gltf/GLTF/GLTFAsset.cpp obj->write(&resultsWriter); diff -ur collada2gltf.org/shaders/commonProfileShaders.cpp collada2gltf/shaders/commonProfileShaders.cpp ---- collada2gltf.org/shaders/commonProfileShaders.cpp 2014-05-22 11:12:21.854416900 +0200 -+++ collada2gltf/shaders/commonProfileShaders.cpp 2014-05-22 14:24:57.063126800 +0200 +--- collada2gltf.org/shaders/commonProfileShaders.cpp 2014-05-23 19:19:39.521246749 +0200 ++++ collada2gltf/shaders/commonProfileShaders.cpp 2014-05-23 19:20:09.085245497 +0200 @@ -294,7 +294,7 @@ //also write the file on disk if (shaderString.size() > 0) { commit 4359ec6b0b89add9176df512fd50ba0d595c58db Author: Zolnai Tamás <tamas.zol...@collabora.com> Date: Fri May 23 16:14:30 2014 +0200 avmedia: remove unused code related to fast-forward One part of that was removed by: 55d52165df003d253d813f3ea7085f4d89fdb3ce e.g. setRate() Change-Id: Ia5def0150029c1597cd505bbaf740a42819a7c73 diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 2a6e66d..540613c 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -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 ); diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 11b2651..c89d423 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -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) { diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index f31dcb8..2426eed 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -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; diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx index b03dfad..de68fac 100644 --- a/avmedia/source/macavf/player.hxx +++ b/avmedia/source/macavf/player.hxx @@ -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; diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm index 14f8a07..2c89239 100644 --- a/avmedia/source/macavf/player.mm +++ b/avmedia/source/macavf/player.mm @@ -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) { diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 00e1f1a..e01a940 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -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); diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index 69f010b..b41df21 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -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; diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx index 625103a..513bb89 100644 --- a/avmedia/source/quicktime/player.hxx +++ b/avmedia/source/quicktime/player.hxx @@ -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; diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index a6b4886..5582b03 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -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) { diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 8660a82..1310832 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -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() ) diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index 2fcafc5..d608430 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -147,8 +147,6 @@ namespace avmedia void setMediaTime( double fTime ); double getMediaTime() const; - double getRate() const; - void setPlaybackLoop( bool bSet ); bool isPlaybackLoop() const; diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 81a5664..60d7b87 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -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 ); diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index 455d587..3d88798 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -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; diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index 7b39681..2a0fdf0 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -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) { diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index b2e861d..701a8fa 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -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); diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 4ccb6fe..b8e9dcf 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -54,8 +54,7 @@ enum MediaState { MEDIASTATE_STOP = 0, MEDIASTATE_PLAY = 1, - MEDIASTATE_PLAYFFW = 2, - MEDIASTATE_PAUSE = 3 + MEDIASTATE_PAUSE = 2 }; diff --git a/offapi/com/sun/star/media/XPlayer.idl b/offapi/com/sun/star/media/XPlayer.idl index 1fb48fe..2d3dc23 100644 --- a/offapi/com/sun/star/media/XPlayer.idl +++ b/offapi/com/sun/star/media/XPlayer.idl @@ -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. commit 4ec3554a80f065c2d9c957d6ce7f577fb195be02 Author: Zolnai Tamás <tamas.zol...@collabora.com> Date: Fri May 23 15:34:14 2014 +0200 avmedia: avoid segmentation fault during destruction of media window mpEvents is not initialized in the destructor any more: b5529c8c457f442bfc43305becc0c02d6a09ee80 Plus use scoped_ptr to stop memory leak. Change-Id: Idaaa274e39c1ac34270ae5b0acdd237ee5aec1c3 diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 6ebe2f7..8660a82 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -178,7 +178,8 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo MediaWindowImpl::~MediaWindowImpl() { - mpEvents->cleanUp(); + if( mpEvents ) + mpEvents->cleanUp(); if( mxPlayerWindow.is() ) { @@ -515,7 +516,8 @@ void MediaWindowImpl::onURLChanged() if( !mpChildWindow ) return; mpChildWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); - mxEventsIf.set( static_cast< ::cppu::OWeakObject* >( mpEvents = new MediaEventListenersImpl( *mpChildWindow.get() ) ) ); + mpEvents.reset(new MediaEventListenersImpl( *mpChildWindow.get() ) ); + mxEventsIf.set( static_cast< ::cppu::OWeakObject* >( mpEvents.get() ) ); if( mxPlayer.is() ) { diff --git a/avmedia/source/viewer/mediawindow_impl.hxx b/avmedia/source/viewer/mediawindow_impl.hxx index c1ba15c..2fcafc5 100644 --- a/avmedia/source/viewer/mediawindow_impl.hxx +++ b/avmedia/source/viewer/mediawindow_impl.hxx @@ -173,7 +173,7 @@ namespace avmedia MediaWindow* mpMediaWindow; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxEventsIf; - MediaEventListenersImpl* mpEvents; + boost::scoped_ptr<MediaEventListenersImpl> mpEvents; bool mbEventTransparent; boost::scoped_ptr<MediaChildWindow> mpChildWindow; MediaWindowControl* mpMediaWindowControl; commit dd1f8ac3575a929e71b39d5f7043be057ebaa727 Author: Zolnai Tamás <tamas.zol...@collabora.com> Date: Fri May 23 14:37:37 2014 +0200 CustomAnimationCreateDialog: select previously set misc animation Regression from 9695f38ca4ab26b40524f2eade98c45f0360131d. Change-Id: I8777fd8fa3e31c67b6645044d262fd4c5f645634 diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 7595837..78e8920 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -540,7 +540,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo // select current preset if available if( !rsPresetId.isEmpty() ) { - for( sal_uInt16 i = ENTRANCE; i <= MOTIONPATH; i++ ) + for( sal_uInt16 i = ENTRANCE; i <= MISCEFFECTS; i++ ) { if( mpTabPages[i]->select( rsPresetId ) ) {
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits