[SCM] gsequencer/master: refresh patch because of fuzz

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Thu Mar 16 21:05:11 UTC 2017


The following commit has been merged in the master branch:
commit f7252bd5fb68122095c2c02ce6fbf43c996c6f76
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Thu Mar 16 20:25:23 2017 +0100

    refresh patch because of fuzz

diff --git a/debian/patches/fix-broken-thread-frequency.diff b/debian/patches/fix-broken-thread-frequency.diff
index 13138bb..badb270 100644
--- a/debian/patches/fix-broken-thread-frequency.diff
+++ b/debian/patches/fix-broken-thread-frequency.diff
@@ -223,7 +223,7 @@
  
  #include <math.h>
  
-@@ -252,6 +253,9 @@
+@@ -250,6 +251,9 @@
      {
        GObject *soundcard;
  
@@ -233,7 +233,7 @@
        soundcard = (GObject *) g_value_get_object(value);
  
        if(export_thread->soundcard != NULL){
-@@ -261,9 +265,22 @@
+@@ -259,9 +263,22 @@
        if(soundcard != NULL){
  	g_object_ref(G_OBJECT(soundcard));
  
@@ -336,7 +336,7 @@
  #endif /*__AGS_MAIN_LOOP_H__*/
 --- a/ags/audio/thread/ags_audio_loop.c
 +++ b/ags/audio/thread/ags_audio_loop.c
-@@ -292,6 +292,7 @@
+@@ -271,6 +271,7 @@
    main_loop->get_last_sync = ags_audio_loop_get_last_sync;
    main_loop->interrupt = NULL;
    main_loop->monitor = ags_audio_loop_monitor;
@@ -344,10 +344,11 @@
  }
  
  void
-@@ -694,6 +695,74 @@
+@@ -592,6 +593,74 @@
+   }
  }
  
- void
++void
 +ags_audio_loop_change_frequency(AgsMainLoop *main_loop,
 +				gdouble frequency)
 +{
@@ -415,14 +416,13 @@
 +  }
 +}
 +
-+void
+ void
  ags_audio_loop_finalize(GObject *gobject)
  {
-   AgsAudioLoop *audio_loop;
 --- a/ags/audio/recall/ags_delay_audio.c
 +++ b/ags/audio/recall/ags_delay_audio.c
-@@ -43,10 +43,20 @@
- void ags_delay_audio_dispose(GObject *gobject);
+@@ -42,10 +42,20 @@
+ void ags_delay_audio_set_ports(AgsPlugin *plugin, GList *port);
  void ags_delay_audio_finalize(GObject *gobject);
  
 +void ags_delay_audio_notify_audio_callback(GObject *gobject,
@@ -442,7 +442,7 @@
  gdouble ags_delay_audio_get_bpm(AgsTactable *tactable);
  gdouble ags_delay_audio_get_tact(AgsTactable *tactable);
  gdouble ags_delay_audio_get_sequencer_duration(AgsTactable *tactable);
-@@ -56,6 +66,8 @@
+@@ -55,6 +65,8 @@
  void ags_delay_audio_change_sequencer_duration(AgsTactable *tactable, gdouble duration);
  void ags_delay_audio_change_notation_duration(AgsTactable *tactable, gdouble duration);
  
@@ -451,7 +451,7 @@
  /**
   * SECTION:ags_delay_audio
   * @short_description: delay audio 
-@@ -328,7 +340,11 @@
+@@ -326,7 +338,11 @@
    AGS_RECALL(delay_audio)->build_id = AGS_RECALL_DEFAULT_BUILD_ID;
    AGS_RECALL(delay_audio)->xml_type = "ags-delay-audio\0";
  
@@ -464,7 +464,7 @@
  			 G_CALLBACK(ags_delay_audio_notify_soundcard_callback), NULL);
  }
  
-@@ -642,6 +658,30 @@
+@@ -590,6 +606,30 @@
  }
  
  void
@@ -495,7 +495,7 @@
  ags_delay_audio_notify_soundcard_callback(GObject *gobject,
  					  GParamSpec *pspec,
  					  gpointer user_data)
-@@ -658,6 +698,11 @@
+@@ -606,6 +646,11 @@
    delay_audio = AGS_DELAY_AUDIO(gobject);
  
    soundcard = AGS_RECALL(delay_audio)->soundcard;
@@ -507,7 +507,7 @@
    port = NULL;
  
    /*  */
-@@ -776,6 +821,30 @@
+@@ -706,6 +751,30 @@
    AGS_RECALL(delay_audio)->port = port;
  }
  
@@ -538,7 +538,7 @@
  gdouble
  ags_delay_audio_get_bpm(AgsTactable *tactable)
  {
-@@ -954,6 +1023,59 @@
+@@ -884,6 +953,59 @@
  
    /* notation-duration */
    g_value_reset(&value);

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list