summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Ngo <nlminhtl@gmail.com>2013-07-06 22:01:24 +0300
committerMichael Meeks <michael.meeks@suse.com>2013-07-26 07:11:49 +0100
commite11c9a74d15728d49aef3632369796b50fbcd625 (patch)
treecdcde28fe4e1670e901cb913aabd61572496788b
parent3bdb5659cdec1ddae9aceaab47c7bd6267cd7197 (diff)
Build fix
Change-Id: I2db954ae56aacd023d7521c20db0e50b1a5b60e1
-rw-r--r--avmedia/source/vlc/vlccommon.hxx1
-rw-r--r--avmedia/source/vlc/vlcplayer.cxx2
-rw-r--r--avmedia/source/vlc/vlcplayer.hxx8
3 files changed, 6 insertions, 5 deletions
diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index efc022fdd3b2..6b8e2caa487f 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -21,6 +21,7 @@
#define _VLCCOMMON_HXX
#include <vlc/libvlc.h>
+#include <vlc/libvlc_media.h>
#include <osl/mutex.hxx>
#include <tools/stream.hxx>
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 12133c1b45ff..a8eda3e87aff 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -20,7 +20,7 @@ const char * const VLC_ARGS[] = {
namespace
{
- libvlc_media_t* initMedia( const rtl::OUString& url, boost::scoped_ptr<libvlc_instance_t>& instance)
+ libvlc_media_t* initMedia( const rtl::OUString& url, boost::shared_ptr<libvlc_instance_t>& instance )
{
rtl::OString dest;
url.convertToString(&dest, RTL_TEXTENCODING_UTF8, 0);
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index c56959415521..7417060f56a9 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -22,7 +22,7 @@
#include "vlccommon.hxx"
#include <vlc/vlc.h>
-#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
#include <cppuhelper/compbase2.hxx>
#include <com/sun/star/media/XPlayer.hpp>
#include <cppuhelper/basemutex.hxx>
@@ -37,9 +37,9 @@ typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::media::XPlayer,
class VLCPlayer : public ::cppu::BaseMutex,
public VLC_Base
{
- boost::scoped_ptr<libvlc_instance_t> mInstance;
- boost::scoped_ptr<libvlc_media_player_t> mPlayer;
- boost::scoped_ptr<libvlc_media_t> mMedia;
+ boost::shared_ptr<libvlc_instance_t> mInstance;
+ boost::shared_ptr<libvlc_media_player_t> mPlayer;
+ boost::shared_ptr<libvlc_media_t> mMedia;
public:
VLCPlayer( const rtl::OUString& url );