[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source

[Minh Ngo]

 avmedia/source/vlc/vlcframegrabber.cxx |    1 +
 avmedia/source/vlc/vlcframegrabber.hxx |    2 +-
 avmedia/source/vlc/vlcplayer.cxx       |    2 +-
 avmedia/source/vlc/vlcwindow.cxx       |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit b5f4002ec180c5b1e25d052461700d94fc2ccea1
Author: Minh Ngo <nlmin...@gmail.com>
Date:   Sat Jul 13 22:31:57 2013 +0300

    Fixing default frame size
    
    Change-Id: I82438768a8165f3ce5fdde03e89d2d2c9acc24c6

diff --git a/avmedia/source/vlc/vlcframegrabber.cxx 
b/avmedia/source/vlc/vlcframegrabber.cxx
index 5cf76ec..b8abf30 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -16,6 +16,7 @@ SAL_CALL VLCFrameGrabber::VLCFrameGrabber()
 
 ::uno::Reference< css::graphic::XGraphic > SAL_CALL 
VLCFrameGrabber::grabFrame( double fMediaTime )
 {
+    std::cout << __PRETTY_FUNCTION__ << std::endl;
     return ::uno::Reference< css::graphic::XGraphic >();
 }
 
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx 
b/avmedia/source/vlc/vlcframegrabber.hxx
index cb77e41..7d4d664 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -20,10 +20,10 @@
 #ifndef _VLCFRAMEGRABBER_HXX
 #define _VLCFRAMEGRABBER_HXX
 
-#include "vlccommon.hxx"
 #include <boost/noncopyable.hpp>
 #include <com/sun/star/media/XFrameGrabber.hpp>
 #include <cppuhelper/implbase2.hxx>
+#include "vlccommon.hxx"
 
 namespace avmedia {
 namespace vlc {
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index d94206c..f62b711 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -119,7 +119,7 @@ void SAL_CALL VLCPlayer::setMute( ::sal_Bool bSet )
 
 css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize()
 {
-    return css::awt::Size( 1, 1 );
+    return css::awt::Size( 480, 360 );
 }
 
 namespace
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 19f3791..e61398e 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -70,6 +70,7 @@ void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 
Y, sal_Int32 Width,
 awt::Rectangle SAL_CALL VLCWindow::getPosSize()
     throw (uno::RuntimeException)
 {
+    return awt::Rectangle();
 }
 
 void SAL_CALL VLCWindow::setVisible( sal_Bool Visible )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits