[ooo-build-commit] .: patches/dev300
Radek DoulÃk
rodo at kemper.freedesktop.org
Tue May 25 02:41:17 PDT 2010
patches/dev300/apply | 2
patches/dev300/slideshow-sound.diff | 123 ++++++++++++++----------------------
2 files changed, 50 insertions(+), 75 deletions(-)
New commits:
commit e86b841a82d9613701d52252f9a670f287590931
Author: Radek Doulik <rodo at novell.com>
Date: Tue May 25 11:40:35 2010 +0200
updated and reanabled patch for m77
* patches/dev300/apply:
* patches/dev300/slideshow-sound.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 669635a..6ef0066 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3647,7 +3647,7 @@ transogl-crossplatform.diff, ericb
[ Fixes ]
# FIXME dev300-m77 svx-sound.diff, n#515553, rodo #depends on cws-impressmedia01-backport.diff
# FIXME dev300-m77 sd-sound.diff, n#515553, rodo #depends on svx-sound.diff
-# FIXME dev300-m77 slideshow-sound.diff, n#515553, rodo #update
+slideshow-sound.diff, n#515553, rodo
sd-avoid-looping-fix.diff, thorsten
svx-validate-paradepth.diff, thorsten
vcl-pngread-greypalette-fix.diff, thorsten
diff --git a/patches/dev300/slideshow-sound.diff b/patches/dev300/slideshow-sound.diff
index 7e54cf8..2cb45f4 100644
--- a/patches/dev300/slideshow-sound.diff
+++ b/patches/dev300/slideshow-sound.diff
@@ -1,22 +1,6 @@
-From a9cacbaaf939e53226803fcb8bc33c39263e7643 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:08:55 +0200
-Subject: [PATCH 841/878] slideshow-sound.diff
-
----
- slideshow/source/engine/shapes/mediashape.cxx | 26 ++++++++--
- slideshow/source/engine/slide/layermanager.cxx | 22 +++++++++
- slideshow/source/engine/slide/layermanager.hxx | 4 ++
- slideshow/source/engine/slide/slideimpl.cxx | 23 +++++++++
- slideshow/source/engine/slideshowimpl.cxx | 61 ++++++++++++++++++++++-
- slideshow/source/inc/shape.hxx | 10 ++++
- slideshow/source/inc/slide.hxx | 3 +
- 7 files changed, 141 insertions(+), 8 deletions(-)
-
-diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
-index b872c35..d80d10b 100644
---- a/slideshow/source/engine/shapes/mediashape.cxx
-+++ b/slideshow/source/engine/shapes/mediashape.cxx
+diff -rup slideshow-orig/source/engine/shapes/mediashape.cxx slideshow/source/engine/shapes/mediashape.cxx
+--- slideshow-orig/source/engine/shapes/mediashape.cxx 2010-05-25 11:35:23.000000000 +0200
++++ slideshow/source/engine/shapes/mediashape.cxx 2010-05-25 11:35:49.000000000 +0200
@@ -98,6 +98,8 @@ namespace slideshow
virtual bool implIsIntrinsicAnimationPlaying() const;
virtual void implSetIntrinsicAnimationTime(double);
@@ -72,10 +56,9 @@ index b872c35..d80d10b 100644
return true;
}
-diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
-index bbf1124..ba449f3 100644
---- a/slideshow/source/engine/slide/layermanager.cxx
-+++ b/slideshow/source/engine/slide/layermanager.cxx
+diff -rup slideshow-orig/source/engine/slide/layermanager.cxx slideshow/source/engine/slide/layermanager.cxx
+--- slideshow-orig/source/engine/slide/layermanager.cxx 2010-05-25 11:35:23.000000000 +0200
++++ slideshow/source/engine/slide/layermanager.cxx 2010-05-25 11:35:49.000000000 +0200
@@ -292,6 +292,28 @@ namespace slideshow
implAddShape( rShape );
}
@@ -105,10 +88,9 @@ index bbf1124..ba449f3 100644
void LayerManager::putShape2BackgroundLayer( LayerShapeMap::value_type& rShapeEntry )
{
LayerSharedPtr& rBgLayer( maLayers.front() );
-diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
-index e6bfb53..cdfe9ec 100644
---- a/slideshow/source/engine/slide/layermanager.hxx
-+++ b/slideshow/source/engine/slide/layermanager.hxx
+diff -rup slideshow-orig/source/engine/slide/layermanager.hxx slideshow/source/engine/slide/layermanager.hxx
+--- slideshow-orig/source/engine/slide/layermanager.hxx 2010-05-25 11:35:23.000000000 +0200
++++ slideshow/source/engine/slide/layermanager.hxx 2010-05-25 11:35:49.000000000 +0200
@@ -144,6 +144,10 @@ namespace slideshow
ShapeSharedPtr lookupShape( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape ) const;
@@ -120,11 +102,10 @@ index e6bfb53..cdfe9ec 100644
/** Query a subset of the given original shape
This method queries a new (but not necessarily unique)
-diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
-index f8ca942..54fde66 100644
---- a/slideshow/source/engine/slide/slideimpl.cxx
-+++ b/slideshow/source/engine/slide/slideimpl.cxx
-@@ -139,6 +139,7 @@ public:
+diff -rup slideshow-orig/source/engine/slide/slideimpl.cxx slideshow/source/engine/slide/slideimpl.cxx
+--- slideshow-orig/source/engine/slide/slideimpl.cxx 2010-05-25 11:35:23.000000000 +0200
++++ slideshow/source/engine/slide/slideimpl.cxx 2010-05-25 11:35:49.000000000 +0200
+@@ -144,6 +144,7 @@ public:
// but on canvas-independent basegfx bitmaps
virtual SlideBitmapSharedPtr getCurrentSlideBitmap( const UnoViewSharedPtr& rView ) const;
@@ -132,7 +113,7 @@ index f8ca942..54fde66 100644
private:
// ViewEventHandler
-@@ -1209,5 +1210,27 @@ SlideSharedPtr createSlide( const uno::Reference< drawing::XDrawPage >& xDrawP
+@@ -1279,5 +1280,27 @@ SlideSharedPtr createSlide( const uno::R
return pRet;
}
@@ -160,38 +141,37 @@ index f8ca942..54fde66 100644
+
} // namespace internal
} // namespace slideshow
-diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
-index 661f8c0..fdb7f98 100644
---- a/slideshow/source/engine/slideshowimpl.cxx
-+++ b/slideshow/source/engine/slideshowimpl.cxx
-@@ -338,6 +338,8 @@ private:
- private: SlideShowImpl& mrSlideShowImpl;
- };
+diff -rup slideshow-orig/source/engine/slideshowimpl.cxx slideshow/source/engine/slideshowimpl.cxx
+--- slideshow-orig/source/engine/slideshowimpl.cxx 2010-05-25 11:35:23.000000000 +0200
++++ slideshow/source/engine/slideshowimpl.cxx 2010-05-25 11:37:36.000000000 +0200
+@@ -344,6 +344,8 @@ private:
+ uno::Reference<drawing::XShape> const& xShape, sal_Int16 nPointerShape )
+ throw (uno::RuntimeException);
+ // update persistent media shapes after current slide changes
+ void updateMediaShapes();
- /// Filter requested cursor shape against hard slideshow cursors (wait, etc.)
- sal_Int16 calcActiveCursor( sal_Int16 nCursorShape ) const;
-@@ -363,6 +365,7 @@ private:
- boost::optional<double> maUserPaintStrokeWidth;
-
+ // CursorManager
+ // -----------------------------------------------------------
+@@ -468,6 +470,7 @@ private:
+ //end changed
+
boost::shared_ptr<canvas::tools::ElapsedTime> mpPresTimer;
+ boost::shared_ptr<canvas::tools::ElapsedTime> mpAdvanceTimer;
ScreenUpdater maScreenUpdater;
EventQueue maEventQueue;
EventMultiplexer maEventMultiplexer;
-@@ -406,6 +409,9 @@ private:
- bool mbDisableAnimationZOrder;
+@@ -514,6 +517,9 @@ private:
EffectRewinder maEffectRewinder;
+ FrameSynchronization maFrameSynchronization;
+
+ // list of persisten media shapes
+ ShapeList maMediaShapes;
};
-@@ -478,6 +484,7 @@ SlideShowImpl::SlideShowImpl(
+@@ -590,6 +596,7 @@ SlideShowImpl::SlideShowImpl(
maUserPaintColor(),
maUserPaintStrokeWidth(4.0),
mpPresTimer( new canvas::tools::ElapsedTime ),
@@ -199,17 +179,17 @@ index 661f8c0..fdb7f98 100644
maScreenUpdater(maViewContainer),
maEventQueue( mpPresTimer ),
maEventMultiplexer( maEventQueue,
-@@ -549,6 +556,9 @@ void SlideShowImpl::disposing()
+@@ -664,6 +671,9 @@ void SlideShowImpl::disposing()
maEffectRewinder.dispose();
-
+
+ // drop all references to persistent media shapes
+ maMediaShapes.clear();
+
// stop slide transition sound, if any:
stopSlideTransitionSound();
-@@ -947,6 +957,33 @@ private:
+@@ -1095,6 +1105,33 @@ private:
bool& mrbSkipSlideTransition;
};
@@ -242,8 +222,8 @@ index 661f8c0..fdb7f98 100644
+
void SlideShowImpl::displaySlide(
uno::Reference<drawing::XDrawPage> const& xSlide,
- uno::Reference<animations::XAnimationNode> const& xRootNode,
-@@ -989,6 +1026,8 @@ void SlideShowImpl::displaySlide(
+ uno::Reference<drawing::XDrawPagesSupplier> const& xDrawPages,
+@@ -1144,6 +1181,8 @@ void SlideShowImpl::displaySlide(
mpPreviousSlide = mpCurrentSlide;
mpCurrentSlide.reset();
@@ -252,7 +232,7 @@ index 661f8c0..fdb7f98 100644
if (matches( mpPrefetchSlide, xSlide, xRootNode ))
{
// prefetched slide matches:
-@@ -1002,6 +1041,8 @@ void SlideShowImpl::displaySlide(
+@@ -1155,6 +1194,8 @@ void SlideShowImpl::displaySlide(
OSL_ASSERT( mpCurrentSlide );
if (mpCurrentSlide)
{
@@ -261,7 +241,7 @@ index 661f8c0..fdb7f98 100644
basegfx::B2DSize oldSlideSize;
if( mpPreviousSlide )
oldSlideSize = mpPreviousSlide->getSlideSize();
-@@ -1832,6 +1873,8 @@ void SlideShowImpl::notifySlideTransitionEnded( bool bPaintSlide )
+@@ -2212,6 +2253,8 @@ void SlideShowImpl::notifySlideTransitio
"notifySlideTransitionEnded(): Invalid current slide" );
if (mpCurrentSlide)
{
@@ -270,7 +250,7 @@ index 661f8c0..fdb7f98 100644
// first init show, to give the animations
// the chance to register SlideStartEvents
const bool bBackgroundLayerRendered( !bPaintSlide );
-@@ -1842,7 +1885,8 @@ void SlideShowImpl::notifySlideTransitionEnded( bool bPaintSlide )
+@@ -2222,7 +2265,8 @@ void SlideShowImpl::notifySlideTransitio
void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xDrawPage,
double& nAutomaticNextSlideTimeout,
@@ -280,7 +260,7 @@ index 661f8c0..fdb7f98 100644
{
// retrieve slide change parameters from XDrawPage
// ===============================================
-@@ -1862,7 +1906,8 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
+@@ -2242,7 +2286,8 @@ void queryAutomaticSlideTransition( uno:
"Could not extract slide change mode from XDrawPage - assuming <none>\n" );
}
@@ -290,7 +270,7 @@ index 661f8c0..fdb7f98 100644
if( !xPropSet.is() ||
!getPropertyValue( nAutomaticNextSlideTimeout,
-@@ -1904,10 +1949,12 @@ void SlideShowImpl::notifySlideAnimationsEnded()
+@@ -2287,10 +2332,12 @@ void SlideShowImpl::notifySlideAnimation
"notifySlideAnimationsEnded(): Invalid current slide!" );
bool bHasAutomaticNextSlide=false;
@@ -304,7 +284,7 @@ index 661f8c0..fdb7f98 100644
// check whether slide transition should happen
// 'automatically'. If yes, simply schedule the
-@@ -1919,6 +1966,14 @@ void SlideShowImpl::notifySlideAnimationsEnded()
+@@ -2302,6 +2349,14 @@ void SlideShowImpl::notifySlideAnimation
!mpRehearseTimingsActivity &&
bHasAutomaticNextSlide )
{
@@ -319,10 +299,9 @@ index 661f8c0..fdb7f98 100644
aNotificationEvents = makeInterruptableDelay(
boost::bind<void>( boost::mem_fn(&SlideShowImpl::notifySlideEnded), this, false ),
nAutomaticNextSlideTimeout);
-diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
-index 68f6384..15a1c09 100644
---- a/slideshow/source/inc/shape.hxx
-+++ b/slideshow/source/inc/shape.hxx
+diff -rup slideshow-orig/source/inc/shape.hxx slideshow/source/inc/shape.hxx
+--- slideshow-orig/source/inc/shape.hxx 2010-05-25 11:35:23.000000000 +0200
++++ slideshow/source/inc/shape.hxx 2010-05-25 11:35:49.000000000 +0200
@@ -38,6 +38,7 @@
#include <boost/shared_ptr.hpp>
@@ -347,10 +326,9 @@ index 68f6384..15a1c09 100644
/** Represents a slide's shape object.
This interface represents the view-independent aspects of a
-diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
-index 1e14df0..ef0c2c1 100644
---- a/slideshow/source/inc/slide.hxx
-+++ b/slideshow/source/inc/slide.hxx
+diff -rup slideshow-orig/source/inc/slide.hxx slideshow/source/inc/slide.hxx
+--- slideshow-orig/source/inc/slide.hxx 2010-05-25 11:35:23.000000000 +0200
++++ slideshow/source/inc/slide.hxx 2010-05-25 11:35:49.000000000 +0200
@@ -32,6 +32,7 @@
#include "subsettableshapemanager.hxx"
#include "unoviewcontainer.hxx"
@@ -359,15 +337,12 @@ index 1e14df0..ef0c2c1 100644
#include "shapemaps.hxx"
#include <boost/shared_ptr.hpp>
-@@ -114,6 +115,8 @@ namespace slideshow
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::animations::XAnimationNode > getXAnimationNode() const = 0;
+@@ -97,6 +98,8 @@ namespace slideshow
+ */
+ virtual void hide() = 0;
+ // get persistent media shapes
+ virtual void findPersistentMediaShapes( ShapeList& rList ) = 0;
- // Slide bitmaps
+ // Queries
// -------------------------------------------------------------------
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list