1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 16:14:40 +02:00

Clean up MPRIS album cover code a bit.

This commit is contained in:
Alejandro Wainzinger
2011-08-16 19:32:32 -07:00
parent 0bddfe3f0d
commit 8beb3173c6

View File

@@ -40,6 +40,7 @@ static QString s_mpInfoIdentifier = QString( "MPRISPLUGIN" );
MprisPlugin::MprisPlugin()
: InfoPlugin()
, m_coverTempFile( 0 )
{
qDebug() << Q_FUNC_INFO;
@@ -66,15 +67,6 @@ MprisPlugin::MprisPlugin()
connect( playlist->object(), SIGNAL( trackCountChanged( unsigned int ) ),
SLOT( onTrackCountChanged( unsigned int ) ) );
// We store the currently playing track's cover in a temporary file
// for the mpris:artUrl property.
m_coverTempFile = new QTemporaryFile( "tomahawk_curtrack_cover.png" );
if( !m_coverTempFile->open() )
{
qDebug() << "WARNING: could not write temporary file for cover art!";
}
m_coverTempFile->close();
// Connect to the InfoSystem (we need to get album covers via getInfo)
connect( Tomahawk::InfoSystem::InfoSystem::instance(),
@@ -576,16 +568,18 @@ MprisPlugin::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData,
image.loadFromData( ba );
// delete the old tempfile and make new one, to avoid caching of filename by mpris clients
delete m_coverTempFile;
if( m_coverTempFile )
delete m_coverTempFile;
m_coverTempFile = new QTemporaryFile( "tomahawk_curtrack_cover.png" );
if( !m_coverTempFile->open() )
{
qDebug() << "WARNING: could not write temporary file for cover art!";
}
m_coverTempFile->close();
// Finally, save the image to the new temp file
if( image.save( QFileInfo( *m_coverTempFile ).absoluteFilePath(), "PNG" ) )
//if( image.save( QFileInfo( *m_coverTempFile ).absoluteFilePath(), "PNG" ) )
if( image.save( m_coverTempFile, "PNG") )
{
qDebug() << Q_FUNC_INFO << "Image saving successful, notifying";
qDebug() << "Saving to: " << QFileInfo( *m_coverTempFile ).absoluteFilePath();
@@ -593,6 +587,8 @@ MprisPlugin::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData,
else
qDebug() << Q_FUNC_INFO << " failed to save image!";
m_coverTempFile->close();
/*
if( m_coverTempFile->open() )
{