|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid.spec
^
|
|
|
|
|
Changed |
_service
^
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-8.0.65.tar.bz2/src/common/droid-util.c
^
|
| @@ -2294,7 +2294,7 @@
return NULL;
}
-static int input_stream_open(pa_droid_stream *s, bool resume_from_suspend) {
+static int input_stream_open(pa_droid_stream *s) {
pa_droid_input_stream *input;
audio_stream_in_t *stream;
audio_source_t audio_source = AUDIO_SOURCE_DEFAULT;
@@ -2338,8 +2338,7 @@
pa_droid_hw_module_unlock(s->module);
if (ret < 0 || !stream) {
- pa_logl(resume_from_suspend ? PA_LOG_DEBUG : PA_LOG_ERROR,
- "Failed to open input stream: %d with device: %u flags: %u sample rate: %u channels: %u (%u) format: %u (%u)",
+ pa_log("Failed to open input stream: %d with device: %u flags: %u sample rate: %u channels: %u (%u) format: %u (%u)",
ret,
input->device,
0, /* AUDIO_INPUT_FLAG_NONE on v3. v1 and v2 don't have input flags. */
@@ -2426,7 +2425,7 @@
/* We need to open the stream for a while so that we can know
* what sample rate we get. We need the rate for droid source. */
- if ((ret = input_stream_open(s, false)) < 0)
+ if ((ret = input_stream_open(s)) < 0)
goto fail;
if ((input->sample_spec.rate = input->stream->common.get_sample_rate(&input->stream->common)) != spec->rate)
@@ -2730,7 +2729,7 @@
return s->input->stream->common.standby(&s->input->stream->common);
}
} else if (s->input->merged || pa_droid_quirk(s->module, QUIRK_CLOSE_INPUT))
- return input_stream_open(s, true);
+ return input_stream_open(s);
}
return 0;
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-8.0.65.tar.bz2/src/droid/droid-source.c
^
|
| @@ -79,7 +79,6 @@
pa_droid_card_data *card_data;
pa_droid_hw_module *hw_module;
pa_droid_stream *stream;
- bool stream_valid;
};
enum {
@@ -92,8 +91,6 @@
#define DROID_AUDIO_SOURCE_UNDEFINED "undefined"
static void userdata_free(struct userdata *u);
-static int suspend(struct userdata *u);
-static void unsuspend(struct userdata *u);
static int do_routing(struct userdata *u, audio_devices_t devices) {
int ret;
@@ -147,22 +144,8 @@
ssize_t readd;
pa_memchunk chunk;
- chunk.index = 0;
chunk.memblock = pa_memblock_new(u->core->mempool, (size_t) u->buffer_size);
- if (!u->stream_valid) {
- /* try to resume or post silence */
- unsuspend(u);
- if (!u->stream_valid) {
- p = pa_memblock_acquire(chunk.memblock);
- chunk.length = pa_memblock_get_length(chunk.memblock);
- memset(p, 0, chunk.length);
- pa_source_post(u->source, &chunk);
- pa_memblock_release(chunk.memblock);
- goto end;
- }
- }
-
p = pa_memblock_acquire(chunk.memblock);
readd = pa_droid_stream_read(u->stream, p, pa_memblock_get_length(chunk.memblock));
pa_memblock_release(chunk.memblock);
@@ -174,6 +157,7 @@
u->timestamp += pa_bytes_to_usec(readd, &u->source->sample_spec);
+ chunk.index = 0;
chunk.length = readd;
if (u->resampler) {
@@ -266,11 +250,8 @@
pa_assert(u);
pa_assert(u->stream);
- if (pa_droid_stream_suspend(u->stream, false) >= 0) {
- u->stream_valid = true;
- pa_log_info("Resuming...");
- } else
- u->stream_valid = false;
+ pa_droid_stream_suspend(u->stream, false);
+ pa_log_info("Resuming...");
}
/* Called from IO context */
@@ -283,9 +264,9 @@
pa_assert(PA_SOURCE_IS_OPENED(u->source->thread_info.state));
- suspend(u);
+ pa_droid_stream_suspend(u->stream, true);
do_routing(u, device);
- unsuspend(u);
+ pa_droid_stream_suspend(u->stream, false);
break;
}
@@ -583,7 +564,6 @@
}
u = pa_xnew0(struct userdata, 1);
- u->stream_valid = true;
u->core = m->core;
u->module = m;
u->card = card;
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-8.0.65.tar.bz2/src/droid/module-droid-card.c
^
|
| @@ -816,15 +816,8 @@
u->modargs = ma;
u->module = m;
-#if (PULSEAUDIO_VERSION >= 10)
- pa_card_choose_initial_profile(u->card);
-#endif
init_profile(u);
-#if (PULSEAUDIO_VERSION >= 10)
- pa_card_put(u->card);
-#endif
-
return 0;
fail:
|
