[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam/development/imagemetadatacache] digikam/views: Revert audio/video columns to retrieve metad
From:       Michael Georg Hansen <mike () mghansen ! de>
Date:       2013-06-30 19:54:10
Message-ID: E1UtNhK-0001lj-PT () scm ! kde ! org
[Download RAW message or body]

Git commit cc1f5b40e3ae66adc5afd704ca50aaf31f02f068 by Michael Georg Hansen.
Committed on 30/06/2013 at 19:53.
Pushed by mghansen into branch 'development/imagemetadatacache'.

Revert audio/video columns to retrieve metadata through the model instead of from \
ImageInfo.

M  +12   -17   digikam/views/tableview_column_audiovideo.cpp

http://commits.kde.org/digikam/cc1f5b40e3ae66adc5afd704ca50aaf31f02f068

diff --git a/digikam/views/tableview_column_audiovideo.cpp \
b/digikam/views/tableview_column_audiovideo.cpp index c7427fa..b3ca856 100644
--- a/digikam/views/tableview_column_audiovideo.cpp
+++ b/digikam/views/tableview_column_audiovideo.cpp
@@ -144,14 +144,12 @@ QVariant ColumnAudioVideoProperties::data(TableViewModel::Item* \
const item, cons  return QVariant();
     }
 
-    const ImageInfo info = s->tableViewModel->infoFromItem(item);
-
     switch (subColumn)
     {
     case SubColumnAudioBitRate:
         {
             bool ok;
-            const int audioBitRate = \
info.getDatabaseFieldRaw(DatabaseFields::AudioBitRate).toInt(&ok); +            const \
int audioBitRate = s->tableViewModel->itemDatabaseFieldRaw(item, \
DatabaseFields::AudioBitRate).toInt(&ok);  if (!ok)
             {
                 return QString();
@@ -162,19 +160,19 @@ QVariant ColumnAudioVideoProperties::data(TableViewModel::Item* \
const item, cons  }
     case SubColumnAudioChannelType:
         {
-            const QString audioChannelType = \
info.getDatabaseFieldRaw(DatabaseFields::AudioChannelType).toString(); +            \
const QString audioChannelType = s->tableViewModel->itemDatabaseFieldRaw(item, \
DatabaseFields::AudioChannelType).toString();  return audioChannelType;
         }
     case SubColumnAudioCompressor:
         {
-            const QString audioCompressor = \
info.getDatabaseFieldRaw(DatabaseFields::AudioCompressor).toString(); +            \
const QString audioCompressor = s->tableViewModel->itemDatabaseFieldRaw(item, \
DatabaseFields::AudioCompressor).toString();  return audioCompressor;
         }
     case SubColumnDuration:
         {
             bool ok;
             // duration is in milliseconds
-            const double duration = \
info.getDatabaseFieldRaw(DatabaseFields::Duration).toDouble(&ok); +            const \
double duration = s->tableViewModel->itemDatabaseFieldRaw(item, \
DatabaseFields::Duration).toDouble(&ok);  if (!ok)
             {
                 return QString();
@@ -187,7 +185,7 @@ QVariant ColumnAudioVideoProperties::data(TableViewModel::Item* \
const item, cons  case SubColumnFrameRate:
         {
             bool ok;
-            const double frameRate = \
info.getDatabaseFieldRaw(DatabaseFields::FrameRate).toDouble(&ok); +            const \
double frameRate = s->tableViewModel->itemDatabaseFieldRaw(item, \
DatabaseFields::FrameRate).toDouble(&ok);  if (!ok)
             {
                 return QString();
@@ -198,7 +196,7 @@ QVariant ColumnAudioVideoProperties::data(TableViewModel::Item* \
const item, cons  }
     case SubColumnVideoCodec:
         {
-            const QString videoCodec = \
info.getDatabaseFieldRaw(DatabaseFields::VideoCodec).toString(); +            const \
QString videoCodec = s->tableViewModel->itemDatabaseFieldRaw(item, \
DatabaseFields::VideoCodec).toString();  return videoCodec;
         }
     }
@@ -208,17 +206,14 @@ QVariant ColumnAudioVideoProperties::data(TableViewModel::Item* \
const item, cons  
 TableViewColumn::ColumnCompareResult \
ColumnAudioVideoProperties::compare(TableViewModel::Item* const itemA, \
TableViewModel::Item* const itemB) const  {
-    const ImageInfo infoA = s->tableViewModel->infoFromItem(itemA);
-    const ImageInfo infoB = s->tableViewModel->infoFromItem(itemB);
-
     /// @todo All the values used here are actually returned as strings in the \
QVariants, but should be stored as int/double  switch (subColumn)
     {
 
     case SubColumnAudioBitRate:
         {
-            const QVariant variantA = \
                infoA.getDatabaseFieldRaw(DatabaseFields::AudioBitRate);
-            const QVariant variantB = \
infoB.getDatabaseFieldRaw(DatabaseFields::AudioBitRate); +            const QVariant \
variantA = s->tableViewModel->itemDatabaseFieldRaw(itemA, \
DatabaseFields::AudioBitRate); +            const QVariant variantB = \
s->tableViewModel->itemDatabaseFieldRaw(itemB, DatabaseFields::AudioBitRate);  bool \
okA;  const int audioBitRateA = variantA.toInt(&okA);
             bool okB;
@@ -235,8 +230,8 @@ TableViewColumn::ColumnCompareResult \
ColumnAudioVideoProperties::compare(TableVi  
     case SubColumnDuration:
         {
-            const QVariant variantA = \
                infoA.getDatabaseFieldRaw(DatabaseFields::Duration);
-            const QVariant variantB = \
infoB.getDatabaseFieldRaw(DatabaseFields::Duration); +            const QVariant \
variantA = s->tableViewModel->itemDatabaseFieldRaw(itemA, DatabaseFields::Duration); \
+            const QVariant variantB = s->tableViewModel->itemDatabaseFieldRaw(itemB, \
DatabaseFields::Duration);  bool okA;
             const double durationA = variantA.toDouble(&okA);
             bool okB;
@@ -253,8 +248,8 @@ TableViewColumn::ColumnCompareResult \
ColumnAudioVideoProperties::compare(TableVi  
     case SubColumnFrameRate:
         {
-            const QVariant variantA = \
                infoA.getDatabaseFieldRaw(DatabaseFields::FrameRate);
-            const QVariant variantB = \
infoB.getDatabaseFieldRaw(DatabaseFields::FrameRate); +            const QVariant \
variantA = s->tableViewModel->itemDatabaseFieldRaw(itemA, DatabaseFields::FrameRate); \
+            const QVariant variantB = s->tableViewModel->itemDatabaseFieldRaw(itemB, \
DatabaseFields::FrameRate);  bool okA;
             const double frameRateA = variantA.toDouble(&okA);
             bool okB;


[prev in list] [next in list] [prev in thread] [next in thread]