[polypaudio-commits] r593 - /trunk/src/modules/module-solaris.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Fri Feb 24 11:17:41 2006
New Revision: 593

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=593&root=polypaudio&view=rev
Log:
Hardware sink mute support.

Modified:
    trunk/src/modules/module-solaris.c

Modified: trunk/src/modules/module-solaris.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-solaris.c?rev=593&root=polypaudio&r1=592&r2=593&view=diff
==============================================================================
--- trunk/src/modules/module-solaris.c (original)
+++ trunk/src/modules/module-solaris.c Fri Feb 24 11:17:41 2006
@@ -292,6 +292,35 @@
     return 0;
 }
 
+static int sink_get_hw_mute_cb(pa_sink *s) {
+    struct userdata *u = s->userdata;
+    audio_info_t info;
+    int err;
+
+    err = ioctl(u->fd, AUDIO_GETINFO, &info);
+    assert(err >= 0);
+
+    s->hw_muted = !!info.output_muted;
+
+    return 0;
+}
+
+static int sink_set_hw_mute_cb(pa_sink *s) {
+    struct userdata *u = s->userdata;
+    audio_info_t info;
+
+    AUDIO_INITINFO(&info);
+
+    info.output_muted = !!s->hw_muted;
+
+    if (ioctl(u->fd, AUDIO_SETINFO, &info) < 0) {
+        pa_log(__FILE__": AUDIO_SETINFO: %s", strerror(errno));
+        return -1;
+    }
+
+    return 0;
+}
+
 static int source_get_hw_volume_cb(pa_source *s) {
     struct userdata *u = s->userdata;
     audio_info_t info;
@@ -483,6 +512,8 @@
         u->sink->get_latency = sink_get_latency_cb;
         u->sink->get_hw_volume = sink_get_hw_volume_cb;
         u->sink->set_hw_volume = sink_set_hw_volume_cb;
+        u->sink->get_hw_mute = sink_get_hw_mute_cb;
+        u->sink->set_hw_mute = sink_set_hw_mute_cb;
         u->sink->userdata = u;
         pa_sink_set_owner(u->sink, m);
         u->sink->description = pa_sprintf_malloc("Solaris PCM on '%s'", p);
@@ -521,8 +552,10 @@
     /* Read mixer settings */
     if (u->source)
         sink_get_hw_volume_cb(u->source);
-    if (u->sink)
+    if (u->sink) {
         sink_get_hw_volume_cb(u->sink);
+        sink_get_hw_mute_cb(u->sink);
+    }
 
     return 0;