[SCM] lives/master: debian/patches/12-svn_rev716.patch: Quantise audio rendering to op frame rate.

[alessio at users.alioth.debian.org]

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

    debian/patches/12-svn_rev716.patch: Quantise audio rendering to op frame rate.

diff --git a/debian/patches/12-svn_rev716.patch b/debian/patches/12-svn_rev716.patch
new file mode 100644
index 0000000..75bbb04
--- /dev/null
+++ b/debian/patches/12-svn_rev716.patch
@@ -0,0 +1,39 @@
+Description: Quantise audio rendering to op frame rate.
+Origin: upstream, commit:716
+Applied-Upstream: commit:716
+---
+ src/callbacks.c |    2 +-
+ src/events.c    |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- lives.orig/src/callbacks.c
++++ lives/src/callbacks.c
+@@ -8975,7 +8975,7 @@ on_fade_audio_activate (GtkMenuItem
+ 
+   aud_fade(mainw->current_file,startt,endt,startv,endv);
+   audio_free_fnames();
+-  sleep(2);
++  sleep(1);
+   end_threaded_dialog();
+   d_print_done();
+ 
+--- lives.orig/src/events.c
++++ lives/src/events.c
+@@ -3203,7 +3203,7 @@ gint render_events (gboolean reset) {
+ 	  cfile->arate=cfile->undo_arate;
+ 	  cfile->arps=cfile->undo_arps;
+ 	  cfile->asampsize=cfile->undo_asampsize;
+-	  render_audio_segment(0, NULL, mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file, NULL, NULL, atime*U_SEC, tc+(U_SEC/cfile->fps*!is_blank), chvols, 1., 1., NULL);
++	  render_audio_segment(0, NULL, mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file, NULL, NULL, atime*U_SEC, q_gint64(tc,cfile->fps)+(U_SEC/cfile->fps*!is_blank), chvols, 1., 1., NULL);
+ 	}
+       }
+ 
+@@ -3245,7 +3245,7 @@ gint render_events (gboolean reset) {
+ 		cfile->arate=cfile->undo_arate;
+ 		cfile->arps=cfile->undo_arps;
+ 		cfile->asampsize=cfile->undo_asampsize;
+-		render_audio_segment(natracks, xaclips, mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file, xavel, xaseek, (atime*U_SEC+.5), tc+(U_SEC/cfile->fps*!is_blank), chvols, 1., 1., NULL);
++		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];
diff --git a/debian/patches/series b/debian/patches/series
index 5a9e490..4093691 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
 11-svn_rev715.patch
+12-svn_rev716.patch

-- 
lives packaging