[Libreoffice-commits] .: 7 commits - avmedia/source officecfg/registry
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Apr 1 04:09:54 PDT 2011
avmedia/source/gstreamer/avmediagst.component | 34 ----------
avmedia/source/gstreamer/avmediagstreamer.component | 2
avmedia/source/gstreamer/gstplayer.cxx | 20 ++++-
avmedia/source/gstreamer/makefile.mk | 2
avmedia/source/viewer/mediawindow.cxx | 32 ++++-----
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 2
6 files changed, 33 insertions(+), 59 deletions(-)
New commits:
commit 44b8b7d0ba523f716fbb2d011b74ebe92213ad88
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 1 12:06:38 2011 +0100
WaE: use SAL_PRIdINT64
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 042f124..0368c0b 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -380,7 +380,7 @@ void SAL_CALL Player::setMediaTime( double fTime )
if( !isPlaying() )
gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
- DBG( "seek to: %lld ns original: %lf s", gst_position, fTime );
+ DBG( "seek to: %"SAL_PRIdINT64" ns original: %lf s", gst_position, fTime );
}
}
commit 3ff8ca36e5a05610cc022e50598bd633521c9294
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 1 12:06:05 2011 +0100
fix up post-merge to actually work again
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 227f1ec..042f124 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -28,9 +28,11 @@
#include <math.h>
-#ifndef __RTL_USTRING_
#include <rtl/string.hxx>
-#endif
+
+#include <vcl/syschild.hxx>
+#include <vcl/sysdata.hxx>
+
#include "gstplayer.hxx"
#include "gstframegrabber.hxx"
@@ -573,9 +575,15 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co
xRet = pWindow;
- if( rArguments.getLength() > 2 ) {
- rArguments[ 2 ] >>= mnWindowID;
- DBG( "window ID: %ld", mnWindowID );
+ if( rArguments.getLength() > 2 )
+ {
+ sal_IntPtr pIntPtr = 0;
+ rArguments[ 2 ] >>= pIntPtr;
+ SystemChildWindow *pParentWindow = reinterpret_cast< SystemChildWindow* >( pIntPtr );
+ const SystemEnvData* pEnvData = pParentWindow ? pParentWindow->GetSystemData() : NULL;
+ OSL_ASSERT(pEnvData);
+ if (pEnvData)
+ mnWindowID = pEnvData->aWindow;
}
}
diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk
index 692a63a..0bea133 100755
--- a/avmedia/source/gstreamer/makefile.mk
+++ b/avmedia/source/gstreamer/makefile.mk
@@ -62,7 +62,7 @@ EXCEPTIONSFILES= \
$(SLO)$/gstuno.obj \
SHL1TARGET=$(TARGET)
-SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB)
+SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB) $(VCLLIB)
SHL1IMPLIB=i$(TARGET)
SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
commit 8ea65044ffc090f36fad233be7daf0df89f0ff3f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 1 10:44:03 2011 +0100
fix video, implementation name was wrong
diff --git a/avmedia/source/gstreamer/avmediagstreamer.component b/avmedia/source/gstreamer/avmediagstreamer.component
index 97a8c83..cd25a6b 100644
--- a/avmedia/source/gstreamer/avmediagstreamer.component
+++ b/avmedia/source/gstreamer/avmediagstreamer.component
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component loader="com.sun.star.loader.SharedLibrary" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.avmedia.Manager_GStreamer">
+ <implementation name="com.sun.star.comp.media.Manager_GStreamer">
<service name="com.sun.star.media.Manager_GStreamer"/>
</implementation>
</component>
commit f6b8a122d7065585168fb22c9b8a698bec8a02a5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 1 10:43:21 2011 +0100
remove the confusing Oracle avmediagst.component
diff --git a/avmedia/source/gstreamer/avmediagst.component b/avmedia/source/gstreamer/avmediagst.component
deleted file mode 100755
index 75d39d2..0000000
--- a/avmedia/source/gstreamer/avmediagst.component
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--**********************************************************************
-*
-* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
-* Copyright 2000, 2010 Oracle and/or its affiliates.
-*
-* OpenOffice.org - a multi-platform office productivity suite
-*
-* This file is part of OpenOffice.org.
-*
-* OpenOffice.org is free software: you can redistribute it and/or modify
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU Lesser General Public License version 3 for more details
-* (a copy is included in the LICENSE file that accompanied this code).
-*
-* You should have received a copy of the GNU Lesser General Public License
-* version 3 along with OpenOffice.org. If not, see
-* <http://www.openoffice.org/license.html>
-* for a copy of the LGPLv3 License.
-*
-**********************************************************************-->
-
-<component loader="com.sun.star.loader.SharedLibrary"
- xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.avmedia.Manager_GStreamer">
- <service name="com.sun.star.media.Manager_GStreamer"/>
- </implementation>
-</component>
commit 06e158d0f265f6121e3fa607dbc735a6ba9f2e4c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 1 10:06:58 2011 +0100
fix typos
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 9d77147..3137b14 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -382,7 +382,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
"WAVE Audio", "wav",
"WebM Video", "webm" };
- for( size_t i = 0; i < SAL_N_ELEMENT(pFIlters); i += 2 )
+ for( size_t i = 0; i < SAL_N_ELEMENTS(pFilters); i += 2 )
{
rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
::rtl::OUString::createFromAscii(pFilters[i]),
commit 823ed03d02421dd9d66d656abba7bfa479a0d82f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 1 10:06:41 2011 +0100
add ... to Movie and Sound to indicate another dialog will appear
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 6193ae4..eec4ff3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5362,7 +5362,7 @@
</node>
<node oor:name=".uno:InsertAVMedia" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Mo~vie and Sound</value>
+ <value xml:lang="en-US">Mo~vie and Sound...</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
commit 5aea964e1e94b72f22d62370bdad134523d30908
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Apr 1 09:38:38 2011 +0100
add in .webm suffix for jrb
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 1bec510..9d77147 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -367,22 +367,22 @@ Window* MediaWindow::getWindow() const
void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector )
{
- static const char* pFilters[] = { "AIF Audio", "aif;aiff",
- "AU Audio", "au",
- "AVI", "avi",
- "CD Audio", "cda",
- "FLAC Audio", "flac",
- "Matroska Media", "mkv",
- "MIDI Audio", "mid;midi",
- "MPEG Audio", "mp2;mp3;mpa",
- "MPEG Video", "mpg;mpeg;mpv;mp4",
- "Ogg bitstream", "ogg",
- "Quicktime Video", "mov",
- "Vivo Video", "viv",
- "WAVE Audio", "wav" };
-
- unsigned int i;
- for( i = 0; i < ( sizeof( pFilters ) / sizeof( char* ) ); i += 2 )
+ static const char* pFilters[] = { "AIF Audio", "aif;aiff",
+ "AU Audio", "au",
+ "AVI", "avi",
+ "CD Audio", "cda",
+ "FLAC Audio", "flac",
+ "Matroska Media", "mkv",
+ "MIDI Audio", "mid;midi",
+ "MPEG Audio", "mp2;mp3;mpa",
+ "MPEG Video", "mpg;mpeg;mpv;mp4",
+ "Ogg bitstream", "ogg",
+ "Quicktime Video", "mov",
+ "Vivo Video", "viv",
+ "WAVE Audio", "wav",
+ "WebM Video", "webm" };
+
+ for( size_t i = 0; i < SAL_N_ELEMENT(pFIlters); i += 2 )
{
rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >(
::rtl::OUString::createFromAscii(pFilters[i]),
More information about the Libreoffice-commits
mailing list