From a61ee6433b984b9a2d65e524571089832b338042 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 24 Feb 2011 02:39:48 +0100 Subject: [PATCH] * Support scanning various mimetypes, now that we got Phonon. --- src/musicscanner.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/musicscanner.cpp b/src/musicscanner.cpp index 68a47e562..465003feb 100644 --- a/src/musicscanner.cpp +++ b/src/musicscanner.cpp @@ -17,18 +17,13 @@ MusicScanner::MusicScanner( const QString& dir, quint32 bs ) , m_dirListerThreadController( 0 ) { m_ext2mime.insert( "mp3", "audio/mpeg" ); - -#ifndef NO_OGG - m_ext2mime.insert( "ogg", "application/ogg" ); -#endif - -#ifndef NO_FLAC - m_ext2mime.insert( "flac", "audio/flac" ); -#endif - - // m_ext2mime.insert( "aac", "audio/mp4" ); - // m_ext2mime.insert( "m4a", "audio/mp4" ); - // m_ext2mime.insert( "mp4", "audio/mp4" ); + m_ext2mime.insert( "ogg", "application/ogg" ); + m_ext2mime.insert( "flac", "audio/flac" ); + m_ext2mime.insert( "mpc", "audio/x-musepack" ); + m_ext2mime.insert( "wma", "audio/x-ms-wma" ); + m_ext2mime.insert( "aac", "audio/mp4" ); + m_ext2mime.insert( "m4a", "audio/mp4" ); + m_ext2mime.insert( "mp4", "audio/mp4" ); } MusicScanner::~MusicScanner()