mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

waveout: fix wrong input device

Browse source 
Both input and output device were chosen with the same device number.
This is problematic as those numbers don't have to correspond.
Additionally the input device was named after the output device. This
commit adresses both issues by providing specific parameters for each
type.
This commit is contained in:
Moritz Bruder 2017-03-01 19:29:52 +01:00 • committed by Tanu Kaskinen
parent e1dc75da99
commit 7259df9590
1 changed files with 62 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

89
src/modules/module-waveout.c
View file

@ -24,6 +24,7 @@
#include <windows.h> #include <windows.h>
#include <mmsystem.h> #include <mmsystem.h>
#include <string.h>
#include <pulse/xmalloc.h> #include <pulse/xmalloc.h>
#include <pulse/timeval.h> #include <pulse/timeval.h>
@ -46,8 +47,10 @@ PA_MODULE_VERSION(PACKAGE_VERSION);
PA_MODULE_USAGE( PA_MODULE_USAGE(
"sink_name=<name for the sink> " "sink_name=<name for the sink> "
"source_name=<name for the source> " "source_name=<name for the source> "
"device=<device number> " "output_device=<device number for the sink> "
"device_name=<name of the device> " "output_device_name=<name of the output device> "
"input_device=<device number for the source> "
"input_device_name=<name of the input device> "
"record=<enable source?> " "record=<enable source?> "
"playback=<enable sink?> " "playback=<enable sink?> "
"format=<sample format> " "format=<sample format> "
@ -92,8 +95,10 @@ struct userdata {
static const char* const valid_modargs[] = { static const char* const valid_modargs[] = {
"sink_name", "sink_name",
"source_name", "source_name",
"device", "output_device",
"device_name", "output_device_name",
"input_device",
"input_device_name",
"record", "record",
"playback", "playback",
"fragments", "fragments",
@ -495,14 +500,17 @@ int pa__init(pa_module *m) {
HWAVEIN hwi = INVALID_HANDLE_VALUE; HWAVEIN hwi = INVALID_HANDLE_VALUE;
WAVEFORMATEX wf; WAVEFORMATEX wf;
WAVEOUTCAPS pwoc; WAVEOUTCAPS pwoc;
WAVEINCAPS pwic;
MMRESULT result; MMRESULT result;
int nfrags, frag_size; int nfrags, frag_size;
bool record = true, playback = true; bool record = true, playback = true;
unsigned int device; unsigned int input_device;
unsigned int output_device;
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
pa_modargs *ma = NULL; pa_modargs *ma = NULL;
const char *device_name = NULL; const char *input_device_name = NULL;
const char *output_device_name = NULL;
unsigned int i; unsigned int i;
pa_assert(m); pa_assert(m);
@ -523,31 +531,58 @@ int pa__init(pa_module *m) {
goto fail; goto fail;
} }
/* Set the device to be opened. If set device_name is used, /* Set the output_device to be opened. If set output_device_name is used,
* else device if set and lastly WAVE_MAPPER is the default */ * else output_device if set and lastly WAVE_MAPPER is the default */
device = WAVE_MAPPER; output_device = WAVE_MAPPER;
if (pa_modargs_get_value_u32(ma, "device", &device) < 0) { if (pa_modargs_get_value_u32(ma, "output_device", &output_device) < 0) {
pa_log("failed to parse device argument"); pa_log("failed to parse output_device argument");
goto fail; goto fail;
} }
if ((device_name = pa_modargs_get_value(ma, "device_name", NULL)) != NULL) { if ((output_device_name = pa_modargs_get_value(ma, "output_device_name", NULL)) != NULL) {
unsigned int num_devices = waveOutGetNumDevs(); unsigned int num_output_devices = waveOutGetNumDevs();
for (i = 0; i < num_devices; i++) { for (i = 0; i < num_output_devices; i++) {
if (waveOutGetDevCaps(i, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR) if (waveOutGetDevCaps(i, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR)
if (_stricmp(device_name, pwoc.szPname) == 0) if (strcmp(output_device_name, pwoc.szPname) == 0)
break; break;
} }
if (i < num_devices) if (i < num_output_devices)
device = i; output_device = i;
else { else {
pa_log("device not found: %s", device_name); pa_log("output_device not found: %s", output_device_name);
goto fail; goto fail;
} }
} }
if (waveOutGetDevCaps(device, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR) if (waveOutGetDevCaps(output_device, &pwoc, sizeof(pwoc)) == MMSYSERR_NOERROR)
device_name = pwoc.szPname; output_device_name = pwoc.szPname;
else else
device_name = "unknown"; output_device_name = "unknown";
/* Set the input_device to be opened. If set input_device_name is used,
* else input_device if set and lastly WAVE_MAPPER is the default */
input_device = WAVE_MAPPER;
if (pa_modargs_get_value_u32(ma, "input_device", &input_device) < 0) {
pa_log("failed to parse input_device argument");
goto fail;
}
if ((input_device_name = pa_modargs_get_value(ma, "input_device_name", NULL)) != NULL) {
unsigned int num_input_devices = waveInGetNumDevs();
for (i = 0; i < num_input_devices; i++) {
if (waveInGetDevCaps(i, &pwic, sizeof(pwic)) == MMSYSERR_NOERROR)
if (strcmp(input_device_name, pwic.szPname) == 0)
break;
}
if (i < num_input_devices)
input_device = i;
else {
pa_log("input_device not found: %s", input_device_name);
goto fail;
}
}
if (waveInGetDevCaps(input_device, &pwic, sizeof(pwic)) == MMSYSERR_NOERROR)
input_device_name = pwic.szPname;
else
input_device_name = "unknown";
nfrags = 5; nfrags = 5;
frag_size = 8192; frag_size = 8192;
@ -568,12 +603,12 @@ int pa__init(pa_module *m) {
u = pa_xmalloc(sizeof(struct userdata)); u = pa_xmalloc(sizeof(struct userdata));
if (record) { if (record) {
result = waveInOpen(&hwi, device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY); result = waveInOpen(&hwi, input_device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY);
if (result != MMSYSERR_NOERROR) { if (result != MMSYSERR_NOERROR) {
pa_log_warn("Sample spec not supported by WaveIn, falling back to default sample rate."); pa_log_warn("Sample spec not supported by WaveIn, falling back to default sample rate.");
ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate; ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate;
} }
result = waveInOpen(&hwi, device, &wf, (DWORD_PTR) chunk_ready_cb, (DWORD_PTR) u, CALLBACK_FUNCTION); result = waveInOpen(&hwi, input_device, &wf, (DWORD_PTR) chunk_ready_cb, (DWORD_PTR) u, CALLBACK_FUNCTION);
if (result != MMSYSERR_NOERROR) { if (result != MMSYSERR_NOERROR) {
char errortext[MAXERRORLENGTH]; char errortext[MAXERRORLENGTH];
pa_log("Failed to open WaveIn."); pa_log("Failed to open WaveIn.");
@ -588,12 +623,12 @@ int pa__init(pa_module *m) {
} }
if (playback) { if (playback) {
result = waveOutOpen(&hwo, device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY); result = waveOutOpen(&hwo, output_device, &wf, 0, 0, WAVE_FORMAT_DIRECT | WAVE_FORMAT_QUERY);
if (result != MMSYSERR_NOERROR) { if (result != MMSYSERR_NOERROR) {
pa_log_warn("Sample spec not supported by WaveOut, falling back to default sample rate."); pa_log_warn("Sample spec not supported by WaveOut, falling back to default sample rate.");
ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate; ss.rate = wf.nSamplesPerSec = m->core->default_sample_spec.rate;
} }
result = waveOutOpen(&hwo, device, &wf, (DWORD_PTR) chunk_done_cb, (DWORD_PTR) u, CALLBACK_FUNCTION); result = waveOutOpen(&hwo, output_device, &wf, (DWORD_PTR) chunk_done_cb, (DWORD_PTR) u, CALLBACK_FUNCTION);
if (result != MMSYSERR_NOERROR) { if (result != MMSYSERR_NOERROR) {
char errortext[MAXERRORLENGTH]; char errortext[MAXERRORLENGTH];
pa_log("Failed to open WaveOut."); pa_log("Failed to open WaveOut.");
@ -613,7 +648,7 @@ int pa__init(pa_module *m) {
pa_source_new_data_set_sample_spec(&data, &ss); pa_source_new_data_set_sample_spec(&data, &ss);
pa_source_new_data_set_channel_map(&data, &map); pa_source_new_data_set_channel_map(&data, &map);
pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME)); pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME));
pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "WaveIn on %s", device_name); pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "WaveIn on %s", input_device_name);
u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY); u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY);
pa_source_new_data_done(&data); pa_source_new_data_done(&data);
@ -631,7 +666,7 @@ int pa__init(pa_module *m) {
pa_sink_new_data_set_sample_spec(&data, &ss); pa_sink_new_data_set_sample_spec(&data, &ss);
pa_sink_new_data_set_channel_map(&data, &map); pa_sink_new_data_set_channel_map(&data, &map);
pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME)); pa_sink_new_data_set_name(&data, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME));
pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "WaveOut on %s", device_name); pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "WaveOut on %s", output_device_name);
u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE|PA_SINK_LATENCY); u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE|PA_SINK_LATENCY);
pa_sink_new_data_done(&data); pa_sink_new_data_done(&data);