Version bump

[someplayer] / src / mediascanner.cpp

diff --git a/src/mediascanner.cpp b/src/mediascanner.cpp
index e46c57a..3d1017f 100644 (file)
--- a/src/mediascanner.cpp
+++ b/src/mediascanner.cpp
@@ -1,3 +1,22 @@
+/*
+ * SomePlayer - An alternate music player for Maemo 5
+ * Copyright (C) 2010 Nikolay (somebody) Tischenko <niktischenko@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 #include "mediascanner.h"
 
 using namespace SomePlayer::Storage;
@@ -8,7 +27,7 @@ using namespace SomePlayer::Storage;
 MediaScanner::MediaScanner(QObject *parent) :
                QThread(parent), _stopped(false), _initialized(false)
 {
-       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "acc";
+       REGISTERED_FILE_EXTENSIONS << "mp3" << "flac" << "wma" << "aac" << "ogg" << "asf" << "ape" << "wav" << "m4a";
 }
 
 void MediaScanner::run() {
@@ -20,8 +39,26 @@ void MediaScanner::run() {
        _stopped = true;
 }
 
-void MediaScanner::_scan_directory(QDir dir) {
-       QFileInfoList items = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
+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) {
                if (info.isDir()) {
                        QDir ndir(info.absoluteFilePath());
@@ -34,6 +71,7 @@ void MediaScanner::_scan_directory(QDir dir) {
                        }
                }
        }
+       return _foundMedia;
 }
 
 void MediaScanner::stop() {