[SCM] gsequencer/master: added missing to Bug#857930

[jkraehemann-guest at users.alioth.debian.org]

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

    added missing to Bug#857930

diff --git a/debian/patches/fix-gparamspec-mixed.diff b/debian/patches/fix-gparamspec-mixed.diff
index 5cd8488..42be47c 100644
--- a/debian/patches/fix-gparamspec-mixed.diff
+++ b/debian/patches/fix-gparamspec-mixed.diff
@@ -112,6 +112,106 @@
    g_object_class_install_property(gobject,
  				  PROP_RECALL,
  				  param_spec);
+@@ -1249,7 +1242,7 @@
+     {
+       AgsNotation *notation;
+ 
+-      notation = (AgsNotation *) g_value_get_object(value);
++      notation = (AgsNotation *) g_value_get_pointer(value);
+ 
+       if(notation == NULL ||
+ 	 g_list_find(audio->notation, notation) != NULL){
+@@ -1264,7 +1257,7 @@
+     {
+       AgsAutomation *automation;
+ 
+-      automation = (AgsAutomation *) g_value_get_object(value);
++      automation = (AgsAutomation *) g_value_get_pointer(value);
+ 
+       if(automation == NULL ||
+ 	 g_list_find(audio->automation, automation) != NULL){
+@@ -1279,7 +1272,7 @@
+     {
+       AgsRecallID *recall_id;
+ 
+-      recall_id = (AgsRecallID *) g_value_get_object(value);
++      recall_id = (AgsRecallID *) g_value_get_pointer(value);
+ 
+       if(recall_id == NULL ||
+ 	 g_list_find(audio->recall_id, recall_id) != NULL){
+@@ -1294,7 +1287,7 @@
+     {
+       AgsRecyclingContext *recycling_context;
+ 
+-      recycling_context = (AgsRecyclingContext *) g_value_get_object(value);
++      recycling_context = (AgsRecyclingContext *) g_value_get_pointer(value);
+ 
+       if(recycling_context == NULL ||
+ 	 g_list_find(audio->recycling_context, recycling_context) != NULL){
+@@ -1309,7 +1302,7 @@
+     {
+       AgsRecallContainer *recall_container;
+ 
+-      recall_container = (AgsRecallContainer *) g_value_get_object(value);
++      recall_container = (AgsRecallContainer *) g_value_get_pointer(value);
+ 
+       if(recall_container == NULL ||
+ 	 g_list_find(audio->container, recall_container) != NULL){
+@@ -1324,10 +1317,14 @@
+     {
+       AgsRecall *recall;
+ 
+-      recall = (AgsRecall *) g_value_get_object(value);
++      gboolean play_added;
++      
++      recall = (AgsRecall *) g_value_get_pointer(value);
++
++      play_added = (g_list_find(audio->play, recall) != NULL) ? TRUE: FALSE;
+ 
+       if(recall == NULL ||
+-	 g_list_find(audio->play, recall) != NULL){
++	 play_added){
+ 	return;
+       }
+ 
+@@ -1340,10 +1337,14 @@
+     {
+       AgsRecall *recall;
+ 
+-      recall = (AgsRecall *) g_value_get_object(value);
++      gboolean recall_added;
++      
++      recall = (AgsRecall *) g_value_get_pointer(value);
++      
++      recall_added = (g_list_find(audio->recall, recall) != NULL) ? TRUE: FALSE;
+ 
+       if(recall == NULL ||
+-	 g_list_find(audio->recall, recall) != NULL){
++	 recall_added){
+ 	return;
+       }
+ 
+@@ -1495,12 +1496,20 @@
+     break;
+   case PROP_PLAY:
+     {
++      pthread_mutex_lock(audio->play_mutex);
++      
+       g_value_set_pointer(value, g_list_copy(audio->play));
++
++      pthread_mutex_unlock(audio->play_mutex);
+     }
+     break;
+   case PROP_RECALL:
+     {
++      pthread_mutex_lock(audio->recall_mutex);
++      
+       g_value_set_pointer(value, g_list_copy(audio->recall));
++
++      pthread_mutex_unlock(audio->recall_mutex);
+     }
+     break;
+   default:
 --- a/ags/audio/ags_channel.c
 +++ b/ags/audio/ags_channel.c
 @@ -394,11 +394,10 @@
@@ -194,3 +294,87 @@
    g_object_class_install_property(gobject,
  				  PROP_PATTERN,
  				  param_spec);
+@@ -959,7 +954,7 @@
+     {
+       AgsRecallID *recall_id;
+ 
+-      recall_id = (AgsRecallID *) g_value_get_object(value);
++      recall_id = (AgsRecallID *) g_value_get_pointer(value);
+ 
+       if(recall_id == NULL ||
+ 	 g_list_find(channel->recall_id, recall_id) != NULL){
+@@ -974,7 +969,7 @@
+     {
+       AgsRecallContainer *recall_container;
+ 
+-      recall_container = (AgsRecallContainer *) g_value_get_object(value);
++      recall_container = (AgsRecallContainer *) g_value_get_pointer(value);
+ 
+       if(recall_container == NULL ||
+ 	 g_list_find(channel->container, recall_container) != NULL){
+@@ -989,10 +984,14 @@
+     {
+       AgsRecall *recall;
+ 
+-      recall = (AgsRecall *) g_value_get_object(value);
++      gboolean recall_added;
++      
++      recall = (AgsRecall *) g_value_get_pointer(value);
++
++      recall_added = (g_list_find(channel->recall, recall) != NULL) ? TRUE: FALSE;
+ 
+       if(recall == NULL ||
+-	 g_list_find(channel->recall, recall) != NULL){
++	 recall_added){
+ 	return;
+       }
+ 
+@@ -1005,10 +1004,14 @@
+     {
+       AgsRecall *play;
+ 
+-      play = (AgsRecall *) g_value_get_object(value);
++      gboolean play_added;
++      
++      play = (AgsRecall *) g_value_get_pointer(value);
+ 
++      play_added = (g_list_find(channel->play, play) != NULL) ? TRUE: FALSE;
++	    
+       if(play == NULL ||
+-	 g_list_find(channel->play, play) != NULL){
++	 play_added){
+ 	return;
+       }
+ 
+@@ -1036,7 +1039,7 @@
+     {
+       AgsPattern *pattern;
+ 
+-      pattern = (AgsPattern *) g_value_get_object(value);
++      pattern = (AgsPattern *) g_value_get_pointer(value);
+ 
+       if(pattern == NULL ||
+ 	 g_list_find(channel->pattern, pattern) != NULL){
+@@ -1131,13 +1134,22 @@
+     break;
+   case PROP_RECALL:
+     {
++      pthread_mutex_lock(channel->recall_mutex);
++      
+       g_value_set_pointer(value, g_list_copy(channel->recall));
++
++      pthread_mutex_unlock(channel->recall_mutex);
+     }
+     break;
+   case PROP_PLAY:
+     {
++      pthread_mutex_lock(channel->play_mutex);
++      
+       g_value_set_pointer(value, g_list_copy(channel->play));
++      
++      pthread_mutex_unlock(channel->play_mutex);      
+     }
++    break;
+   case PROP_LINK:
+     {
+       g_value_set_object(value, channel->link);

-- 
gsequencer packaging