From 0afebd0e3cb3da831cd5ffba1eefbe9e61e408a1 Mon Sep 17 00:00:00 2001
From: Arno <am@disconnect.de>
Date: Sat, 27 Jul 2013 03:59:47 +0200
Subject: Read JSON from ffprobe

Use JSON output from ffprobe instead of string parsing to get some kind
of type safety.

For doing that, some changes were needed in FileView: Use delegates for
displaying Duration and Bitrate instead of mangling output in
Qt::Displayrole.

To reuse code, move all delegates from the new Archive to a separate
file.

And, of course, the initial objective: Show the accumulated size and
duration of selected files in the status bar from the experimental
archive.
---
 fileview.cpp | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'fileview.cpp')

diff --git a/fileview.cpp b/fileview.cpp
index 1720552..336d179 100644
--- a/fileview.cpp
+++ b/fileview.cpp
@@ -6,15 +6,15 @@
 */
 
 #include <QContextMenuEvent>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QMenu>
+#include <QAction>
 #include <QKeyEvent>
 #include <QModelIndex>
 #include <QRegExp>
-#include <QtWidgets/QFileSystemModel>
+#include <QFileSystemModel>
 #include <QSortFilterProxyModel>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QApplication>
+#include <QAction>
+#include <QApplication>
 #include <QEvent>
 #include <QSettings>
 #include <QModelIndex>
@@ -23,7 +23,7 @@
 #include <QList>
 #include <QDir>
 #include <QSortFilterProxyModel>
-#include <QtWidgets/QInputDialog>
+#include <QInputDialog>
 #include <QPalette>
 #include <QTimer>
 #include <QHeaderView>
@@ -50,12 +50,6 @@ void FileView::setModel(QAbstractItemModel *model){
     SmTreeView::setModel(model);
 }
 
-const QVariant FileView::duration() const {
-    QVariant retval;
-    retval.setValue(mDuration);
-    return retval;;
-}
-
 void FileView::markFiles(){
 	bool ok;
 	QString title = QString(tr("%1 - %2")).arg(qApp->applicationName()).arg(tr("Mark files"));
@@ -228,17 +222,13 @@ void FileView::selectedFilesChanged(){
     QModelIndexList selected = selectionModel()->selectedRows();
     emit numSelected(selected.size());
     qint64 selSize = 0;
-    Helper::Duration dur;
+    qint64 dur = 0;
     foreach(QModelIndex i, selected){
         selSize += i.data(SmDirModel::SizeRole).toLongLong();
-        Helper::Duration curDur = i.data(SmDirModel::DurSizeRole).value<Helper::Duration>();
-        dur = dur + curDur;
+        dur += i.data(SmDirModel::DurSizeRole).toInt();
     }
     emit selectedSize(selSize);
-    mDuration = dur;
-    QVariant duration;
-    duration.setValue(dur);
-    emit selectedDuration(duration);
+    emit selectedDuration(dur, false);
 }
 
 void FileView::saveSelection(){
-- 
cgit v1.2.3-70-g09d2