streaming playlists support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@284 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 48 insertions, 48 deletions

diff --git a/src/ui/fileloader.cpp b/src/ui/fileloader.cpp
index 89926f883..fcc8f6feb 100644
--- a/src/ui/fileloader.cpp
+++ b/src/ui/fileloader.cpp
@@ -23,86 +23,86 @@
 #include "mediafile.h"
 
 FileLoader::FileLoader(QObject *parent)
-	: QThread(parent),m_files_to_load(),m_directory()
+        : QThread(parent),m_files_to_load(),m_directory()
 {
-   m_filters = Decoder::nameFilters();
-	m_finished = false;
+    m_filters = Decoder::nameFilters();
+    m_finished = false;
 }
 
 
 FileLoader::~FileLoader()
 {
-	qWarning("FileLoader::~FileLoader()");
+    qWarning("FileLoader::~FileLoader()");
 }
 
 
 void FileLoader::addFiles(const QStringList &files)
 {
-	if (files.isEmpty ())
-		return;
-	
-	foreach(QString s, files)
-	{
-		if (Decoder::supports(s))
-			emit newMediaFile(new MediaFile(s));
-		if(m_finished) return;
-	}
+    if (files.isEmpty ())
+        return;
+
+    foreach(QString s, files)
+    {
+        if (s.startsWith("http://") || Decoder::supports(s))
+            emit newMediaFile(new MediaFile(s));
+        if (m_finished) return;
+    }
 }
 
 
 void FileLoader::addDirectory(const QString& s)
-{	
-	QDir dir(s);
-	dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-	dir.setSorting(QDir::Name);
-	QFileInfoList l = dir.entryInfoList(m_filters);
-	for (int i = 0; i < l.size(); ++i)
-	{
-		QFileInfo fileInfo = l.at(i);
-		QString suff = fileInfo.completeSuffix(); 
-		list << fileInfo;
-		  
-		if (Decoder::supports(fileInfo.absoluteFilePath ()))
-			emit newMediaFile(new MediaFile(fileInfo.absoluteFilePath ()));
-		if(m_finished) return;
-	}
-	dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
-	dir.setSorting(QDir::Name);
-	l.clear();
-	l = dir.entryInfoList();
-	if (l.size() > 0)
-		for (int i = 0; i < l.size(); ++i)
-	{
-		QFileInfo fileInfo = l.at(i);
-		addDirectory(fileInfo.absoluteFilePath ());
-		if(m_finished) return;
-	}
+{
+    QDir dir(s);
+    dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
+    dir.setSorting(QDir::Name);
+    QFileInfoList l = dir.entryInfoList(m_filters);
+    for (int i = 0; i < l.size(); ++i)
+    {
+        QFileInfo fileInfo = l.at(i);
+        QString suff = fileInfo.completeSuffix();
+        list << fileInfo;
+
+        if (Decoder::supports(fileInfo.absoluteFilePath ()))
+            emit newMediaFile(new MediaFile(fileInfo.absoluteFilePath ()));
+        if (m_finished) return;
+    }
+    dir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
+    dir.setSorting(QDir::Name);
+    l.clear();
+    l = dir.entryInfoList();
+    if (l.size() > 0)
+        for (int i = 0; i < l.size(); ++i)
+        {
+            QFileInfo fileInfo = l.at(i);
+            addDirectory(fileInfo.absoluteFilePath ());
+            if (m_finished) return;
+        }
 }
 
 
 void FileLoader::run()
 {
-	if(!m_files_to_load.isEmpty())
-		addFiles(m_files_to_load);
-	else if(!m_directory.isEmpty())
-		addDirectory(m_directory);
+    if (!m_files_to_load.isEmpty())
+        addFiles(m_files_to_load);
+    else if (!m_directory.isEmpty())
+        addDirectory(m_directory);
 }
 
 
 
 void FileLoader::setFilesToLoad(const QStringList & l)
 {
-	m_files_to_load = l;
-	m_directory = QString();
+    m_files_to_load = l;
+    m_directory = QString();
 }
 
 void FileLoader::setDirectoryToLoad(const QString & d)
 {
-	m_directory = d;
-	m_files_to_load.clear();
+    m_directory = d;
+    m_files_to_load.clear();
 }
 
 void FileLoader::finish()
 {
-	m_finished = true;
+    m_finished = true;
 }