← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/callbacks.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-12-15 17:13:20 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061215171320-w79pvpehxx2fr217
Tags: 1:2.3.0-0.0ubuntu1
* Merge from debian-multimedia.org, remaining Ubuntu change:
  - desktop file,
  - no support for ccache and make -j.
* Closes Ubuntu: #69614.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/callbacks.cpp
90
90
               UI_setFrameType(  frame->flags,frame->_Qp);
91
91
    // progress bar
92
92
    len = 100;
93
 
    len=len / (double) avifileinfo->nb_frames;
 
93
    if(avifileinfo->nb_frames>1)
 
94
        len=len / (double) (avifileinfo->nb_frames-1);
94
95
    len *= (double) curframe;
95
96
 
96
97
   
116
117
        
117
118
    // progress bar
118
119
    len = 100;
119
 
    len=len / (double) avifileinfo->nb_frames;
 
120
    if(avifileinfo->nb_frames>1)
 
121
        len=len / (double) (avifileinfo->nb_frames-1);
120
122
    len *= (double) curframe;
121
123
 
122
124
 
142
144
    float tg;
143
145
 
144
146
    percent = UI_readScale();
145
 
    tg= avifileinfo->nb_frames * percent / 100.;
 
147
    tg= (avifileinfo->nb_frames-1) * percent / 100.;
146
148
    
147
149
    return (uint32_t)floor(tg);;
148
150