avmedia/source/vlc/vlccommon.hxx | 2
avmedia/source/vlc/vlcmanager.cxx | 2
avmedia/source/vlc/vlcplayer.cxx | 19 ++++++++
avmedia/source/vlc/vlcplayer.hxx | 9 +++-
avmedia/source/vlc/vlcwindow.cpp | 82 +++++++++++++++++++++++++++++++++++++-
avmedia/source/vlc/vlcwindow.hxx | 22 ++++++++++
6 files changed, 130 insertions(+), 6 deletions(-)
New commits:
commit 9fef11b4527fd5156522c4fd5beae54274ef64a7
Author: Minh Ngo <nlmin...@gmail.com>
Date: Tue Jun 25 00:06:34 2013 +0300
Fixing source for building
Change-Id: I0470684c8e2f043e891a58e11f498706c9a7a7f6
diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index 62551d0..e9cc864 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -19,8 +19,6 @@
#ifndef _VLCCOMMON_HXX
#define _VLCCOMMON_HXX
-//TODO: Remove it before committing
-#define SAL_CALL
#include <vlc/libvlc.h>
diff --git a/avmedia/source/vlc/vlcmanager.cxx
b/avmedia/source/vlc/vlcmanager.cxx
index 5286eb6..18681de 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -20,7 +20,7 @@ Manager::~Manager()
uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const
rtl::OUString& rURL )
throw (uno::RuntimeException)
{
- VLCPlayer* pPlayer( new VLCPlayer( mxMgr ) );
+ VLCPlayer* pPlayer( new VLCPlayer( /* mxMgr */ ) );
uno::Reference< media::XPlayer > xRet( pPlayer );
return xRet;
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 24375ad..647ec67 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -15,7 +15,8 @@ const char * const VLC_ARGS[] = {
};
VLCPlayer::VLCPlayer()
- : mInstance( libvlc_new( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ),
VLC_ARGS ), libvlc_release )
+ : VLC_Base(m_aMutex)
+ , mInstance( libvlc_new( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ),
VLC_ARGS ), libvlc_release )
, mPlayer( libvlc_media_player_new(mInstance.get()),
libvlc_media_player_release )
{
}
@@ -106,12 +107,28 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL
VLCPlayer::createPlayerWind
::osl::MutexGuard aGuard(m_aMutex);
return uno::Reference< css::media::XPlayerWindow >(new VLCWindow());
}
+
uno::Reference< css::media::XFrameGrabber > SAL_CALL
VLCPlayer::createFrameGrabber()
{
::osl::MutexGuard aGuard(m_aMutex);
return uno::Reference< css::media::XFrameGrabber >();
}
+::rtl::OUString SAL_CALL VLCPlayer::getImplementationName()
+{
+ return ::rtl::OUString();
+}
+
+::sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString&
ServiceName )
+{
+ return false;
+}
+
+::uno::Sequence< ::rtl::OUString > SAL_CALL
VLCPlayer::getSupportedServiceNames()
+{
+ return ::uno::Sequence< ::rtl::OUString >();
+}
+
}
}
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index ee1ebba..da1673a 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -20,10 +20,13 @@
#ifndef _VLCPLAYER_HXX
#define _VLCPLAYER_HXX
+#include "vlccommon.hxx"
#include <vlc/vlc.h>
+#include <boost/shared_ptr.hpp>
+#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/media/XPlayer.hpp>
#include <cppuhelper/basemutex.hxx>
-#include "vlccommon.hxx"
+
namespace avmedia {
namespace vlc {
@@ -55,6 +58,10 @@ public:
css::awt::Size SAL_CALL getPreferredPlayerWindowSize();
::com::sun::star::uno::Reference< css::media::XPlayerWindow > SAL_CALL
createPlayerWindow( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& aArguments );
::com::sun::star::uno::Reference< css::media::XFrameGrabber > SAL_CALL
createFrameGrabber();
+
+ ::rtl::OUString SAL_CALL getImplementationName();
+ ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName );
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames();
};
}
diff --git a/avmedia/source/vlc/vlcwindow.cpp b/avmedia/source/vlc/vlcwindow.cpp
index 77656eb..c92dd7a 100644
--- a/avmedia/source/vlc/vlcwindow.cpp
+++ b/avmedia/source/vlc/vlcwindow.cpp
@@ -1,6 +1,6 @@
#include "vlcwindow.hxx"
-using namespace ::com::sun::star;
+using namespace ;
namespace avmedia {
namespace vlc {
@@ -38,5 +38,85 @@ void SAL_CALL VLCWindow::setPointerType( ::sal_Int32
SystemPointerType )
return ::uno::Sequence< ::rtl::OUString >();
}
+void SAL_CALL VLCWindow::dispose() throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addEventListener( const ::uno::Reference<
::lang::XEventListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removeEventListener( const ::uno::Reference<
:::lang::XEventListener >& aListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32
Width, sal_Int32 Height, sal_Int16 Flags ) throw (::uno::RuntimeException)
+{
+}
+
+::awt::Rectangle SAL_CALL VLCWindow::getPosSize() throw
(::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::setVisible( sal_Bool Visible ) throw
(::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::setEnable( sal_Bool Enable ) throw
(::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::setFocus() throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addWindowListener( const ::uno::Reference<
::awt::XWindowListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removeWindowListener( const ::uno::Reference<
::awt::XWindowListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addFocusListener( const ::uno::Reference<
::awt::XFocusListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removeFocusListener( const ::uno::Reference<
::awt::XFocusListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addKeyListener( const ::uno::Reference<
::awt::XKeyListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removeKeyListener( const ::uno::Reference<
::awt::XKeyListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addMouseListener( const ::uno::Reference<
::awt::XMouseListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removeMouseListener( const ::uno::Reference<
::awt::XMouseListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addMouseMotionListener( const ::uno::Reference<
::awt::XMouseMotionListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removeMouseMotionListener( const ::uno::Reference<
::awt::XMouseMotionListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::addPaintListener( const ::uno::Reference<
::awt::XPaintListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
+void SAL_CALL VLCWindow::removePaintListener( const ::uno::Reference<
::awt::XPaintListener >& xListener ) throw (::uno::RuntimeException)
+{
+}
+
}
}
\ No newline at end of file
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 3c4afcb..7b05535 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -36,6 +36,28 @@ public:
::rtl::OUString SAL_CALL getImplementationName();
::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName );
::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
getSupportedServiceNames();
+
+ void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener >& aListener ) throw
(::com::sun::star::uno::RuntimeException);
+
+ void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width,
sal_Int32 Height, sal_Int16 Flags ) throw
(::com::sun::star::uno::RuntimeException);
+ ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL setVisible( sal_Bool Visible ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL setEnable( sal_Bool Enable ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL setFocus() throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeWindowListener( const
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >&
xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XFocusListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XFocusListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XKeyListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XKeyListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XMouseListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XMouseListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addMouseMotionListener( const
::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener
>& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removeMouseMotionListener( const
::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener
>& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XPaintListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XPaintListener >& xListener ) throw
(::com::sun::star::uno::RuntimeException);
};
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
