X-Git-Url: http://git.maemo.org/git/?p=someplayer;a=blobdiff_plain;f=src%2Fmediascanner.cpp;h=3d1017f04faaa91c3b5044bc352d48eca816a32a;hp=edb76d673fd904de67e7d2d39593356b9326c24f;hb=HEAD;hpb=531aae3d031a35596d673ca0dd3fb88ebedabee8

diff --git a/src/mediascanner.cpp b/src/mediascanner.cpp
index edb76d6..3d1017f 100644
--- a/src/mediascanner.cpp
+++ b/src/mediascanner.cpp
@@ -27,7 +27,7 @@ using namespace SomePlayer::Storage;
 MediaScanner::MediaScanner(QObject *parent) :
 		QThread(parent), _stopped(false), _initialized(false)
 {
-	REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav";
+	REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav" << "m4a";
 }
 
 void MediaScanner::run() {
@@ -41,9 +41,22 @@ void MediaScanner::run() {
 
 QStringList MediaScanner::singleScan(QString path) {
 	_dir = path;
+	_foundMedia.clear();
 	return _scan_directory(_dir);
 }
 
+QStringList MediaScanner::scanForPlaylists(QString path) {
+	QStringList extensions_backup(REGISTERED_FILE_EXTENSIONS);
+	REGISTERED_FILE_EXTENSIONS.clear();
+	REGISTERED_FILE_EXTENSIONS << "m3u";
+	_dir = path;
+	_foundMedia.clear();
+	QStringList result = _scan_directory(_dir);
+	REGISTERED_FILE_EXTENSIONS.clear();
+	REGISTERED_FILE_EXTENSIONS.append(extensions_backup);
+	return result;
+}
+
 QStringList MediaScanner::_scan_directory(QDir dir) {
 	QFileInfoList items = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
 	foreach (QFileInfo info, items) {