Kaydet (Commit) 701cfbd6 authored tarafından Michael Stahl's avatar Michael Stahl

avmedia: replace boost::function with std::function

Change-Id: I813d42a1ab494e0887791516606fddd342e21ff0
üst 9e90038b
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTHANDLER_HXX
#define 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 <boost/noncopyable.hpp>
#include <salhelper/thread.hxx> #include <salhelper/thread.hxx>
#include "ThreadsafeQueue.hxx" #include "ThreadsafeQueue.hxx"
...@@ -30,7 +31,7 @@ namespace wrapper ...@@ -30,7 +31,7 @@ namespace wrapper
virtual void SAL_CALL run() SAL_OVERRIDE; virtual void SAL_CALL run() SAL_OVERRIDE;
public: public:
typedef boost::function< void() > TCallback; typedef std::function< void() > TCallback;
ThreadsafeQueue< TCallback > mCallbackQueue; ThreadsafeQueue< TCallback > mCallbackQueue;
}; };
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX #ifndef INCLUDED_AVMEDIA_SOURCE_VLC_WRAPPER_EVENTMANAGER_HXX
#define 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 <boost/noncopyable.hpp>
#include "Player.hxx" #include "Player.hxx"
...@@ -29,7 +29,7 @@ namespace wrapper ...@@ -29,7 +29,7 @@ namespace wrapper
public: public:
static bool LoadSymbols(); static bool LoadSymbols();
typedef boost::function<void()> Callback; typedef std::function<void()> Callback;
EventManager( Player& player, EventHandler& eh ); EventManager( Player& player, EventHandler& eh );
...@@ -38,7 +38,7 @@ namespace wrapper ...@@ -38,7 +38,7 @@ namespace wrapper
private: private:
EventHandler& mEventHandler; EventHandler& mEventHandler;
typedef boost::function< void() > TCallback; typedef std::function< void() > TCallback;
libvlc_event_manager_t *mManager; libvlc_event_manager_t *mManager;
TCallback mOnPaused; TCallback mOnPaused;
TCallback mOnEndReached; TCallback mOnEndReached;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment