[SCM] lives/master: Fix previous patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fc901f3246b00a1f8077158f827d1e27b1e89cc6
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Sep 15 09:38:40 2010 +0200

    Fix previous patch.

diff --git a/debian/patches/12-svn_rev716.patch b/debian/patches/12-svn_rev716.patch
index 75bbb04..44f6208 100644
--- a/debian/patches/12-svn_rev716.patch
+++ b/debian/patches/12-svn_rev716.patch
@@ -1,10 +1,10 @@
 Description: Quantise audio rendering to op frame rate.
-Origin: upstream, commit:716
-Applied-Upstream: commit:716
+Origin: upstream, commit:716, commit:717
+Applied-Upstream: commit:717
 ---
  src/callbacks.c |    2 +-
- src/events.c    |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ src/events.c    |   10 +++++-----
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 --- lives.orig/src/callbacks.c
 +++ lives/src/callbacks.c
@@ -28,7 +28,13 @@ Applied-Upstream: commit:716
  	}
        }
  
-@@ -3245,7 +3245,7 @@ gint render_events (gboolean reset) {
+@@ -3240,18 +3240,18 @@ gint render_events (gboolean reset) {
+ 		chvols[0]=1.;
+ 	      }
+ 
+-	      if (tc/U_SEC>atime) {
++	      if (q_gint64(tc,cfile->fps)/U_SEC>atime) {
+ 		cfile->achans=cfile->undo_achans;
  		cfile->arate=cfile->undo_arate;
  		cfile->arps=cfile->undo_arps;
  		cfile->asampsize=cfile->undo_asampsize;
@@ -36,4 +42,12 @@ Applied-Upstream: commit:716
 +		render_audio_segment(natracks, xaclips, mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file, xavel, xaseek, (atime*U_SEC+.5), q_gint64(tc,cfile->fps)+(U_SEC/cfile->fps*!is_blank), chvols, 1., 1., NULL);
  		for (i=0;i<natracks;i++) {
  		  if (xaclips[i]>0) {
- 		    xaseek[i]+=(tc/U_SEC+1./cfile->fps-atime)*xavel[i];
+-		    xaseek[i]+=(tc/U_SEC+1./cfile->fps-atime)*xavel[i];
++		    xaseek[i]+=(q_gint64(tc,cfile->fps)/U_SEC+1./cfile->fps-atime)*xavel[i];
+ 		  }
+ 		}
+-		atime=tc/U_SEC+1./cfile->fps;
++		atime=q_gint64(tc,cfile->fps)/U_SEC+1./cfile->fps;
+ 	      }
+ 	      for (i=0;i<num_aclips;i+=2) {
+ 		if (aclips[i+1]>0) { // clipnum

-- 
lives packaging