diff options
| author | Minh Ngo <nlminhtl@gmail.com> | 2013-07-06 22:01:24 +0300 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-26 10:50:20 +0100 |
| commit | 8c6b8a7ca42d8c103a0439d1d15eb6c68ebc5e43 (patch) | |
| tree | c572628b3ba7f38e20eb5345fe4570231d68e987 /avmedia | |
| parent | b9af45c1f21dde339df5e80676c414efd43d0aa2 (diff) | |
Build fix
Change-Id: I2db954ae56aacd023d7521c20db0e50b1a5b60e1
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/vlc/vlccommon.hxx | 1 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcplayer.cxx | 2 | ||||
| -rw-r--r-- | avmedia/source/vlc/vlcplayer.hxx | 8 |
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 ); |