[SCM] gsequencer/master: edited patch because not propert stripped
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 27d69e0d832d5b98d317f2cb76e9851af03bca24
Author: Joël Krähemann <jkraehemann-guest at users.alioth.debian.org>
Date: Thu Mar 16 20:29:22 2017 +0100
edited patch because not propert stripped
diff --git a/debian/patches/fix-gparamspec-mixed.diff b/debian/patches/fix-gparamspec-mixed.diff
index 42be47c..b4ce487 100644
--- a/debian/patches/fix-gparamspec-mixed.diff
+++ b/debian/patches/fix-gparamspec-mixed.diff
@@ -191,27 +191,6 @@
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 @@
@@ -355,26 +334,3 @@
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
More information about the pkg-multimedia-commits
mailing list