Peter M. Groen / openbr

Commit ba1b606a44ed13ae83f6f3cb9b94ed7102f3b2c5

Authored by Charles Otto
1 parent 52cf180a

Replace ProgressCounter's totalProgress var with a int64 

since total progress can be a file size in bytes, this should really be a
64-bit number.

Soften output condition -- if FrameNumber metadata is not present, still display
progress
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
openbr/plugins/misc.cpp
  View file @ba1b606
@@ -639,8 +639,8 @@ class ProgressCounterTransform : public TimeVaryingTransform @@ -639,8 +639,8 @@ class ProgressCounterTransform : public TimeVaryingTransform
639 { 639 {
640 Q_OBJECT 640 Q_OBJECT
641 641
642 - Q_PROPERTY(int totalProgress READ get_totalProgress WRITE set_totalProgress RESET reset_totalProgress STORED false)  
643 - BR_PROPERTY(int, totalProgress, 1) 642 + Q_PROPERTY(qint64 totalProgress READ get_totalProgress WRITE set_totalProgress RESET reset_totalProgress STORED false)
  643 + BR_PROPERTY(qint64, totalProgress, 1)
644 644
645 void projectUpdate(const TemplateList &src, TemplateList &dst) 645 void projectUpdate(const TemplateList &src, TemplateList &dst)
646 { 646 {
@@ -651,7 +651,7 @@ class ProgressCounterTransform : public TimeVaryingTransform @@ -651,7 +651,7 @@ class ProgressCounterTransform : public TimeVaryingTransform
651 if (!dst.empty()) { 651 if (!dst.empty()) {
652 for (int i=0;i < dst.size();i++) { 652 for (int i=0;i < dst.size();i++) {
653 int frame = dst[i].file.get<int>("FrameNumber", -1); 653 int frame = dst[i].file.get<int>("FrameNumber", -1);
654 - if (frame == last_frame) 654 + if (frame == last_frame && frame != -1)
655 continue; 655 continue;
656 656
657 Globals->currentProgress = dst[i].file.get<qint64>("progress",0); 657 Globals->currentProgress = dst[i].file.get<qint64>("progress",0);