[SCM] lives/master: Remove 13-svn_rev718.patch, applied upstream.

[alessio at users.alioth.debian.org]

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

    Remove 13-svn_rev718.patch, applied upstream.

diff --git a/debian/patches/13-svn_rev718.patch b/debian/patches/13-svn_rev718.patch
deleted file mode 100644
index 75fc6f4..0000000
--- a/debian/patches/13-svn_rev718.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Description: Add key to show sync stats.
- Small fix for 'nervous' key.
-Origin: upstream, commit:718
-Applied-Upstream: commit:718
----
- src/callbacks.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
- src/callbacks.h |    2 ++
- src/gui.c       |    2 ++
- 3 files changed, 48 insertions(+)
-
---- lives.orig/src/callbacks.c
-+++ lives/src/callbacks.c
-@@ -8241,10 +8241,54 @@ gboolean freeze_callback (GtkAccelGroup
- 
- gboolean nervous_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer clip_number)
- {
-+  if (mainw->multitrack!=NULL) return FALSE;
-   mainw->nervous=!mainw->nervous;
-   return TRUE;
- }
- 
-+
-+gboolean show_sync_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer clip_number)
-+{
-+  gdouble avsync;
-+  gchar *msg;
-+
-+  gint last_dprint_file;
-+
-+  if (mainw->playing_file<0) return FALSE;
-+
-+  if (cfile->frames==0||cfile->achans==0) return FALSE;
-+
-+  if (prefs->audio_player==AUD_PLAYER_JACK) {
-+#ifdef ENABLE_JACK
-+    if (mainw->jackd!=NULL&&mainw->jackd->in_use) avsync=(gdouble)mainw->pulsed->seek_pos/cfile->arate/cfile->achans/cfile->asampsize*8;
-+    else return FALSE;
-+#else
-+    return FALSE;
-+#endif
-+  }
-+
-+  if (prefs->audio_player==AUD_PLAYER_PULSE) {
-+#ifdef HAVE_PULSE_AUDIO
-+    if (mainw->pulsed!=NULL&&mainw->pulsed->in_use) avsync=(gdouble)mainw->pulsed->seek_pos/cfile->arate/cfile->achans/cfile->asampsize*8;
-+    else return FALSE;
-+#else
-+    return FALSE;
-+#endif
-+  }
-+  else return FALSE;
-+
-+  avsync-=(mainw->actual_frame-1.)/cfile->fps;
-+
-+  msg=g_strdup_printf(_("Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"),avsync,mainw->actual_frame,cfile->pb_fps);
-+  last_dprint_file=mainw->last_dprint_file;
-+  mainw->no_switch_dprint=TRUE;
-+  d_print(msg);
-+  mainw->no_switch_dprint=FALSE;
-+  mainw->last_dprint_file=last_dprint_file;
-+  g_free(msg);
-+  return TRUE;
-+}
-+
- 
- 
- gboolean storeclip_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer clip_number)
---- lives.orig/src/callbacks.h
-+++ lives/src/callbacks.h
-@@ -707,6 +707,8 @@ gboolean storeclip_callback (GtkAccelGro
- 
- gboolean nervous_callback (GtkAccelGroup *, GObject *, guint, GdkModifierType, gpointer user_data);
- 
-+gboolean show_sync_callback (GtkAccelGroup *group, GObject *obj, guint keyval, GdkModifierType mod, gpointer clip_number);
-+
- void on_save_set_activate (GtkMenuItem *, gpointer user_data);
- 
- void on_save_set_ok (void);
---- lives.orig/src/gui.c
-+++ lives/src/gui.c
-@@ -2197,6 +2197,8 @@ create_LiVES (void)
- 
-   gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_n, 0, 0, g_cclosure_new (G_CALLBACK (nervous_callback),NULL,NULL));
- 
-+  gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_w, 0, 0, g_cclosure_new (G_CALLBACK (show_sync_callback),NULL,NULL));
-+
-   if (FN_KEYS>0) {
-     gtk_accel_group_connect (GTK_ACCEL_GROUP (mainw->accel_group), GDK_F1, 0, 0, g_cclosure_new (G_CALLBACK (storeclip_callback),GINT_TO_POINTER (1),NULL));
-     if (FN_KEYS>1) {
diff --git a/debian/patches/series b/debian/patches/series
index 5aa6a6d..28e26b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-cdda2wav_to_icedax.patch
 02-drop_py3_multiencoder.patch
-13-svn_rev718.patch

-- 
lives packaging