~diwic/pulseaudio/ubuntu.precise

« back to all changes in this revision

Viewing changes to debian/patches/0608-pactl-Show-port-availability.patch

  • Committer: David Henningsson
  • Date: 2012-01-10 13:52:19 UTC
  • Revision ID: david.henningsson@canonical.com-20120110135219-n8hp8ruzjq9kurlu
Redo jack detection patches

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From 537020d0aff70b8c84cfdcbec43243d02b61d0d7 Mon Sep 17 00:00:00 2001
 
2
From: David Henningsson <david.henningsson@canonical.com>
 
3
Date: Fri, 2 Dec 2011 14:15:28 +0100
 
4
Subject: [PATCH 608/614] pactl: Show port availability
 
5
 
 
6
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
 
7
---
 
8
 src/utils/pactl.c |   15 +++++++++++++--
 
9
 1 files changed, 13 insertions(+), 2 deletions(-)
 
10
 
 
11
diff --git a/src/utils/pactl.c b/src/utils/pactl.c
 
12
index b1a0064..53017d6 100644
 
13
--- a/src/utils/pactl.c
 
14
+++ b/src/utils/pactl.c
 
15
@@ -212,6 +212,15 @@ static void get_server_info_callback(pa_context *c, const pa_server_info *i, voi
 
16
     complete_action();
 
17
 }
 
18
 
 
19
+static const char* get_available_str_ynonly(int available)
 
20
+{
 
21
+    switch (available) {
 
22
+        case PA_PORT_AVAILABLE_YES: return ", available";
 
23
+        case PA_PORT_AVAILABLE_NO: return ", not available";
 
24
+    }
 
25
+    return "";
 
26
+}
 
27
+
 
28
 static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_last, void *userdata) {
 
29
 
 
30
     static const char *state_table[] = {
 
31
@@ -308,7 +317,8 @@ static void get_sink_info_callback(pa_context *c, const pa_sink_info *i, int is_
 
32
 
 
33
         printf(_("\tPorts:\n"));
 
34
         for (p = i->ports; *p; p++)
 
35
-            printf("\t\t%s: %s (priority. %u)\n", (*p)->name, (*p)->description, (*p)->priority);
 
36
+            printf("\t\t%s: %s (priority: %u%s)\n", (*p)->name, (*p)->description, (*p)->priority,
 
37
+                get_available_str_ynonly((*p)->available));
 
38
     }
 
39
 
 
40
     if (i->active_port)
 
41
@@ -419,7 +429,8 @@ static void get_source_info_callback(pa_context *c, const pa_source_info *i, int
 
42
 
 
43
         printf(_("\tPorts:\n"));
 
44
         for (p = i->ports; *p; p++)
 
45
-            printf("\t\t%s: %s (priority. %u)\n", (*p)->name, (*p)->description, (*p)->priority);
 
46
+            printf("\t\t%s: %s (priority: %u%s)\n", (*p)->name, (*p)->description, (*p)->priority,
 
47
+                get_available_str_ynonly((*p)->available));
 
48
     }
 
49
 
 
50
     if (i->active_port)
 
51
-- 
 
52
1.7.7.3
 
53