← Back to branch summary

~ubuntu-branches/ubuntu/lucid/ardour/lucid-proposed

« back to all changes in this revision

Viewing changes to gtk2_ardour/ardour_ui2.cc

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2008-07-29 11:27:04 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20080729112704-x1rmgb4tjotjyu5u
Tags: 1:2.5-0ubuntu1
* New upstream release.
* debian/patches/s390-FTBFS.patch: Dropped, as it fails to apply, and
  Ubuntu doesn't concern itself with s390.
* debian/control:
  - Fix package description, thanks to the patch in Debian bug #485892.
  - Metadata cleanup and sync control/control.in files.
  - Add libaubio-dev to Build-Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk2_ardour/ardour_ui2.cc
755
755
void
756
756
ARDOUR_UI::use_shuttle_fract (bool force)
757
757
{
758
 
        struct timeval now;
759
 
        struct timeval diff;
 
758
        microseconds_t now = get_microseconds();
760
759
        
761
760
        /* do not attempt to submit a motion-driven transport speed request
762
761
           more than once per process cycle.
763
762
         */
764
763
 
765
 
        gettimeofday (&now, 0);
766
 
        timersub (&now, &last_shuttle_request, &diff);
767
 
 
768
 
        if (!force && (diff.tv_usec + (diff.tv_sec * 1000000)) < engine->usecs_per_cycle()) {
 
764
        if (!force && (last_shuttle_request - now) < (microseconds_t) engine->usecs_per_cycle()) {
769
765
                return;
770
766
        }
771
767