oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/oss: add "device" parameter to constructor

This commit is contained in:
Max Kellermann 2015-01-07 18:43:45 +01:00
parent 8b217d5313
commit 15d29da43b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/output/plugins/OssOutputPlugin.cxx
View File

@ -80,9 +80,9 @@ struct OssOutput {
*/ */
int oss_format; int oss_format;
OssOutput() OssOutput(const char *_device=nullptr)
:base(oss_output_plugin), :base(oss_output_plugin),
fd(-1), device(nullptr) {} fd(-1), device(_device) {}
bool Initialize(const config_param &param, Error &error_r) { bool Initialize(const config_param &param, Error &error_r) {
return base.Configure(param, error_r); return base.Configure(param, error_r);
@ -193,13 +193,12 @@ oss_open_default(Error &error)
for (int i = ARRAY_SIZE(default_devices); --i >= 0; ) { for (int i = ARRAY_SIZE(default_devices); --i >= 0; ) {
ret[i] = oss_stat_device(default_devices[i], &err[i]); ret[i] = oss_stat_device(default_devices[i], &err[i]);
if (ret[i] == OSS_STAT_NO_ERROR) { if (ret[i] == OSS_STAT_NO_ERROR) {
OssOutput *od = new OssOutput(); OssOutput *od = new OssOutput(default_devices[i]);
if (!od->Initialize(empty, error)) { if (!od->Initialize(empty, error)) {
delete od; delete od;
return NULL; return NULL;
} }
od->device = default_devices[i];
return od; return od;
} }
} }