Skip to content

Commit 6f86b69

Browse files
committed
Remove cubeb_stream_device_destroy
Signed-off-by: Marcin Serwin <[email protected]>
1 parent 235fb0e commit 6f86b69

17 files changed

+0
-70
lines changed

include/cubeb/cubeb.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -705,15 +705,6 @@ CUBEB_EXPORT int
705705
cubeb_stream_set_input_processing_params(cubeb_stream * stream,
706706
cubeb_input_processing_params params);
707707

708-
/** Destroy a cubeb_device structure.
709-
@param stream the stream passed in cubeb_stream_get_current_device
710-
@param devices the devices to destroy
711-
@retval CUBEB_OK in case of success
712-
@retval CUBEB_ERROR_INVALID_PARAMETER if devices is an invalid pointer
713-
@retval CUBEB_ERROR_NOT_SUPPORTED */
714-
CUBEB_EXPORT int
715-
cubeb_stream_device_destroy(cubeb_stream * stream, cubeb_device * devices);
716-
717708
/** Set a callback to be notified when the output device changes.
718709
@param stream the stream for which to set the callback.
719710
@param device_changed_callback a function called whenever the device has

src/cubeb-internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ struct cubeb_ops {
6767
int (*stream_set_input_mute)(cubeb_stream * stream, int mute);
6868
int (*stream_set_input_processing_params)(
6969
cubeb_stream * stream, cubeb_input_processing_params params);
70-
int (*stream_device_destroy)(cubeb_stream * stream, cubeb_device * device);
7170
int (*stream_register_device_changed_callback)(
7271
cubeb_stream * stream,
7372
cubeb_device_changed_callback device_changed_callback);

src/cubeb.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -602,20 +602,6 @@ cubeb_stream_set_input_processing_params(cubeb_stream * stream,
602602
params);
603603
}
604604

605-
int
606-
cubeb_stream_device_destroy(cubeb_stream * stream, cubeb_device * device)
607-
{
608-
if (!stream || !device) {
609-
return CUBEB_ERROR_INVALID_PARAMETER;
610-
}
611-
612-
if (!stream->context->ops->stream_device_destroy) {
613-
return CUBEB_ERROR_NOT_SUPPORTED;
614-
}
615-
616-
return stream->context->ops->stream_device_destroy(stream, device);
617-
}
618-
619605
int
620606
cubeb_stream_register_device_changed_callback(
621607
cubeb_stream * stream,

src/cubeb_aaudio.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1957,7 +1957,6 @@ const static struct cubeb_ops aaudio_ops = {
19571957
/*.stream_get_current_device =*/nullptr,
19581958
/*.stream_set_input_mute =*/nullptr,
19591959
/*.stream_set_input_processing_params =*/nullptr,
1960-
/*.stream_device_destroy =*/nullptr,
19611960
/*.stream_register_device_changed_callback =*/nullptr,
19621961
/*.register_device_collection_changed =*/nullptr};
19631962

src/cubeb_alsa.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,5 @@ static struct cubeb_ops const alsa_ops = {
14881488
.stream_get_current_device = NULL,
14891489
.stream_set_input_mute = NULL,
14901490
.stream_set_input_processing_params = NULL,
1491-
.stream_device_destroy = NULL,
14921491
.stream_register_device_changed_callback = NULL,
14931492
.register_device_collection_changed = NULL};

src/cubeb_audiotrack.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,5 @@ static struct cubeb_ops const audiotrack_ops = {
470470
.stream_get_current_device = NULL,
471471
.stream_set_input_mute = NULL,
472472
.stream_set_input_processing_params = NULL,
473-
.stream_device_destroy = NULL,
474473
.stream_register_device_changed_callback = NULL,
475474
.register_device_collection_changed = NULL};

src/cubeb_audiounit.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3598,7 +3598,6 @@ cubeb_ops const audiounit_ops = {
35983598
/*.stream_get_current_device =*/NULL,
35993599
/*.stream_set_input_mute =*/NULL,
36003600
/*.stream_set_input_processing_params =*/NULL,
3601-
/*.stream_device_destroy =*/NULL,
36023601
/*.stream_register_device_changed_callback =*/
36033602
audiounit_stream_register_device_changed_callback,
36043603
/*.register_device_collection_changed =*/

src/cubeb_jack.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ static struct cubeb_ops const cbjack_ops = {
176176
.stream_get_current_device = cbjack_stream_get_current_device,
177177
.stream_set_input_mute = NULL,
178178
.stream_set_input_processing_params = NULL,
179-
.stream_device_destroy = cbjack_stream_device_destroy,
180179
.stream_register_device_changed_callback = NULL,
181180
.register_device_collection_changed = NULL};
182181

@@ -1095,12 +1094,6 @@ cbjack_stream_get_current_device(cubeb_stream * stm,
10951094
return CUBEB_OK;
10961095
}
10971096

1098-
static int
1099-
cbjack_stream_device_destroy(cubeb_stream * /*stream*/, cubeb_device * device)
1100-
{
1101-
return CUBEB_OK;
1102-
}
1103-
11041097
static int
11051098
cbjack_enumerate_devices(cubeb * context, cubeb_device_type type,
11061099
cubeb_device_collection * collection)

src/cubeb_kai.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,5 @@ static struct cubeb_ops const kai_ops = {
367367
/*.stream_get_current_device =*/NULL,
368368
/*.stream_set_input_mute =*/NULL,
369369
/*.stream_set_input_processing_params =*/NULL,
370-
/*.stream_device_destroy =*/NULL,
371370
/*.stream_register_device_changed_callback=*/NULL,
372371
/*.register_device_collection_changed=*/NULL};

src/cubeb_opensl.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1953,6 +1953,5 @@ struct cubeb_ops const opensl_ops = {
19531953
.stream_get_current_device = nullptr,
19541954
.stream_set_input_mute = nullptr,
19551955
.stream_set_input_processing_params = nullptr,
1956-
.stream_device_destroy = nullptr,
19571956
.stream_register_device_changed_callback = nullptr,
19581957
.register_device_collection_changed = nullptr};

0 commit comments

Comments
 (0)