SymbX/feedbackd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fbd-dev-sound: Rename cancellable to cancel

Browse Source 
The current name is just confusing
This commit is contained in:
Guido Günther
2021-10-15 15:10:31 +02:00
parent f13c7484bf
commit 48c05be29d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fbd-dev-sound.c
+5 -5
View File
@@ -30,7 +30,7 @@ typedef struct _FbdAsyncData {
FbdDevSoundPlayedCallback callback; FbdDevSoundPlayedCallback callback;
FbdFeedbackSound *feedback; FbdFeedbackSound *feedback;
FbdDevSound *dev; FbdDevSound *dev;
GCancellable *playback; GCancellable *cancel;
} FbdAsyncData; } FbdAsyncData;
typedef struct _FbdDevSound { typedef struct _FbdDevSound {
@@ -81,7 +81,7 @@ fbd_async_data_new (FbdDevSound *dev, FbdFeedbackSound *feedback, FbdDevSoundPla
data->callback = callback; data->callback = callback;
data->feedback = g_object_ref (feedback); data->feedback = g_object_ref (feedback);
data->dev = g_object_ref (dev); data->dev = g_object_ref (dev);
data->playback = g_cancellable_new (); data->cancel = g_cancellable_new ();
return data; return data;
} }
@@ -91,7 +91,7 @@ fbd_async_data_dispose (FbdAsyncData *object)
{ {
g_object_unref (object->feedback); g_object_unref (object->feedback);
g_object_unref (object->dev); g_object_unref (object->dev);
g_object_unref (object->playback); g_object_unref (object->cancel);
g_free (object); g_free (object);
} }
@@ -206,7 +206,7 @@ fbd_dev_sound_play (FbdDevSound *self, FbdFeedbackSound *feedback, FbdDevSoundPl
g_hash_table_insert (self->playbacks, feedback, data); g_hash_table_insert (self->playbacks, feedback, data);
gsound_context_play_full (self->ctx, data->playback, gsound_context_play_full (self->ctx, data->cancel,
(GAsyncReadyCallback) on_sound_play_finished_callback, (GAsyncReadyCallback) on_sound_play_finished_callback,
data, data,
GSOUND_ATTR_EVENT_ID, fbd_feedback_sound_get_effect (feedback), GSOUND_ATTR_EVENT_ID, fbd_feedback_sound_get_effect (feedback),
@@ -228,7 +228,7 @@ fbd_dev_sound_stop (FbdDevSound *self, FbdFeedbackSound *feedback)
if (data == NULL) if (data == NULL)
return FALSE; return FALSE;
g_cancellable_cancel (data->playback); g_cancellable_cancel (data->cancel);
return TRUE; return TRUE;
} }