From 0afebd0e3cb3da831cd5ffba1eefbe9e61e408a1 Mon Sep 17 00:00:00 2001 From: Arno 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. --- archiveview.cpp | 65 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 64 deletions(-) (limited to 'archiveview.cpp') diff --git a/archiveview.cpp b/archiveview.cpp index 3031815..18effbd 100644 --- a/archiveview.cpp +++ b/archiveview.cpp @@ -27,6 +27,7 @@ #include "archiveview.h" #include "archivecontroller.h" #include "mappingtablewidget.h" +#include "delegates.h" #include "smglobals.h" #include "helper.h" @@ -674,67 +675,3 @@ QString PartEditor::subtitle() const { return mSubtitle->text(); } -/* Delegate for File no. */ - -QString FileNoDelegate::displayText(const QVariant &value, const QLocale &locale) const{ - Q_UNUSED(locale); - int no = value.toInt(); - if(no){ - return QString::number(no); - } - return QString(); -} - -QWidget *FileNoDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const{ - Q_UNUSED(option); - QSpinBox *retval = new QSpinBox(parent); - int no = index.data().toInt(); - retval->setValue(no); - return retval; -} - -/* Delegate for Dvd no. */ - -QString DvdNoDelegate::displayText(const QVariant &value, const QLocale &locale) const{ - Q_UNUSED(locale); - int no = value.toInt(); - if(no < 0){ - return tr("(local)"); - } - QString retval = QString(tr("#%1")).arg(QString::number(no)); - return retval; -} - -/* Delegate for size */ - -QString SizeDelegate::displayText(const QVariant &value, const QLocale &locale) const{ - // locale.toString() doesn't work, maybe b/c it's const - Q_UNUSED(locale); - QLocale l; - return l.toString(value.toLongLong()); -} - -/* Delegate for duration */ - -QString DurationDelegate::displayText(const QVariant &value, const QLocale &locale) const{ - Q_UNUSED(locale); - if(value.toString().contains("x")){ - return value.toString(); - } - qint64 secs = value.toInt(); - if(secs == 0){ - return tr("n/a"); - } - Helper::Duration dur(secs); - return dur.toString(); -} - -/* Empty delegate */ - -QString EmptyDelegate::displayText(const QVariant &value, const QLocale &locale) const{ - int i = value.toInt(); - if(i < 1){ - return QString(); - } - return QStyledItemDelegate::displayText(value, locale); -} -- cgit v1.2.3-70-g09d2