mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-19 12:21:52 +02:00
Code Issues Releases Wiki Activity

no more boost

Browse Source
This commit is contained in:
dridri
2014-10-18 20:25:27 +02:00
committed by Uwe L. Korn
parent ead0ecc808
commit dadfd20000
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -1339,7 +1339,7 @@ AudioEngine::setCurrentTrackPlaylist( const playlistinterface_ptr& playlist )
void 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 ); Q_D( AudioEngine );

4
src/libtomahawk/audio/AudioEngine.h
View File

@@ -24,7 +24,7 @@
#include "../Typedefs.h" #include "../Typedefs.h"
#include <QStringList> #include <QStringList>
#include <boost/function.hpp> #include <functional>
#include "DllMacro.h" #include "DllMacro.h"
@@ -110,7 +110,7 @@ public:
*/ */
qint64 currentTrackTotalTime() const; 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: public slots:
void playPause(); void playPause();

5
src/libtomahawk/audio/AudioOutput.cpp
View File

@@ -28,9 +28,6 @@
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
#include <boost/function.hpp>
#include <boost/bind.hpp>
#include <vlc/libvlc.h> #include <vlc/libvlc.h>
#include <vlc/libvlc_media.h> #include <vlc/libvlc_media.h>
#include <vlc/libvlc_media_player.h> #include <vlc/libvlc_media_player.h>
@@ -502,7 +499,7 @@ AudioOutput::s_dspCallback( int frameNumber, float* samples, int nb_channels, in
void 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; dspPluginCallback = cb;
} }

6
src/libtomahawk/audio/AudioOutput.h
View File

@@ -26,7 +26,7 @@
#include "DllMacro.h" #include "DllMacro.h"
#include "utils/MediaStream.h" #include "utils/MediaStream.h"
#include <boost/function.hpp> #include <functional>
struct libvlc_instance_t; struct libvlc_instance_t;
struct libvlc_media_player_t; struct libvlc_media_player_t;
@@ -62,7 +62,7 @@ public:
qint64 totalTime(); qint64 totalTime();
void setAutoDelete ( bool ad ); 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(); static AudioOutput* instance();
@@ -93,7 +93,7 @@ private:
bool m_aboutToFinish; bool m_aboutToFinish;
bool m_justSeeked; 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_instance_t* vlcInstance;
libvlc_media_player_t* vlcPlayer; libvlc_media_player_t* vlcPlayer;