summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerry Tan <jerry.tan@sun.com>2006-12-08 14:42:42 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2006-12-08 14:42:42 +0000
commitf3df7a85e48c90d0b057a414e1ef0c706928c91a (patch)
tree5003bf47b0f6fd47907f671d2e1551b46fcf4f36
parent6c58a6baea08b449fec5909d7421c744ab0e65fd (diff)
sys/sunaudio/gstsunaudiomixer.c: Construct the correct mixer device name when the AUDIODEV env var is set.
Original commit message from CVS: * sys/sunaudio/gstsunaudiomixer.c: (gst_sunaudiomixer_change_state): Construct the correct mixer device name when the AUDIODEV env var is set. Patch by: Jerry Tan <jerry.tan at sun dot com> Fixes: #383596
-rw-r--r--ChangeLog10
-rw-r--r--sys/sunaudio/gstsunaudiomixer.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7647b4d9..8203634c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2006-12-08 Jan Schmidt <thaytan@mad.scientist.com>
+ * sys/sunaudio/gstsunaudiomixer.c:
+ (gst_sunaudiomixer_change_state):
+ Construct the correct mixer device name when the AUDIODEV env var
+ is set.
+
+ Patch by: Jerry Tan <jerry.tan at sun dot com>
+ Fixes: #383596
+
+2006-12-08 Jan Schmidt <thaytan@mad.scientist.com>
+
* sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_open):
Apply patch to open the mixer control and set the MULTIPLE_OPEN
ioctl. On solaris, the mixer device doesn't need opening non-blocking
diff --git a/sys/sunaudio/gstsunaudiomixer.c b/sys/sunaudio/gstsunaudiomixer.c
index fb0ce954..a5eb0c93 100644
--- a/sys/sunaudio/gstsunaudiomixer.c
+++ b/sys/sunaudio/gstsunaudiomixer.c
@@ -86,7 +86,7 @@ gst_sunaudiomixer_change_state (GstElement * element, GstStateChange transition)
if (audiodev == NULL) {
this->mixer = gst_sunaudiomixer_ctrl_new ("/dev/audioctl");
} else {
- gchar *device = g_strdup_printf ("/dev/%sctl", audiodev);
+ gchar *device = g_strdup_printf ("%sctl", audiodev);
this->mixer = gst_sunaudiomixer_ctrl_new (device);
g_free (device);