diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-07-31 21:31:33 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-31 21:31:33 +0200 |
| commit | 701cfbd696a8bbea9296de0b32bb80b007c04496 (patch) | |
| tree | 4b1d64adafb13d79ce73d38b69415cfcb533e464 /avmedia | |
| parent | 9e90038b73b84e622e20145ac56c642996e658e9 (diff) | |
avmedia: replace boost::function with std::function
Change-Id: I813d42a1ab494e0887791516606fddd342e21ff0
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/vlc/wrapper/EventHandler.hxx | 5 | ||||
| -rw-r--r-- | avmedia/source/vlc/wrapper/EventManager.hxx | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/avmedia/source/vlc/wrapper/EventHandler.hxx b/avmedia/source/vlc/wrapper/EventHandler.hxx index 37272c2ea2ad..536d80b2b90b 100644 --- a/avmedia/source/vlc/wrapper/EventHandler.hxx +++ b/avmedia/source/vlc/wrapper/EventHandler.hxx @@ -9,7 +9,8 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX -#include <boost/function.hpp> + +#include <functional> #include <boost/noncopyable.hpp> #include <salhelper/thread.hxx> #include "ThreadsafeQueue.hxx" @@ -30,7 +31,7 @@ namespace wrapper virtual void SAL_CALL run() SAL_OVERRIDE; public: - typedef boost::function< void() > TCallback; + typedef std::function< void() > TCallback; ThreadsafeQueue< TCallback > mCallbackQueue; }; } diff --git a/avmedia/source/vlc/wrapper/EventManager.hxx b/avmedia/source/vlc/wrapper/EventManager.hxx index 8ee2eb6fe17f..624b798daf1e 100644 --- a/avmedia/source/vlc/wrapper/EventManager.hxx +++ b/avmedia/source/vlc/wrapper/EventManager.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX #define INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX -#include <boost/function.hpp> +#include <functional> #include <boost/noncopyable.hpp> #include "Player.hxx" @@ -29,7 +29,7 @@ namespace wrapper public: static bool LoadSymbols(); - typedef boost::function<void()> Callback; + typedef std::function<void()> Callback; EventManager( Player& player, EventHandler& eh ); @@ -38,7 +38,7 @@ namespace wrapper private: EventHandler& mEventHandler; - typedef boost::function< void() > TCallback; + typedef std::function< void() > TCallback; libvlc_event_manager_t *mManager; TCallback mOnPaused; TCallback mOnEndReached; |