summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-23 11:31:41 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-23 11:31:41 +0000
commit856e757aeebf4e6d7e04f676869a286c9df2f1f1 (patch)
treec1deffb77009fc7cc35c24799a37f77e4a4275ea /avmedia
parent63d0263506af3d3da3cefbea8339481664b82187 (diff)
INTEGRATION: CWS jmf5 (1.1.1.1.20); FILE MERGED
2005/01/19 14:36:16 ka 1.1.1.1.20.1: #i37255#: added FrameGrabber
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/win/window.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx
index e40abfdcc799..c3f499387088 100644
--- a/avmedia/source/win/window.cxx
+++ b/avmedia/source/win/window.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: window.cxx,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:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -210,7 +210,8 @@ WNDCLASS* Window::mpWndClass = NULL;
// ------------------------------------------------------------------------------
-Window::Window( Player& rPlayer ) :
+Window::Window( const uno::Reference< lang::XMultiServiceFactory >& rxMgr, Player& rPlayer ) :
+ mxMgr( rxMgr ),
mrPlayer( rPlayer ),
meZoomLevel( media::ZoomLevel_NOT_AVAILABLE ),
mnParentWnd( 0 ),