mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

* Added extensionToMimetype() to TomahawkUtils. ScriptResolver results now either need a mimetype or an extension.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-03-16 04:22:27 +01:00
parent 1e8ad402bb
commit 0aca34a1c2
5 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libtomahawk/utils/tomahawkutils.cpp
View File

@@ -227,6 +227,26 @@ filesizeToString( unsigned int size )
} }
QString
extensionToMimetype( const QString& extension )
{
static QMap<QString, QString> s_ext2mime;
if ( s_ext2mime.isEmpty() )
{
s_ext2mime.insert( "mp3", "audio/mpeg" );
s_ext2mime.insert( "ogg", "application/ogg" );
s_ext2mime.insert( "flac", "audio/flac" );
s_ext2mime.insert( "mpc", "audio/x-musepack" );
s_ext2mime.insert( "wma", "audio/x-ms-wma" );
s_ext2mime.insert( "aac", "audio/mp4" );
s_ext2mime.insert( "m4a", "audio/mp4" );
s_ext2mime.insert( "mp4", "audio/mp4" );
}
return s_ext2mime.value( extension, "unknown" );
}
QPixmap QPixmap
createDragPixmap( int itemCount ) createDragPixmap( int itemCount )
{ {

1
src/libtomahawk/utils/tomahawkutils.h
View File

@@ -69,6 +69,7 @@ namespace TomahawkUtils
DLLEXPORT QString timeToString( int seconds ); DLLEXPORT QString timeToString( int seconds );
DLLEXPORT QString ageToString( const QDateTime& time ); DLLEXPORT QString ageToString( const QDateTime& time );
DLLEXPORT QString filesizeToString( unsigned int size ); DLLEXPORT QString filesizeToString( unsigned int size );
DLLEXPORT QString extensionToMimetype( const QString& extension );
DLLEXPORT QPixmap createDragPixmap( int itemCount = 1 ); DLLEXPORT QPixmap createDragPixmap( int itemCount = 1 );

11
src/musicscanner.cpp
View File

@@ -59,19 +59,14 @@ MusicScanner::MusicScanner( const QString& dir, quint32 bs )
, m_dirLister( 0 ) , m_dirLister( 0 )
, m_dirListerThreadController( 0 ) , m_dirListerThreadController( 0 )
{ {
m_ext2mime.insert( "mp3", "audio/mpeg" ); m_ext2mime.insert( "mp3", TomahawkUtils::extensionToMimetype( "mp3" ) );
#ifndef NO_OGG #ifndef NO_OGG
m_ext2mime.insert( "ogg", "application/ogg" ); m_ext2mime.insert( "ogg", TomahawkUtils::extensionToMimetype( "ogg" ) );
#endif #endif
#ifndef NO_FLAC #ifndef NO_FLAC
m_ext2mime.insert( "flac", "audio/flac" ); m_ext2mime.insert( "flac", TomahawkUtils::extensionToMimetype( "flac" ) );
#endif #endif
// m_ext2mime.insert( "aac", "audio/mp4" );
// m_ext2mime.insert( "m4a", "audio/mp4" );
// m_ext2mime.insert( "mp4", "audio/mp4" );
} }

2
src/musicscanner.h
View File

@@ -74,7 +74,7 @@ private slots:
private: private:
QString m_dir; QString m_dir;
QMap<QString,QString> m_ext2mime; // eg: mp3 -> audio/mpeg QMap<QString, QString> m_ext2mime; // eg: mp3 -> audio/mpeg
unsigned int m_scanned; unsigned int m_scanned;
unsigned int m_skipped; unsigned int m_skipped;

10
src/scriptresolver.cpp
View File

@@ -7,6 +7,7 @@
#include "pipeline.h" #include "pipeline.h"
#include "sourcelist.h" #include "sourcelist.h"
#include "functimeout.h" #include "functimeout.h"
#include "utils/tomahawkutils.h"
ScriptResolver::ScriptResolver( const QString& exe ) ScriptResolver::ScriptResolver( const QString& exe )
@@ -132,10 +133,17 @@ ScriptResolver::handleMsg( const QByteArray& msg )
rp->setBitrate( m.value( "bitrate" ).toUInt() ); rp->setBitrate( m.value( "bitrate" ).toUInt() );
rp->setUrl( m.value( "url" ).toString() ); rp->setUrl( m.value( "url" ).toString() );
rp->setSize( m.value( "size" ).toUInt() ); rp->setSize( m.value( "size" ).toUInt() );
rp->setMimetype( m.value( "mimetype" ).toString() );
rp->setScore( m.value( "score" ).toFloat() * ( (float)weight() / 100.0 ) ); rp->setScore( m.value( "score" ).toFloat() * ( (float)weight() / 100.0 ) );
rp->setRID( uuid() ); rp->setRID( uuid() );
rp->setFriendlySource( m_name ); rp->setFriendlySource( m_name );
rp->setMimetype( m.value( "mimetype" ).toString() );
if ( rp->mimetype().isEmpty() )
{
rp->setMimetype( TomahawkUtils::extensionToMimetype( m.value( "extension" ).toString() ) );
Q_ASSERT( !rp->mimetype().isEmpty() );
}
results << rp; results << rp;
} }