[SCM] lives/master: Remove 12-svn_rev716.patch patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 71a3eca3a8a8efff98e2985fc969632f34aa4d8f
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Sep 15 17:20:34 2010 +0200

    Remove 12-svn_rev716.patch patch, applied upstream.

diff --git a/debian/patches/12-svn_rev716.patch b/debian/patches/12-svn_rev716.patch
deleted file mode 100644
index 44f6208..0000000
--- a/debian/patches/12-svn_rev716.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Quantise audio rendering to op frame rate.
-Origin: upstream, commit:716, commit:717
-Applied-Upstream: commit:717
----
- src/callbacks.c |    2 +-
- src/events.c    |   10 +++++-----
- 2 files changed, 6 insertions(+), 6 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);
- 	}
-       }
- 
-@@ -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;
--		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];
-+		    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
diff --git a/debian/patches/series b/debian/patches/series
index 1d433e2..5aa6a6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
-12-svn_rev716.patch
 13-svn_rev718.patch

-- 
lives packaging