Skip to content

Commit 9b9422d

Browse files
committed
libobs: Rename volmeter_callback 'cb' to 'callback_object' in multiple functions
1 parent ffa0ede commit 9b9422d

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

libobs/obs-audio-controls.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ static void signal_levels_updated(struct obs_volmeter *volmeter, const float mag
199199
{
200200
pthread_mutex_lock(&volmeter->callback_mutex);
201201
for (size_t i = volmeter->callbacks.num; i > 0; i--) {
202-
struct volmeter_callback cb = volmeter->callbacks.array[i - 1];
203-
cb.callback(cb.param, magnitude, peak, input_peak);
202+
struct volmeter_callback callback_object = volmeter->callbacks.array[i - 1];
203+
callback_object.callback(callback_object.param, magnitude, peak, input_peak);
204204
}
205205
pthread_mutex_unlock(&volmeter->callback_mutex);
206206
}
@@ -840,25 +840,25 @@ int obs_volmeter_get_nr_channels(obs_volmeter_t *volmeter)
840840

841841
void obs_volmeter_add_callback(obs_volmeter_t *volmeter, obs_volmeter_updated_t callback, void *param)
842842
{
843-
struct volmeter_callback cb = {callback, param};
843+
struct volmeter_callback callback_object = {callback, param};
844844

845845
if (!obs_ptr_valid(volmeter, "obs_volmeter_add_callback"))
846846
return;
847847

848848
pthread_mutex_lock(&volmeter->callback_mutex);
849-
da_push_back(volmeter->callbacks, &cb);
849+
da_push_back(volmeter->callbacks, &callback_object);
850850
pthread_mutex_unlock(&volmeter->callback_mutex);
851851
}
852852

853853
void obs_volmeter_remove_callback(obs_volmeter_t *volmeter, obs_volmeter_updated_t callback, void *param)
854854
{
855-
struct volmeter_callback cb = {callback, param};
855+
struct volmeter_callback callback_object = {callback, param};
856856

857857
if (!obs_ptr_valid(volmeter, "obs_volmeter_remove_callback"))
858858
return;
859859

860860
pthread_mutex_lock(&volmeter->callback_mutex);
861-
da_erase_item(volmeter->callbacks, &cb);
861+
da_erase_item(volmeter->callbacks, &callback_object);
862862
pthread_mutex_unlock(&volmeter->callback_mutex);
863863
}
864864

0 commit comments

Comments
 (0)