add new commands suspend-source, suspend-sink

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1667 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/utils/pactl.c b/src/utils/pactl.c
index cfc3f55..7c49007 100644 (file)
--- a/src/utils/pactl.c
+++ b/src/utils/pactl.c
@@ -51,6 +51,7 @@ static pa_mainloop_api *mainloop_api = NULL;
 static char *device = NULL, *sample_name = NULL, *sink_name = NULL, *source_name = NULL, *module_name = NULL, *module_args = NULL;
 static uint32_t sink_input_idx = PA_INVALID_INDEX, source_output_idx = PA_INVALID_INDEX;
 static uint32_t module_index;
+static int suspend;
 
 static SNDFILE *sndfile = NULL;
 static pa_stream *sample_stream = NULL;
@@ -73,6 +74,8 @@ static enum {
     MOVE_SOURCE_OUTPUT,
     LOAD_MODULE,
     UNLOAD_MODULE,
+    SUSPEND_SINK,
+    SUSPEND_SOURCE,
 } action = NONE;
 
 static void quit(int ret) {
@@ -357,7 +360,7 @@ static void get_sink_input_info_callback(pa_context *c, const pa_sink_input_info
            i->sink,
            pa_sample_spec_snprint(s, sizeof(s), &i->sample_spec),
            pa_channel_map_snprint(cm, sizeof(cm), &i->channel_map),
-           pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
+           i->mute ? "muted" : pa_cvolume_snprint(cv, sizeof(cv), &i->volume),
            (double) i->buffer_usec,
            (double) i->sink_usec,
            i->resample_method ? i->resample_method : "n/a");
@@ -616,6 +619,20 @@ static void context_state_callback(pa_context *c, void *userdata) {
                 case UNLOAD_MODULE:
                     pa_operation_unref(pa_context_unload_module(c, module_index, simple_callback, NULL));
                     break;
+
+                case SUSPEND_SINK:
+                    if (sink_name)
+                        pa_operation_unref(pa_context_suspend_sink_by_name(c, sink_name, suspend, simple_callback, NULL));
+                    else
+                        pa_operation_unref(pa_context_suspend_sink_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
+                    break;
+
+                case SUSPEND_SOURCE:
+                    if (source_name)
+                        pa_operation_unref(pa_context_suspend_source_by_name(c, source_name, suspend, simple_callback, NULL));
+                    else
+                        pa_operation_unref(pa_context_suspend_source_by_index(c, PA_INVALID_INDEX, suspend, simple_callback, NULL));
+                    break;
                     
                 default:
                     assert(0);
@@ -649,12 +666,14 @@ static void help(const char *argv0) {
            "%s [options] move-source-output ID SOURCE\n"
            "%s [options] remove-sample NAME\n"
            "%s [options] load-module NAME [ARGS ...]\n"
-           "%s [options] unload-module ID\n\n"
+           "%s [options] unload-module ID\n"
+           "%s [options] suspend-sink [SINK] 1|0\n"
+           "%s [options] suspend-source [SOURCE] 1|0\n\n"
            "  -h, --help                            Show this help\n"
            "      --version                         Show version\n\n"
            "  -s, --server=SERVER                   The name of the server to connect to\n"
            "  -n, --client-name=NAME                How to call this client on the server\n",
-           argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0);
+           argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0, argv0);
 }
 
 enum { ARG_VERSION = 256 };
@@ -817,13 +836,38 @@ int main(int argc, char *argv[]) {
             action = UNLOAD_MODULE;
             
             if (argc != optind+2) {
-                fprintf(stderr, "You have to specify a source output index and a source\n");
+                fprintf(stderr, "You have to specify a module index\n");
                 goto quit;
             }
 
             module_index = atoi(argv[optind+1]);
-        }
             
+        } else if (!strcmp(argv[optind], "suspend-sink")) {
+            action = SUSPEND_SINK;
+
+            if (argc > optind+3 || optind+1 >= argc) {
+                fprintf(stderr, "You may not specify more than one sink. You have to specify at least one boolean value.\n");
+                goto quit;
+            }
+            
+            suspend = !!atoi(argv[argc-1]);
+            
+            if (argc > optind+2)
+                sink_name = pa_xstrdup(argv[optind+1]);
+                
+        } else if (!strcmp(argv[optind], "suspend-source")) {
+            action = SUSPEND_SOURCE;
+
+            if (argc > optind+3 || optind+1 >= argc) {
+                fprintf(stderr, "You may not specify more than one source. You have to specify at least one boolean value.\n");
+                goto quit;
+            }
+
+            suspend = !!atoi(argv[argc-1]);
+
+            if (argc > optind+2)
+                source_name = pa_xstrdup(argv[optind+1]);
+        }
     }
 
     if (action == NONE) {
@@ -879,6 +923,7 @@ quit:
     pa_xfree(sink_name);
     pa_xfree(source_name);
     pa_xfree(module_args);
+    pa_xfree(client_name);
 
     return ret;
 }