X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmediascanner.cpp;h=4f93a378ab06e8fac93d673e17131d023f240eaf;hb=309dee320b00cb208b4fc0186c06e5d1e064c5a5;hp=f6a32c190b5bad770d2b77b4f95aed220427c214;hpb=bd0e545d4cfd3809624a3ac57bb9ee0b14afec84;p=someplayer diff --git a/src/mediascanner.cpp b/src/mediascanner.cpp index f6a32c1..4f93a37 100644 --- a/src/mediascanner.cpp +++ b/src/mediascanner.cpp @@ -35,11 +35,18 @@ void MediaScanner::run() { return; _foundMedia.clear(); _scan_directory(_dir); + _foundMedia = _scan_directory(_dir); emit scanFinish(_foundMedia); _stopped = true; } -void MediaScanner::_scan_directory(QDir dir) { +QStringList MediaScanner::singleScan(QString path) { + _dir = path; + return _scan_directory(_dir); +} + +QStringList MediaScanner::_scan_directory(QDir dir) { + _foundMedia.clear(); QFileInfoList items = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot); foreach (QFileInfo info, items) { if (info.isDir()) { @@ -53,6 +60,7 @@ void MediaScanner::_scan_directory(QDir dir) { } } } + return _foundMedia; } void MediaScanner::stop() {