mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-13 09:34:53 +02:00
Code Issues Releases Wiki Activity

Make readDoneCallback a member function

Browse Source
This commit is contained in:
Uwe L. Korn
2014-11-09 13:37:45 +01:00
parent f949fe9de3
commit 7cbe723e0a
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,6 +180,14 @@ int readCallback ( void* data, const char* cookie, int64_t* dts, int64_t* pts, u
}
int
readDoneCallback ( void *data, const char *cookie, size_t bufferSize, void *buffer )
{
MediaStream* mediaStream = static_cast< MediaStream * >( data );
return mediaStream->readDoneCallback( cookie, bufferSize, buffer );
}
void
AudioOutput::setCurrentSource( MediaStream* stream )
{
@@ -257,7 +265,7 @@ AudioOutput::setCurrentSource( MediaStream* stream )
libvlc_media_add_option_flag(m_vlcMedia, imemData, libvlc_media_option_trusted);
const char* imemGet = QString( "imem-get=%1" ).arg( (uintptr_t)&readCallback ).toLatin1().constData();
libvlc_media_add_option_flag(m_vlcMedia, imemGet, libvlc_media_option_trusted);
const char* imemRelease = QString( "imem-release=%1" ).arg( (uintptr_t)&MediaStream::readDoneCallback ).toLatin1().constData();
const char* imemRelease = QString( "imem-release=%1" ).arg( (uintptr_t)&readDoneCallback ).toLatin1().constData();
libvlc_media_add_option_flag(m_vlcMedia, imemRelease, libvlc_media_option_trusted);
const char* imemSeek = QString( "imem-seek=%1" ).arg( (uintptr_t)&MediaStream::seekCallback ).toLatin1().constData();
libvlc_media_add_option_flag(m_vlcMedia, imemSeek, libvlc_media_option_trusted);

6
src/libtomahawk/audio/MediaStream.cpp
View File

@@ -144,14 +144,12 @@ MediaStream::readCallback ( const char* cookie, int64_t* dts, int64_t* pts, unsi
int
MediaStream::readDoneCallback ( void *data, const char *cookie, size_t bufferSize, void *buffer )
MediaStream::readDoneCallback ( const char *cookie, size_t bufferSize, void *buffer )
{
Q_UNUSED(cookie);
Q_UNUSED(bufferSize);
MediaStream* that = static_cast < MediaStream * > ( data );
if ( ( that->m_type == Stream ) && buffer != 0 && bufferSize > 0 ) {
if ( ( m_type == Stream ) && buffer != nullptr && bufferSize > 0 ) {
delete static_cast< char* >( buffer );
}

2
src/libtomahawk/audio/MediaStream.h
View File

@@ -55,7 +55,7 @@ public:
virtual qint64 needData ( void** buffer ) { (void)buffer; return 0; }
int readCallback( const char* cookie, int64_t* dts, int64_t* pts, unsigned* flags, size_t* bufferSize, void** buffer );
static int readDoneCallback ( void *data, const char *cookie, size_t bufferSize, void *buffer );
int readDoneCallback ( const char *cookie, size_t bufferSize, void *buffer );
static int seekCallback ( void *data, const uint64_t pos );
public slots: