avmedia/source/vlc/vlccommon.hxx | 1 + avmedia/source/vlc/vlcplayer.cxx | 2 +- avmedia/source/vlc/vlcplayer.hxx | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-)
New commits: commit e41e4b6ecca066efb62952580b00955c53eab26c Author: Minh Ngo <nlmin...@gmail.com> Date: Sat Jul 6 22:01:24 2013 +0300 Build fix Change-Id: I2db954ae56aacd023d7521c20db0e50b1a5b60e1 diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx index efc022f..6b8e2ca 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 12133c1..a8eda3e 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 c569594..7417060 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 ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits