summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Ngo <nlminhtl@gmail.com>2013-07-13 22:31:57 +0300
committerMinh Ngo <nlminhtl@gmail.com>2013-07-13 22:31:57 +0300
commitb5f4002ec180c5b1e25d052461700d94fc2ccea1 (patch)
treef943172ae68c6308290b169a1615e816ab7bcf66
parente963770ca687b9761b8bc803cb13e57e2afc3085 (diff)
Fixing default frame size
Change-Id: I82438768a8165f3ce5fdde03e89d2d2c9acc24c6
-rw-r--r--avmedia/source/vlc/vlcframegrabber.cxx1
-rw-r--r--avmedia/source/vlc/vlcframegrabber.hxx2
-rw-r--r--avmedia/source/vlc/vlcplayer.cxx2
-rw-r--r--avmedia/source/vlc/vlcwindow.cxx1
4 files changed, 4 insertions, 2 deletions
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx
index 5cf76ec94088..b8abf30cd828 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 cb77e41c06c4..7d4d6647a92c 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 d94206c3fabe..f62b71180474 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 19f3791ceac5..e61398e75a61 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 )