summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-01-15 18:59:18 +0200
committerTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-01-15 18:59:18 +0200
commitc1c19e4d782a85149ead9485491253cb2e3ef084 (patch)
tree1b7817830964b3e1e06d910249fcf85e7c861d9f
parent7fd14b6f580fd427ebe4a869383ee76ecfe4ef5f (diff)
sink, source: Remove useless attach/detach stuff
The removed stuff wasn't used anywhere.
-rw-r--r--src/pulsecore/sink.c30
-rw-r--r--src/pulsecore/sink.h5
-rw-r--r--src/pulsecore/source.c30
-rw-r--r--src/pulsecore/source.h5
4 files changed, 0 insertions, 70 deletions
diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 672a884f..f4647b8b 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -2804,18 +2804,6 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse
return 0;
}
- case PA_SINK_MESSAGE_DETACH:
-
- /* Detach all streams */
- pa_sink_detach_within_thread(s);
- return 0;
-
- case PA_SINK_MESSAGE_ATTACH:
-
- /* Reattach all streams */
- pa_sink_attach_within_thread(s);
- return 0;
-
case PA_SINK_MESSAGE_GET_REQUESTED_LATENCY: {
pa_usec_t *usec = userdata;
@@ -2930,24 +2918,6 @@ int pa_sink_suspend_all(pa_core *c, bool suspend, pa_suspend_cause_t cause) {
return ret;
}
-/* Called from main thread */
-void pa_sink_detach(pa_sink *s) {
- pa_sink_assert_ref(s);
- pa_assert_ctl_context();
- pa_assert(PA_SINK_IS_LINKED(s->state));
-
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_DETACH, NULL, 0, NULL) == 0);
-}
-
-/* Called from main thread */
-void pa_sink_attach(pa_sink *s) {
- pa_sink_assert_ref(s);
- pa_assert_ctl_context();
- pa_assert(PA_SINK_IS_LINKED(s->state));
-
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_ATTACH, NULL, 0, NULL) == 0);
-}
-
/* Called from IO thread */
void pa_sink_detach_within_thread(pa_sink *s) {
pa_sink_input *i;
diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h
index ded80c0a..c7cb5f87 100644
--- a/src/pulsecore/sink.h
+++ b/src/pulsecore/sink.h
@@ -311,8 +311,6 @@ typedef enum pa_sink_message {
PA_SINK_MESSAGE_SET_STATE,
PA_SINK_MESSAGE_START_MOVE,
PA_SINK_MESSAGE_FINISH_MOVE,
- PA_SINK_MESSAGE_ATTACH,
- PA_SINK_MESSAGE_DETACH,
PA_SINK_MESSAGE_SET_LATENCY_RANGE,
PA_SINK_MESSAGE_GET_LATENCY_RANGE,
PA_SINK_MESSAGE_SET_FIXED_LATENCY,
@@ -395,9 +393,6 @@ void pa_sink_set_max_request(pa_sink *s, size_t max_request);
void pa_sink_set_latency_range(pa_sink *s, pa_usec_t min_latency, pa_usec_t max_latency);
void pa_sink_set_fixed_latency(pa_sink *s, pa_usec_t latency);
-void pa_sink_detach(pa_sink *s);
-void pa_sink_attach(pa_sink *s);
-
void pa_sink_set_soft_volume(pa_sink *s, const pa_cvolume *volume);
void pa_sink_volume_changed(pa_sink *s, const pa_cvolume *new_volume);
void pa_sink_mute_changed(pa_sink *s, bool new_muted);
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 6073b1d9..af4c6ecc 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -2170,18 +2170,6 @@ int pa_source_process_msg(pa_msgobject *object, int code, void *userdata, int64_
return 0;
}
- case PA_SOURCE_MESSAGE_DETACH:
-
- /* Detach all streams */
- pa_source_detach_within_thread(s);
- return 0;
-
- case PA_SOURCE_MESSAGE_ATTACH:
-
- /* Reattach all streams */
- pa_source_attach_within_thread(s);
- return 0;
-
case PA_SOURCE_MESSAGE_GET_REQUESTED_LATENCY: {
pa_usec_t *usec = userdata;
@@ -2298,24 +2286,6 @@ int pa_source_suspend_all(pa_core *c, bool suspend, pa_suspend_cause_t cause) {
return ret;
}
-/* Called from main thread */
-void pa_source_detach(pa_source *s) {
- pa_source_assert_ref(s);
- pa_assert_ctl_context();
- pa_assert(PA_SOURCE_IS_LINKED(s->state));
-
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_DETACH, NULL, 0, NULL) == 0);
-}
-
-/* Called from main thread */
-void pa_source_attach(pa_source *s) {
- pa_source_assert_ref(s);
- pa_assert_ctl_context();
- pa_assert(PA_SOURCE_IS_LINKED(s->state));
-
- pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_ATTACH, NULL, 0, NULL) == 0);
-}
-
/* Called from IO thread */
void pa_source_detach_within_thread(pa_source *s) {
pa_source_output *o;
diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h
index e7e9da99..f30543c7 100644
--- a/src/pulsecore/source.h
+++ b/src/pulsecore/source.h
@@ -250,8 +250,6 @@ typedef enum pa_source_message {
PA_SOURCE_MESSAGE_GET_LATENCY,
PA_SOURCE_MESSAGE_GET_REQUESTED_LATENCY,
PA_SOURCE_MESSAGE_SET_STATE,
- PA_SOURCE_MESSAGE_ATTACH,
- PA_SOURCE_MESSAGE_DETACH,
PA_SOURCE_MESSAGE_SET_LATENCY_RANGE,
PA_SOURCE_MESSAGE_GET_LATENCY_RANGE,
PA_SOURCE_MESSAGE_SET_FIXED_LATENCY,
@@ -331,9 +329,6 @@ void pa_source_set_max_rewind(pa_source *s, size_t max_rewind);
void pa_source_set_latency_range(pa_source *s, pa_usec_t min_latency, pa_usec_t max_latency);
void pa_source_set_fixed_latency(pa_source *s, pa_usec_t latency);
-void pa_source_detach(pa_source *s);
-void pa_source_attach(pa_source *s);
-
void pa_source_set_soft_volume(pa_source *s, const pa_cvolume *volume);
void pa_source_volume_changed(pa_source *s, const pa_cvolume *new_volume);
void pa_source_mute_changed(pa_source *s, bool new_muted);