diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:43:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:43:16 +0000 |
| commit | faa032bb1853fddd28e21f35c97058ed5fab9090 (patch) | |
| tree | 92a16f7c2b492c981541ab603a842e0a50a833d4 /avmedia | |
| parent | c2c1221c9643ea6cb2dfe16f915d2edb7fb8e5fe (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.7.12); FILE MERGED
2007/11/02 13:55:23 pl 1.7.12.2: #i82234# add some file types
2007/10/05 03:13:48 msicotte 1.7.12.1: #i82234# inital commit of new files and changes for Mac Os X QuickTime integration
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index 7a0480c2ce6a..64fd870f760d 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: mediawindow.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2007-06-27 22:24:05 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:43:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -385,7 +385,8 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) "CD Audio", "cda", "MIDI Audio", "mid;midi", "MPEG Audio", "mp2;mp3;mpa", - "MPEG Video", "mpg;mpeg;mpv", + "MPEG Video", "mpg;mpeg;mpv;mp4", + "Ogg bitstream", "ogg", "Quicktime Video", "mov", "Vivo Video", "viv", "WAVE Audio", "wav" }; @@ -484,6 +485,8 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr { try { + fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME); + uno::Reference< ::com::sun::star::media::XManager > xManager( xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ), uno::UNO_QUERY ); |