summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-23 11:31:53 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-23 11:31:53 +0000
commit4ca7d3f2a8bed6d1099ce4c1e0fae2204d37b863 (patch)
tree14008818643eb0458d056e004c58f219932524f6 /avmedia
parent856e757aeebf4e6d7e04f676869a286c9df2f1f1 (diff)
INTEGRATION: CWS jmf5 (1.1.1.1.20); FILE MERGED
2005/01/19 14:36:17 ka 1.1.1.1.20.1: #i37255#: added FrameGrabber
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/win/window.hxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 0c8599a7725d..d2bc90fee772 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: window.hxx,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: ka $ $Date: 2004-08-23 09:04:41 $
+ * last change: $Author: vg $ $Date: 2005-03-23 12:31:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -84,7 +84,8 @@ class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayer
{
public:
- Window( Player& rPlayer );
+ Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr,
+ Player& rPlayer );
~Window();
bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
@@ -137,6 +138,8 @@ public:
private:
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
+
::osl::Mutex maMutex;
::cppu::OMultiTypeInterfaceContainerHelper maListeners;
::com::sun::star::media::ZoomLevel meZoomLevel;