projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move base64 implementation to own file.
[paraslash.git]
/
oss_mix.c
diff --git
a/oss_mix.c
b/oss_mix.c
index 9fe865045a8e96006813d48b4dc0ff59164dd460..8e87452b816e68f03f0931e79efe007d7491b6c8 100644
(file)
--- a/
oss_mix.c
+++ b/
oss_mix.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1998
-2013 Andre Noll <maan@systemlinux.org
>
+ * Copyright (C) 1998
Andre Noll <maan@tuebingen.mpg.de
>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
@@
-56,8
+56,10
@@
static int oss_mix_open(const char *dev, struct mixer_handle **handle)
dev = "/dev/mixer";
PARA_INFO_LOG("opening %s\n", dev);
ret = para_open(dev, O_RDWR, 42);
dev = "/dev/mixer";
PARA_INFO_LOG("opening %s\n", dev);
ret = para_open(dev, O_RDWR, 42);
- if (ret < 0)
+ if (ret < 0) {
+ PARA_ERROR_LOG("could not open %s\n", dev);
return ret;
return ret;
+ }
h = para_malloc(sizeof(*h));
h->fd = ret;
*handle = h;
h = para_malloc(sizeof(*h));
h->fd = ret;
*handle = h;
@@
-96,7
+98,7
@@
static int oss_mix_set_channel(struct mixer_handle *handle,
handle->id = i;
return 1;
}
handle->id = i;
return 1;
}
- return -E_
OSS_MIXER
_CHANNEL;
+ return -E_
BAD
_CHANNEL;
}
static int oss_mix_get(struct mixer_handle *handle)
}
static int oss_mix_get(struct mixer_handle *handle)