[SCM] gsequencer/master: wish patches improvements

jkraehemann-guest at users.alioth.debian.org jkraehemann-guest at users.alioth.debian.org
Fri Feb 3 13:19:06 UTC 2017


The following commit has been merged in the master branch:
commit 91f602c6a1c65d3e2a9ed1a519006b325f833765
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date:   Fri Feb 3 14:15:15 2017 +0100

    wish patches improvements

diff --git a/debian/patches/series b/debian/patches/series
index 42da52a..d5bd9cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+wish-line-c.patch
 wish-effect-line-c.patch
 fix-channel.patch
 fix-gsequencer-main.patch
@@ -19,7 +20,6 @@ wish-line-member.patch
 wish-line-h.patch
 wish-line-callbacks-h.patch
 wish-line-callbacks-c.patch
-wish-line-c.patch
 wish-ladspa-browser-callbacks.patch
 wish-ladspa-browser-c.patch
 wish-hindicator.patch
diff --git a/debian/patches/wish-effect-line-c.patch b/debian/patches/wish-effect-line-c.patch
index 566a83a..29e58b3 100644
--- a/debian/patches/wish-effect-line-c.patch
+++ b/debian/patches/wish-effect-line-c.patch
@@ -1,10 +1,10 @@
 Description: This is a wishlist patch. It creates the output widgets available
  in provided by a plugin added by user via machine editor.
- AgsFFPlayer and AgsSynth use this widget to enable the user to assign plugins
- to input lines.
+ AgsFFPlayer uses this widget to enable the user to assign plugins to input
+ lines.
 Author: Joël Krähmann <jkraehemann at gmail.com>
 Applied-Upstream: 0.7.122.x, http://git.savannah.gnu.org/cgit/gsequencer.git
-Last-Update: 2017-02-02
+Last-Update: 2017-02-03
 --- a/ags/X/ags_effect_line.c
 +++ b/ags/X/ags_effect_line.c
 @@ -43,9 +43,13 @@
@@ -179,14 +179,12 @@ Last-Update: 2017-02-02
    recall = g_list_last(recall);
    port = AGS_RECALL(recall->data)->port;
  
-@@ -613,10 +684,27 @@
+@@ -613,8 +684,25 @@
    recall = g_list_last(recall);
  
    recall_port = AGS_RECALL(recall->data)->port;
 -  g_list_free(recall_start);
  
-   pthread_mutex_unlock(channel_mutex);
- 
 +  /* recall handler of output port */
 +  if(has_output_port){
 +    AgsRecall *recall_channel_run_dummy;
@@ -204,10 +202,10 @@ Last-Update: 2017-02-02
 +  }
 +
 +  g_list_free(recall_start);
-+
-   /* load ports */
-   port_descriptor = AGS_BASE_PLUGIN(ladspa_plugin)->port;
++  
+   pthread_mutex_unlock(channel_mutex);
  
+   /* load ports */
 @@ -641,9 +729,17 @@
        }
        
@@ -338,8 +336,7 @@ Last-Update: 2017-02-02
    recall_port = AGS_RECALL(recall->data)->port;
 -  g_list_free(recall_start);
  
-   pthread_mutex_unlock(channel_mutex);
-+
+-  pthread_mutex_unlock(channel_mutex);
 +  /* recall handler of output port */
 +  if(has_output_port){
 +    AgsRecall *recall_channel_run_dummy;
@@ -355,8 +352,10 @@ Last-Update: 2017-02-02
 +
 +    ags_recall_add_handler(AGS_RECALL(recall_channel_run_dummy), recall_handler);
 +  }
-   
++  
 +  g_list_free(recall_start);
+   
++  pthread_mutex_unlock(channel_mutex);
 +
    /* load ports */
    port_descriptor = AGS_BASE_PLUGIN(lv2_plugin)->port;
diff --git a/debian/patches/wish-line-c.patch b/debian/patches/wish-line-c.patch
index c197867..27fa477 100644
--- a/debian/patches/wish-line-c.patch
+++ b/debian/patches/wish-line-c.patch
@@ -1,9 +1,10 @@
 Description: This is a wishlist patch. It modifies the recall callback handler
  to use the generic callback ags_line_output_port_run_post_callback().
- This is used by AgsSynthInputLine, AgsDrumInputLine and AgsMixerInputLine.
+ This is used by AgsSynthInputLine, AgsDrumInputLine, AgsMixerInputLine and
+ AgsPanelInputLine.
 Author: Joël Krähmann <jkraehemann at gmail.com>
 Applied-Upstream: 0.7.122.x, http://git.savannah.gnu.org/cgit/gsequencer.git
-Last-Update: 2017-02-02
+Last-Update: 2017-02-03
 --- a/ags/X/ags_line.c
 +++ b/ags/X/ags_line.c
 @@ -43,11 +43,15 @@
@@ -134,8 +135,7 @@ Last-Update: 2017-02-02
    recall = g_list_last(recall);
    port = AGS_RECALL(recall->data)->port;
  
-   g_list_free(recall_start);
- 
+-  g_list_free(recall_start);
 +  /* check has output port */
 +  if((AGS_RECALL_HAS_OUTPUT_PORT & (AGS_RECALL(recall->data)->flags)) != 0){
 +    has_output_port = TRUE;
@@ -151,7 +151,7 @@ Last-Update: 2017-02-02
 +    
 +    /* alloc handler */
 +    recall_handler = (AgsRecallHandler *) malloc(sizeof(AgsRecallHandler));
-+
+ 
 +    recall_handler->signal_name = "run-post\0";
 +    recall_handler->callback = G_CALLBACK(ags_line_output_port_run_post_callback);
 +    recall_handler->data = (gpointer) line;
@@ -159,15 +159,18 @@ Last-Update: 2017-02-02
 +    ags_recall_add_handler(AGS_RECALL(recall_channel_run_dummy), recall_handler);
 +  }
 +  
++  g_list_free(recall_start);
++  
 +  /* recall - find ports */
    recall_start = 
      recall = ags_recall_get_by_effect(line->channel->recall,
  				      filename,
-@@ -812,13 +864,29 @@
-   g_list_free(recall_start);
+@@ -809,8 +861,25 @@
+   recall = g_list_last(recall);
+ 
+   recall_port = AGS_RECALL(recall->data)->port;
+-  g_list_free(recall_start);
  
-   pthread_mutex_unlock(channel_mutex);
-+
 +  /* recall handler of output port */
 +  if(has_output_port){
 +    AgsRecall *recall_channel_run_dummy;
@@ -183,9 +186,13 @@ Last-Update: 2017-02-02
 +
 +    ags_recall_add_handler(AGS_RECALL(recall_channel_run_dummy), recall_handler);
 +  }
++  
++  g_list_free(recall_start);
++  
+   pthread_mutex_unlock(channel_mutex);
    
    /* load ports */
-   port_descriptor = AGS_BASE_PLUGIN(ladspa_plugin)->port;
+@@ -818,7 +887,7 @@
  
    port_count = g_list_length(port_descriptor);
    k = 0;
@@ -194,7 +201,7 @@ Last-Update: 2017-02-02
    while(port_descriptor != NULL){
      if((AGS_PORT_DESCRIPTOR_CONTROL & (AGS_PORT_DESCRIPTOR(port_descriptor->data)->flags)) != 0){
        GtkWidget *child_widget;
-@@ -830,9 +898,17 @@
+@@ -830,9 +899,17 @@
        guint step_count;
        
        if((AGS_PORT_DESCRIPTOR_TOGGLED & (AGS_PORT_DESCRIPTOR(port_descriptor->data)->flags)) != 0){
@@ -214,7 +221,7 @@ Last-Update: 2017-02-02
        }
  
        if(control_type_name != NULL){
-@@ -943,8 +1019,15 @@
+@@ -943,8 +1020,15 @@
  				 upper_bound);
  	gtk_adjustment_set_value(adjustment,
  				 g_value_get_float(AGS_PORT_DESCRIPTOR(port_descriptor->data)->default_value));
@@ -231,7 +238,7 @@ Last-Update: 2017-02-02
  #ifdef AGS_DEBUG
        g_message("ladspa bounds: %f %f\0", lower_bound, upper_bound);
  #endif
-@@ -977,6 +1060,8 @@
+@@ -977,6 +1061,8 @@
    AgsLineMember *line_member;
    GtkAdjustment *adjustment;
  
@@ -240,7 +247,7 @@ Last-Update: 2017-02-02
    AgsLv2Plugin *lv2_plugin;
  
    AgsMutexManager *mutex_manager;
-@@ -991,12 +1076,18 @@
+@@ -991,12 +1077,18 @@
  
    gdouble step;
    guint port_count;
@@ -259,7 +266,7 @@ Last-Update: 2017-02-02
    /* load plugin */
    lv2_plugin = ags_lv2_manager_find_lv2_plugin(ags_lv2_manager_get_instance(),
  					       filename, effect);
-@@ -1015,10 +1106,6 @@
+@@ -1015,10 +1107,6 @@
      list = list->next;
    }
  
@@ -270,7 +277,7 @@ Last-Update: 2017-02-02
    /* get channel mutex */
    pthread_mutex_lock(application_mutex);
  
-@@ -1027,7 +1114,7 @@
+@@ -1027,7 +1115,7 @@
    
    pthread_mutex_unlock(application_mutex);
    
@@ -279,9 +286,9 @@ Last-Update: 2017-02-02
    pthread_mutex_lock(channel_mutex);
    
    recall_start =
-@@ -1046,6 +1133,30 @@
- 
-   g_list_free(recall_start);
+@@ -1044,8 +1132,32 @@
+   recall = g_list_last(recall);
+   port = AGS_RECALL(recall->data)->port;
  
 +  /* check has output port */
 +  if((AGS_RECALL_HAS_OUTPUT_PORT & (AGS_RECALL(recall->data)->flags)) != 0){
@@ -305,19 +312,20 @@ Last-Update: 2017-02-02
 +
 +    ags_recall_add_handler(AGS_RECALL(recall_channel_run_dummy), recall_handler);
 +  }
-+
++  
+   g_list_free(recall_start);
+ 
 +  /* recall - find ports */
    recall_start = 
      recall = ags_recall_get_by_effect(line->channel->recall,
  				      filename,
-@@ -1055,8 +1166,24 @@
+@@ -1053,10 +1165,27 @@
+   recall = g_list_last(recall);
+ 
    recall_port = AGS_RECALL(recall->data)->port;
-   g_list_free(recall_start);
+-  g_list_free(recall_start);
  
 -  pthread_mutex_unlock(channel_mutex);
--  
-+  pthread_mutex_unlock(channel_mutex);  
-+
 +  /* recall handler of output port */
 +  if(has_output_port){
 +    AgsRecall *recall_channel_run_dummy;
@@ -333,11 +341,15 @@ Last-Update: 2017-02-02
 +
 +    ags_recall_add_handler(AGS_RECALL(recall_channel_run_dummy), recall_handler);
 +  }
+   
++  g_list_free(recall_start);
++  
++  pthread_mutex_unlock(channel_mutex);
 +
    /* load ports */
    port_descriptor = AGS_BASE_PLUGIN(lv2_plugin)->port;
  
-@@ -1075,9 +1202,17 @@
+@@ -1075,9 +1204,17 @@
        guint step_count;
        
        if((AGS_PORT_DESCRIPTOR_TOGGLED & (AGS_PORT_DESCRIPTOR(port_descriptor->data)->flags)) != 0){
@@ -357,7 +369,7 @@ Last-Update: 2017-02-02
        }
  
        if(control_type_name != NULL){
-@@ -1163,6 +1298,12 @@
+@@ -1163,6 +1300,12 @@
  				 upper_bound);
  	gtk_adjustment_set_value(adjustment,
  				 g_value_get_float(AGS_PORT_DESCRIPTOR(port_descriptor->data)->default_value));
@@ -370,7 +382,7 @@ Last-Update: 2017-02-02
        }
  
  #ifdef AGS_DEBUG
-@@ -1348,6 +1489,10 @@
+@@ -1348,6 +1491,10 @@
      while(control != NULL){
        if(AGS_IS_LINE_MEMBER(control->data) &&
  	 AGS_LINE_MEMBER(control->data)->port == port->data){
@@ -381,7 +393,7 @@ Last-Update: 2017-02-02
  	/* collect specifier */
  	if(remove_specifier == NULL){
  	  remove_specifier = (gchar **) malloc(2 * sizeof(gchar *));
-@@ -1360,6 +1505,12 @@
+@@ -1360,6 +1507,12 @@
  	i++;
  
  	/* remove widget */
@@ -394,7 +406,7 @@ Last-Update: 2017-02-02
  	ags_expander_remove(line->expander,
  			    control->data);
  
-@@ -1544,7 +1685,7 @@
+@@ -1544,7 +1697,7 @@
  gboolean
  ags_line_indicator_queue_draw_timeout(GtkWidget *widget)
  {

-- 
gsequencer packaging



More information about the pkg-multimedia-commits mailing list