/[svn]/libgig/trunk/src/gig.cpp
ViewVC logotype

Diff of /libgig/trunk/src/gig.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 515 by schoenebeck, Sat May 7 20:19:10 2005 UTC revision 516 by schoenebeck, Sat May 7 21:24:04 2005 UTC
# Line 32  namespace gig { Line 32  namespace gig {
32    
33      progress_t::progress_t() {      progress_t::progress_t() {
34          callback    = NULL;          callback    = NULL;
35            custom      = NULL;
36          __range_min = 0.0f;          __range_min = 0.0f;
37          __range_max = 1.0f;          __range_max = 1.0f;
38      }      }
# Line 41  namespace gig { Line 42  namespace gig {
42          if (pProgress && pProgress->callback) {          if (pProgress && pProgress->callback) {
43              const float totalrange    = pProgress->__range_max - pProgress->__range_min;              const float totalrange    = pProgress->__range_max - pProgress->__range_min;
44              const float totalprogress = pProgress->__range_min + subprogress * totalrange;              const float totalprogress = pProgress->__range_min + subprogress * totalrange;
45              pProgress->callback(totalprogress); // now actually notify about the progress              pProgress->factor         = totalprogress;
46                pProgress->callback(pProgress); // now actually notify about the progress
47          }          }
48      }      }
49    
# Line 50  namespace gig { Line 52  namespace gig {
52          if (pParentProgress && pParentProgress->callback) {          if (pParentProgress && pParentProgress->callback) {
53              const float totalrange    = pParentProgress->__range_max - pParentProgress->__range_min;              const float totalrange    = pParentProgress->__range_max - pParentProgress->__range_min;
54              pSubProgress->callback    = pParentProgress->callback;              pSubProgress->callback    = pParentProgress->callback;
55                pSubProgress->custom      = pParentProgress->custom;
56              pSubProgress->__range_min = pParentProgress->__range_min + totalrange * currentTask / totalTasks;              pSubProgress->__range_min = pParentProgress->__range_min + totalrange * currentTask / totalTasks;
57              pSubProgress->__range_max = pSubProgress->__range_min + totalrange / totalTasks;              pSubProgress->__range_max = pSubProgress->__range_min + totalrange / totalTasks;
58          }          }

Legend:
Removed from v.515  
changed lines
  Added in v.516

  ViewVC Help
Powered by ViewVC