From dadfd20000b52e6114787ddf659aa502c9ef39bd Mon Sep 17 00:00:00 2001
From: dridri <dridri85@gmail.com>
Date: Sat, 18 Oct 2014 20:25:27 +0200
Subject: [PATCH] no more boost

---
 src/libtomahawk/audio/AudioEngine.cpp | 2 +-
 src/libtomahawk/audio/AudioEngine.h   | 4 ++--
 src/libtomahawk/audio/AudioOutput.cpp | 5 +----
 src/libtomahawk/audio/AudioOutput.h   | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/libtomahawk/audio/AudioEngine.cpp b/src/libtomahawk/audio/AudioEngine.cpp
index 97e1838f1..8db3a599f 100644
--- a/src/libtomahawk/audio/AudioEngine.cpp
+++ b/src/libtomahawk/audio/AudioEngine.cpp
@@ -1339,7 +1339,7 @@ AudioEngine::setCurrentTrackPlaylist( const playlistinterface_ptr& playlist )
 
 
 void
-AudioEngine::setDspCallback( boost::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > cb )
+AudioEngine::setDspCallback( std::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > cb )
 {
     Q_D( AudioEngine );
 
diff --git a/src/libtomahawk/audio/AudioEngine.h b/src/libtomahawk/audio/AudioEngine.h
index 28570cc23..4753afc60 100644
--- a/src/libtomahawk/audio/AudioEngine.h
+++ b/src/libtomahawk/audio/AudioEngine.h
@@ -24,7 +24,7 @@
 #include "../Typedefs.h"
 
 #include <QStringList>
-#include <boost/function.hpp>
+#include <functional>
 
 #include "DllMacro.h"
 
@@ -110,7 +110,7 @@ public:
      */
     qint64 currentTrackTotalTime() const;
 
-    void setDspCallback( boost::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > cb );
+    void setDspCallback( std::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > cb );
 
 public slots:
     void playPause();
diff --git a/src/libtomahawk/audio/AudioOutput.cpp b/src/libtomahawk/audio/AudioOutput.cpp
index 3b8b82c11..ead7c3c30 100644
--- a/src/libtomahawk/audio/AudioOutput.cpp
+++ b/src/libtomahawk/audio/AudioOutput.cpp
@@ -28,9 +28,6 @@
 #include <QFile>
 #include <QDir>
 
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-
 #include <vlc/libvlc.h>
 #include <vlc/libvlc_media.h>
 #include <vlc/libvlc_media_player.h>
@@ -502,7 +499,7 @@ AudioOutput::s_dspCallback( int frameNumber, float* samples, int nb_channels, in
 
 
 void
-AudioOutput::setDspCallback( boost::function< void( int, int, float*, int, int ) > cb )
+AudioOutput::setDspCallback( std::function< void( int, int, float*, int, int ) > cb )
 {
     dspPluginCallback = cb;
 }
diff --git a/src/libtomahawk/audio/AudioOutput.h b/src/libtomahawk/audio/AudioOutput.h
index 91df31c57..883f1e8aa 100644
--- a/src/libtomahawk/audio/AudioOutput.h
+++ b/src/libtomahawk/audio/AudioOutput.h
@@ -26,7 +26,7 @@
 #include "DllMacro.h"
 #include "utils/MediaStream.h"
 
-#include <boost/function.hpp>
+#include <functional>
 
 struct libvlc_instance_t;
 struct libvlc_media_player_t;
@@ -62,7 +62,7 @@ public:
     qint64 totalTime();
     void setAutoDelete ( bool ad );
 
-    void setDspCallback( boost::function< void( int, int, float*, int, int ) > cb );
+    void setDspCallback( std::function< void( int, int, float*, int, int ) > cb );
 
     static AudioOutput* instance();
 
@@ -93,7 +93,7 @@ private:
     bool m_aboutToFinish;
     bool m_justSeeked;
 
-    boost::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > dspPluginCallback;
+    std::function< void( int state, int frameNumber, float* samples, int nb_channels, int nb_samples ) > dspPluginCallback;
 
     libvlc_instance_t* vlcInstance;
     libvlc_media_player_t* vlcPlayer;