From: APTX <>
Date: Sat, 11 Apr 2009 14:35:54 +0000 (+0200)
Subject: - Filter files in DirectoryPlaylist to include only files with certain
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=7cebad9753db8be02137cdb7795e07251a850f3a;p=aniplayer-old.git

- Filter files in DirectoryPlaylist to include only files with certain
extensions.
- Fix DirectoryPlaylist::previous()
---

diff --git a/src/directoryplaylist.cpp b/src/directoryplaylist.cpp
index 4aa4529..017e6ec 100644
--- a/src/directoryplaylist.cpp
+++ b/src/directoryplaylist.cpp
@@ -23,8 +23,22 @@ void DirectoryPlaylist::setDirectory(QDir directory)
 		return;
 
 	m_directory = directory;
-	entryList = m_directory.entryInfoList(QDir::Files | QDir::Readable, QDir::Name);
+
+	entryList = m_directory.entryInfoList(
+			QStringList()
+				<< "*.mkv"
+				<< "*.mp4"
+				<< "*.ogg"
+				<< "*.ogm"
+				<< "*.wmv"
+				<< "*.avi",
+			QDir::Files | QDir::Readable,
+			QDir::Name);
 	m_currentIndex = 0;
+foreach(const QFileInfo &f, entryList)
+{
+	qDebug() << f.absoluteFilePath();
+}
 }
 
 int DirectoryPlaylist::indexOfFile(const QString &file) const
@@ -63,8 +77,8 @@ void DirectoryPlaylist::next()
 void DirectoryPlaylist::previous()
 {
 	--m_currentIndex;
-	if (m_currentIndex == 1)
-		m_currentIndex = entryList.count() - 1;
+	if (m_currentIndex == -1)
+		m_currentIndex = count() - 1;
 
 	emit currentChanged(m_currentIndex);
 	emit currentChanged(entryList[m_currentIndex].absoluteFilePath());
diff --git a/src/videowindow.cpp b/src/videowindow.cpp
index fc79c44..ad70fa7 100644
--- a/src/videowindow.cpp
+++ b/src/videowindow.cpp
@@ -369,7 +369,6 @@ qDebug() << "Media changed state from" << oldstate << "to" << newstate;
 		case Phonon::ErrorState:
 			//QMessageBox::warning(this, tr("Phonon error"), mediaObject->errorString());
 			menu->showMessage(mediaObject->errorString());
-			m_currentFile = "";
 
 			m_actions["play"]->setDisabled(false);
 			m_actions["pause"]->setDisabled(true);