← Back to branch summary

~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/gnome-control-center/fix-lp-978118

« back to all changes in this revision

Viewing changes to debian/patches/96_sound_nua_panel.patch

  • Committer: Package Import Robot
  • Author(s): Ken VanDine, Sebastien Bacher
  • Date: 2012-02-10 14:57:36 UTC
  • Revision ID: package-import@ubuntu.com-20120210145736-jncyehqpozbmph9c
Tags: 1:3.2.2-2ubuntu8
https://launchpad.net/bugs/921039
[ Sebastien Bacher ]
* debian/patches/git_extra_keywords.patch:
  - list "preferences" as a keyword for system settings (lp: #921039)

* debian/patches/96_sound_nua_panel.patch
  - Updated with latest changes from ronoc:
    * protect against null in_profiles in the device
    * ensure when swapping profiles on a sink that is not the pulse server 
      default that is reset as the default sink when the appropriate new 
      stream is created after the profile swap - head melt

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/96_sound_nua_panel.patch
1
1
=== modified file 'configure.ac'
2
2
Index: gnome-control-center/configure.ac
3
3
===================================================================
4
 
--- gnome-control-center.orig/configure.ac      2012-02-08 00:21:13.853662000 -0500
5
 
+++ gnome-control-center/configure.ac   2012-02-08 00:21:13.853662000 -0500
 
4
--- gnome-control-center.orig/configure.ac      2012-02-10 14:39:56.993601000 -0500
 
5
+++ gnome-control-center/configure.ac   2012-02-10 14:39:56.993601000 -0500
6
6
@@ -337,6 +337,9 @@
7
7
 panels/online-accounts/icons/32x32/Makefile
8
8
 panels/online-accounts/icons/48x48/Makefile
15
15
 panels/sound/data/gnome-sound-panel.desktop.in
16
16
Index: gnome-control-center/panels/Makefile.am
17
17
===================================================================
18
 
--- gnome-control-center.orig/panels/Makefile.am        2012-02-08 00:21:13.853662000 -0500
19
 
+++ gnome-control-center/panels/Makefile.am     2012-02-08 00:20:45.270751000 -0500
 
18
--- gnome-control-center.orig/panels/Makefile.am        2012-02-10 14:39:56.993601000 -0500
 
19
+++ gnome-control-center/panels/Makefile.am     2012-02-10 14:39:56.993601000 -0500
20
20
@@ -11,6 +11,7 @@
21
21
        region \
22
22
        info \
28
28
Index: gnome-control-center/panels/sound-nua/Makefile.am
29
29
===================================================================
30
30
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
31
 
+++ gnome-control-center/panels/sound-nua/Makefile.am   2012-02-08 00:21:13.853662000 -0500
 
31
+++ gnome-control-center/panels/sound-nua/Makefile.am   2012-02-10 14:39:56.993601000 -0500
32
32
@@ -0,0 +1,93 @@
33
33
+SUBDIRS = data
34
34
+
126
126
Index: gnome-control-center/panels/sound-nua/Makefile.in
127
127
===================================================================
128
128
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
129
 
+++ gnome-control-center/panels/sound-nua/Makefile.in   2012-02-08 00:23:01.261727471 -0500
 
129
+++ gnome-control-center/panels/sound-nua/Makefile.in   2012-02-10 14:39:56.993601000 -0500
130
130
@@ -0,0 +1,939 @@
131
131
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
132
132
+# @configure_input@
1070
1070
Index: gnome-control-center/panels/sound-nua/applet-main.c
1071
1071
===================================================================
1072
1072
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1073
 
+++ gnome-control-center/panels/sound-nua/applet-main.c 2012-02-08 00:21:13.853662000 -0500
 
1073
+++ gnome-control-center/panels/sound-nua/applet-main.c 2012-02-10 14:39:56.993601000 -0500
1074
1074
@@ -0,0 +1,110 @@
1075
1075
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1076
1076
+ *
1185
1185
Index: gnome-control-center/panels/sound-nua/cc-sound-panel.c
1186
1186
===================================================================
1187
1187
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1188
 
+++ gnome-control-center/panels/sound-nua/cc-sound-panel.c      2012-02-08 00:21:13.853662000 -0500
 
1188
+++ gnome-control-center/panels/sound-nua/cc-sound-panel.c      2012-02-10 14:39:56.993601000 -0500
1189
1189
@@ -0,0 +1,141 @@
1190
1190
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1191
1191
+ *
1331
1331
Index: gnome-control-center/panels/sound-nua/cc-sound-panel.h
1332
1332
===================================================================
1333
1333
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1334
 
+++ gnome-control-center/panels/sound-nua/cc-sound-panel.h      2012-02-08 00:21:13.853662000 -0500
 
1334
+++ gnome-control-center/panels/sound-nua/cc-sound-panel.h      2012-02-10 14:39:56.993601000 -0500
1335
1335
@@ -0,0 +1,60 @@
1336
1336
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1337
1337
+ *
1396
1396
Index: gnome-control-center/panels/sound-nua/data/Makefile.am
1397
1397
===================================================================
1398
1398
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1399
 
+++ gnome-control-center/panels/sound-nua/data/Makefile.am      2012-02-08 00:21:13.853662000 -0500
 
1399
+++ gnome-control-center/panels/sound-nua/data/Makefile.am      2012-02-10 14:39:56.993601000 -0500
1400
1400
@@ -0,0 +1,17 @@
1401
1401
+NULL =
1402
1402
+
1418
1418
Index: gnome-control-center/panels/sound-nua/data/Makefile.in
1419
1419
===================================================================
1420
1420
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1421
 
+++ gnome-control-center/panels/sound-nua/data/Makefile.in      2012-02-08 00:23:01.261727471 -0500
 
1421
+++ gnome-control-center/panels/sound-nua/data/Makefile.in      2012-02-10 14:39:56.993601000 -0500
1422
1422
@@ -0,0 +1,529 @@
1423
1423
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
1424
1424
+# @configure_input@
1952
1952
Index: gnome-control-center/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in
1953
1953
===================================================================
1954
1954
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1955
 
+++ gnome-control-center/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in      2012-02-08 00:21:13.853662000 -0500
 
1955
+++ gnome-control-center/panels/sound-nua/data/gnome-sound-nua-panel.desktop.in.in      2012-02-10 14:39:56.993601000 -0500
1956
1956
@@ -0,0 +1,17 @@
1957
1957
+[Desktop Entry]
1958
1958
+_Name=Sound
1974
1974
Index: gnome-control-center/panels/sound-nua/gvc-applet.c
1975
1975
===================================================================
1976
1976
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1977
 
+++ gnome-control-center/panels/sound-nua/gvc-applet.c  2012-02-08 00:21:13.853662000 -0500
 
1977
+++ gnome-control-center/panels/sound-nua/gvc-applet.c  2012-02-10 14:39:56.993601000 -0500
1978
1978
@@ -0,0 +1,305 @@
1979
1979
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
1980
1980
+ *
2284
2284
Index: gnome-control-center/panels/sound-nua/gvc-applet.h
2285
2285
===================================================================
2286
2286
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2287
 
+++ gnome-control-center/panels/sound-nua/gvc-applet.h  2012-02-08 00:21:13.853662000 -0500
 
2287
+++ gnome-control-center/panels/sound-nua/gvc-applet.h  2012-02-10 14:39:56.993601000 -0500
2288
2288
@@ -0,0 +1,55 @@
2289
2289
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2290
2290
+ *
2344
2344
Index: gnome-control-center/panels/sound-nua/gvc-balance-bar.c
2345
2345
===================================================================
2346
2346
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2347
 
+++ gnome-control-center/panels/sound-nua/gvc-balance-bar.c     2012-02-08 00:21:13.853662000 -0500
 
2347
+++ gnome-control-center/panels/sound-nua/gvc-balance-bar.c     2012-02-10 14:39:56.993601000 -0500
2348
2348
@@ -0,0 +1,556 @@
2349
2349
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2350
2350
+ *
2905
2905
Index: gnome-control-center/panels/sound-nua/gvc-balance-bar.h
2906
2906
===================================================================
2907
2907
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2908
 
+++ gnome-control-center/panels/sound-nua/gvc-balance-bar.h     2012-02-08 00:21:13.853662000 -0500
 
2908
+++ gnome-control-center/panels/sound-nua/gvc-balance-bar.h     2012-02-10 14:39:56.993601000 -0500
2909
2909
@@ -0,0 +1,70 @@
2910
2910
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2911
2911
+ *
2980
2980
Index: gnome-control-center/panels/sound-nua/gvc-channel-bar.c
2981
2981
===================================================================
2982
2982
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
2983
 
+++ gnome-control-center/panels/sound-nua/gvc-channel-bar.c     2012-02-08 00:21:13.853662000 -0500
 
2983
+++ gnome-control-center/panels/sound-nua/gvc-channel-bar.c     2012-02-10 14:39:56.993601000 -0500
2984
2984
@@ -0,0 +1,963 @@
2985
2985
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
2986
2986
+ *
3948
3948
Index: gnome-control-center/panels/sound-nua/gvc-channel-bar.h
3949
3949
===================================================================
3950
3950
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
3951
 
+++ gnome-control-center/panels/sound-nua/gvc-channel-bar.h     2012-02-08 00:21:13.853662000 -0500
 
3951
+++ gnome-control-center/panels/sound-nua/gvc-channel-bar.h     2012-02-10 14:39:56.993601000 -0500
3952
3952
@@ -0,0 +1,89 @@
3953
3953
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
3954
3954
+ *
4042
4042
Index: gnome-control-center/panels/sound-nua/gvc-channel-map-private.h
4043
4043
===================================================================
4044
4044
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4045
 
+++ gnome-control-center/panels/sound-nua/gvc-channel-map-private.h     2012-02-08 00:21:13.853662000 -0500
 
4045
+++ gnome-control-center/panels/sound-nua/gvc-channel-map-private.h     2012-02-10 14:39:56.993601000 -0500
4046
4046
@@ -0,0 +1,39 @@
4047
4047
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4048
4048
+ *
4086
4086
Index: gnome-control-center/panels/sound-nua/gvc-channel-map.c
4087
4087
===================================================================
4088
4088
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4089
 
+++ gnome-control-center/panels/sound-nua/gvc-channel-map.c     2012-02-08 00:21:13.853662000 -0500
 
4089
+++ gnome-control-center/panels/sound-nua/gvc-channel-map.c     2012-02-10 14:39:56.993601000 -0500
4090
4090
@@ -0,0 +1,254 @@
4091
4091
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4092
4092
+ *
4345
4345
Index: gnome-control-center/panels/sound-nua/gvc-channel-map.h
4346
4346
===================================================================
4347
4347
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4348
 
+++ gnome-control-center/panels/sound-nua/gvc-channel-map.h     2012-02-08 00:21:13.853662000 -0500
 
4348
+++ gnome-control-center/panels/sound-nua/gvc-channel-map.h     2012-02-10 14:39:56.993601000 -0500
4349
4349
@@ -0,0 +1,73 @@
4350
4350
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4351
4351
+ *
4423
4423
Index: gnome-control-center/panels/sound-nua/gvc-combo-box.c
4424
4424
===================================================================
4425
4425
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4426
 
+++ gnome-control-center/panels/sound-nua/gvc-combo-box.c       2012-02-08 00:21:13.853662000 -0500
 
4426
+++ gnome-control-center/panels/sound-nua/gvc-combo-box.c       2012-02-10 14:39:56.993601000 -0500
4427
4427
@@ -0,0 +1,398 @@
4428
4428
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4429
4429
+ *
4826
4826
Index: gnome-control-center/panels/sound-nua/gvc-combo-box.h
4827
4827
===================================================================
4828
4828
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4829
 
+++ gnome-control-center/panels/sound-nua/gvc-combo-box.h       2012-02-08 00:21:13.853662000 -0500
 
4829
+++ gnome-control-center/panels/sound-nua/gvc-combo-box.h       2012-02-10 14:39:56.993601000 -0500
4830
4830
@@ -0,0 +1,66 @@
4831
4831
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4832
4832
+ *
4897
4897
Index: gnome-control-center/panels/sound-nua/gvc-level-bar.c
4898
4898
===================================================================
4899
4899
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
4900
 
+++ gnome-control-center/panels/sound-nua/gvc-level-bar.c       2012-02-08 00:21:13.853662000 -0500
 
4900
+++ gnome-control-center/panels/sound-nua/gvc-level-bar.c       2012-02-10 14:39:56.993601000 -0500
4901
4901
@@ -0,0 +1,770 @@
4902
4902
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
4903
4903
+ *
5672
5672
Index: gnome-control-center/panels/sound-nua/gvc-level-bar.h
5673
5673
===================================================================
5674
5674
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5675
 
+++ gnome-control-center/panels/sound-nua/gvc-level-bar.h       2012-02-08 00:21:13.853662000 -0500
 
5675
+++ gnome-control-center/panels/sound-nua/gvc-level-bar.h       2012-02-10 14:39:56.993601000 -0500
5676
5676
@@ -0,0 +1,75 @@
5677
5677
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5678
5678
+ *
5752
5752
Index: gnome-control-center/panels/sound-nua/gvc-log.c
5753
5753
===================================================================
5754
5754
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5755
 
+++ gnome-control-center/panels/sound-nua/gvc-log.c     2012-02-08 00:21:13.853662000 -0500
 
5755
+++ gnome-control-center/panels/sound-nua/gvc-log.c     2012-02-10 14:39:56.993601000 -0500
5756
5756
@@ -0,0 +1,64 @@
5757
5757
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5758
5758
+ *
5821
5821
Index: gnome-control-center/panels/sound-nua/gvc-log.h
5822
5822
===================================================================
5823
5823
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5824
 
+++ gnome-control-center/panels/sound-nua/gvc-log.h     2012-02-08 00:21:13.853662000 -0500
 
5824
+++ gnome-control-center/panels/sound-nua/gvc-log.h     2012-02-10 14:39:56.993601000 -0500
5825
5825
@@ -0,0 +1,35 @@
5826
5826
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5827
5827
+ *
5861
5861
Index: gnome-control-center/panels/sound-nua/gvc-mixer-card-private.h
5862
5862
===================================================================
5863
5863
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5864
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-card-private.h      2012-02-08 00:21:13.853662000 -0500
 
5864
+++ gnome-control-center/panels/sound-nua/gvc-mixer-card-private.h      2012-02-10 14:39:56.993601000 -0500
5865
5865
@@ -0,0 +1,35 @@
5866
5866
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5867
5867
+ *
5901
5901
Index: gnome-control-center/panels/sound-nua/gvc-mixer-card.c
5902
5902
===================================================================
5903
5903
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
5904
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-card.c      2012-02-08 00:21:13.853662000 -0500
 
5904
+++ gnome-control-center/panels/sound-nua/gvc-mixer-card.c      2012-02-10 14:39:56.993601000 -0500
5905
5905
@@ -0,0 +1,549 @@
5906
5906
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
5907
5907
+ *
6455
6455
Index: gnome-control-center/panels/sound-nua/gvc-mixer-card.h
6456
6456
===================================================================
6457
6457
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
6458
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-card.h      2012-02-08 00:21:13.853662000 -0500
 
6458
+++ gnome-control-center/panels/sound-nua/gvc-mixer-card.h      2012-02-10 14:39:56.993601000 -0500
6459
6459
@@ -0,0 +1,108 @@
6460
6460
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
6461
6461
+ *
6568
6568
Index: gnome-control-center/panels/sound-nua/gvc-mixer-control-private.h
6569
6569
===================================================================
6570
6570
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
6571
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-control-private.h   2012-02-08 00:21:13.853662000 -0500
 
6571
+++ gnome-control-center/panels/sound-nua/gvc-mixer-control-private.h   2012-02-10 14:39:56.993601000 -0500
6572
6572
@@ -0,0 +1,35 @@
6573
6573
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
6574
6574
+ *
6608
6608
Index: gnome-control-center/panels/sound-nua/gvc-mixer-control.c
6609
6609
===================================================================
6610
6610
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
6611
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-control.c   2012-02-09 16:15:03.128966789 -0500
6612
 
@@ -0,0 +1,3303 @@
 
6611
+++ gnome-control-center/panels/sound-nua/gvc-mixer-control.c   2012-02-10 14:40:47.385282961 -0500
 
6612
@@ -0,0 +1,3342 @@
6613
6613
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
6614
6614
+ *
6615
6615
+ * Copyright (C) 2006-2008 Lennart Poettering
6698
6698
+        guint            cached_desired_output_id;
6699
6699
+        guint            cached_desired_input_id;
6700
6700
+        GvcMixerStream   *new_default_stream; /* new default stream, used in gvc_mixer_control_set_default_sink () */
6701
 
+
 
6701
+        guint            profile_swapping_device_id;
6702
6702
+        GvcMixerControlState state;
6703
6703
+};
6704
6704
+
6818
6818
+        ports = gvc_mixer_stream_get_ports (stream);
6819
6819
+
6820
6820
+        is_network_stream = ports == NULL;
6821
 
+        g_print ("\n is_network_stream = %i \n", is_network_stream);
 
6821
+        //g_print ("\n is_network or bluetooth stream = %i \n", is_network_stream);
6822
6822
+
6823
6823
+       for (d = devices; d != NULL; d = d->next) {             
6824
6824
+               device = d->data;
6844
6844
+                       if (stream_id == gvc_mixer_stream_get_id (stream) &&
6845
6845
+                            g_strcmp0 (gvc_mixer_ui_device_get_port(device),
6846
6846
+                                       port->port) == 0) {
6847
 
+                                g_print ("\n \n lookup device from stream found device  \n device port = %s \n device stream id %i \n from \n stream port = %s stream id %u \n",
 
6847
+                                g_print ("\n \n lookup-device-from-stream found device  \n device description %s \n device port = %s \n device stream id %i \n AND \n stream port = %s stream id %u and stream description %s \n",
 
6848
+                                         gvc_mixer_ui_device_get_description (device),
6848
6849
+                                         gvc_mixer_ui_device_get_port(device),                                 
6849
6850
+                                         stream_id,
6850
6851
+                                         port->port,
6851
 
+                                         gvc_mixer_stream_get_id (stream));
 
6852
+                                         gvc_mixer_stream_get_id (stream),
 
6853
+                                         gvc_mixer_stream_get_description (stream));
6852
6854
+                               return device;
6853
6855
+                       }
6854
6856
+                }
6866
6868
+        g_return_val_if_fail (GVC_IS_MIXER_CONTROL (control), FALSE);
6867
6869
+        g_return_val_if_fail (GVC_IS_MIXER_STREAM (stream), FALSE);
6868
6870
+
 
6871
+        g_print ("\n about to set default sink on server \n");
6869
6872
+        o = pa_context_set_default_sink (control->priv->pa_context,
6870
6873
+                                         gvc_mixer_stream_get_name (stream),
6871
6874
+                                         NULL,
7097
7100
+                g_warning ("gvc_mixer_control_change_profile - no card => different profile but cant find a valid card id ?");
7098
7101
+                return;
7099
7102
+        }
7100
 
+        g_print ("\n Trying to move to profile %s \n", profile);
7101
7103
+        GvcMixerCard *card;
7102
 
+        card = gvc_mixer_control_lookup_card_id (control, card_id);        
 
7104
+        card = gvc_mixer_control_lookup_card_id (control, card_id);     
 
7105
+        g_print ("\n Trying to move to profile %s on card %s on stream id %i \n",
 
7106
+                profile,
 
7107
+                gvc_mixer_card_get_name (card),
 
7108
+                gvc_mixer_ui_device_get_stream_id (device));
 
7109
+
 
7110
+        
 
7111
+        g_print ("\n default sink name = %s \n and default sink id %u",
 
7112
+                 control->priv->default_sink_name,
 
7113
+                 control->priv->default_sink_id);
 
7114
+
7103
7115
+        if (gvc_mixer_card_change_profile (card, profile)) {
7104
7116
+                gvc_mixer_ui_device_set_user_preferred_profile (device, profile);
 
7117
+                control->priv->profile_swapping_device_id = gvc_mixer_ui_device_get_id (device);
7105
7118
+                return TRUE;
7106
7119
+        }
7107
7120
+        return FALSE;
7717
7730
+                update_default_source_from_name (control, info->default_source_name);
7718
7731
+        }
7719
7732
+        if (info->default_sink_name != NULL) {
 
7733
+                g_print ("\n update server");
7720
7734
+                update_default_sink_from_name (control, info->default_sink_name);
7721
7735
+        }
7722
7736
+}
7809
7823
+
7810
7824
+               if ( stream_card_id == card_id &&
7811
7825
+                    g_strcmp0 (device_port_name, stream_port->port) == 0) {                                         
7812
 
+                       g_print ("\n Match device with stream \n We have a match with description : %s  \n origin : %s \n cached already with device id %u, \n fill in the blanks \n\n ",
 
7826
+                       g_print ("\n Match device with stream \n We have a match with description : %s  \n origin : %s \n cached already with device id %u, \n => set stream id to %i \n\n ",
7813
7827
+                                description,
7814
7828
+                                origin,
7815
 
+                                gvc_mixer_ui_device_get_id (device));
 
7829
+                                gvc_mixer_ui_device_get_id (device),
 
7830
+                                 stream_id);
7816
7831
+                       
7817
7832
+                       g_object_set (G_OBJECT (device),
7818
7833
+                                     "stream-id", (gint)stream_id,
8088
8103
+                        }                         
8089
8104
+                }
8090
8105
+                control->priv->cached_desired_output_id = GVC_MIXER_UI_DEVICE_INVALID;
8091
 
+        }                
8092
 
+
8093
 
+        if (control->priv->default_sink_name != NULL
 
8106
+        }        
 
8107
+        
 
8108
+        /*
 
8109
+        When we change profile on a device that is not the server default sink,
 
8110
+        it will jump back to the default sink set by the server to prevent the audio setup from being 'outputless'.
 
8111
+        All well and good but then when we get the new stream created for the new profile how do we know 
 
8112
+        that this is the intended default or selected device the user wishes to use.
 
8113
+        This is messy but it's the only reliable way that it can be done without ripping the whole thing apart.
 
8114
+        */
 
8115
+        gboolean default_set = FALSE;
 
8116
+
 
8117
+        if (control->priv->profile_swapping_device_id != GVC_MIXER_UI_DEVICE_INVALID){
 
8118
+                GvcMixerUIDevice *dev = NULL;
 
8119
+                dev = gvc_mixer_control_lookup_output_id (control, control->priv->profile_swapping_device_id);
 
8120
+                if (dev != NULL){
 
8121
+                        // now check to make sure this new stream is the same stream just matched and set on the device object
 
8122
+                        if (gvc_mixer_ui_device_get_stream_id (dev) == gvc_mixer_stream_get_id (stream)){
 
8123
+                                g_print ("Looks like we profile swapped on a non server default sink");
 
8124
+                                gvc_mixer_control_set_default_sink (control, stream);
 
8125
+                                default_set = TRUE;                   
 
8126
+                        }  
 
8127
+                }
 
8128
+                control->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;                
 
8129
+        }
 
8130
+
 
8131
+        if (!default_set && control->priv->default_sink_name != NULL
8094
8132
+            && info->name != NULL
8095
8133
+            && strcmp (control->priv->default_sink_name, info->name) == 0) {
8096
8134
+                _set_default_sink (control, stream);
8833
8871
+                g_warning ("Server info callback failure");
8834
8872
+                return;
8835
8873
+        }
8836
 
+
 
8874
+        g_print ("\n get server info \n");
8837
8875
+        update_server (control, i);
8838
8876
+        dec_outstanding (control);
8839
8877
+}
9187
9225
+        device = gvc_mixer_control_lookup_device_from_stream (control, stream);
9188
9226
+
9189
9227
+        if (device != NULL){
9190
 
+                g_print ("\n invalidate stream on device - %s \n", gvc_mixer_ui_device_get_description (device));        
 
9228
+                g_print ("\n invalidate stream on device - remove-sinks - %s \n", gvc_mixer_ui_device_get_description (device));        
9191
9229
+
9192
9230
+                gvc_mixer_ui_device_invalidate_stream (device);
9193
9231
+                // If its a software device - get rid of it
9195
9233
+                        g_signal_emit (G_OBJECT (control),
9196
9234
+                                       signals[OUTPUT_REMOVED],
9197
9235
+                                       0,
9198
 
+                                       gvc_mixer_ui_device_get_id (device));                            
 
9236
+                                       gvc_mixer_ui_device_get_id (device));                      
9199
9237
+                }
9200
9238
+                // otherwise check to make sure to invalidate other devices which may have that stream
9201
9239
+                else{
9713
9751
+        gvc_mixer_new_pa_context (self);
9714
9752
+        self->priv->cached_desired_output_id = GVC_MIXER_UI_DEVICE_INVALID;
9715
9753
+        self->priv->cached_desired_input_id = GVC_MIXER_UI_DEVICE_INVALID;
 
9754
+        self->priv->profile_swapping_device_id = GVC_MIXER_UI_DEVICE_INVALID;
9716
9755
+
9717
9756
+        return object;
9718
9757
+}
9916
9955
Index: gnome-control-center/panels/sound-nua/gvc-mixer-control.h
9917
9956
===================================================================
9918
9957
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
9919
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-control.h   2012-02-08 00:21:13.853662000 -0500
 
9958
+++ gnome-control-center/panels/sound-nua/gvc-mixer-control.h   2012-02-10 14:39:56.993601000 -0500
9920
9959
@@ -0,0 +1,139 @@
9921
9960
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
9922
9961
+ *
10060
10099
Index: gnome-control-center/panels/sound-nua/gvc-mixer-dialog.c
10061
10100
===================================================================
10062
10101
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
10063
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-dialog.c    2012-02-09 16:15:03.140966792 -0500
10064
 
@@ -0,0 +1,2190 @@
 
10102
+++ gnome-control-center/panels/sound-nua/gvc-mixer-dialog.c    2012-02-10 14:40:47.385282961 -0500
 
10103
@@ -0,0 +1,2194 @@
10065
10104
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
10066
10105
+ *
10067
10106
+ * Copyright (C) 2008 William Jon McCann
10256
10295
+                return;
10257
10296
+        }
10258
10297
+
 
10298
+        g_print (" \n on profile selection changed on output with \n description %s \n origin %s \n id %i \n \n",
 
10299
+                gvc_mixer_ui_device_get_description (out),
 
10300
+                gvc_mixer_ui_device_get_origin (out),
 
10301
+                gvc_mixer_ui_device_get_id (out));
 
10302
+
10259
10303
+        if (gvc_mixer_control_change_profile_on_selected_device (dialog->priv->mixer_control, out, profile) == FALSE) {
10260
10304
+                g_warning ("Could not change profile on device %s",
10261
10305
+                           gvc_mixer_ui_device_get_description (out));
10845
10889
+
10846
10890
+                if (is_selected && id == gvc_mixer_ui_device_get_id (active_output)) {
10847
10891
+                        g_print ("\n\n unneccessary active output update unless it was a profile change on the same device ? \n\n");
10848
 
+                        //return;        
10849
10892
+                }
10850
10893
+
10851
10894
+                is_selected = id == gvc_mixer_ui_device_get_id (active_output);
12255
12298
Index: gnome-control-center/panels/sound-nua/gvc-mixer-dialog.h
12256
12299
===================================================================
12257
12300
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12258
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-dialog.h    2012-02-08 00:21:13.853662000 -0500
 
12301
+++ gnome-control-center/panels/sound-nua/gvc-mixer-dialog.h    2012-02-10 14:39:56.993601000 -0500
12259
12302
@@ -0,0 +1,56 @@
12260
12303
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12261
12304
+ *
12316
12359
Index: gnome-control-center/panels/sound-nua/gvc-mixer-event-role.c
12317
12360
===================================================================
12318
12361
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12319
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-event-role.c        2012-02-08 00:21:13.853662000 -0500
 
12362
+++ gnome-control-center/panels/sound-nua/gvc-mixer-event-role.c        2012-02-10 14:39:56.993601000 -0500
12320
12363
@@ -0,0 +1,231 @@
12321
12364
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12322
12365
+ *
12552
12595
Index: gnome-control-center/panels/sound-nua/gvc-mixer-event-role.h
12553
12596
===================================================================
12554
12597
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12555
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-event-role.h        2012-02-08 00:21:13.853662000 -0500
 
12598
+++ gnome-control-center/panels/sound-nua/gvc-mixer-event-role.h        2012-02-10 14:39:56.993601000 -0500
12556
12599
@@ -0,0 +1,57 @@
12557
12600
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12558
12601
+ *
12614
12657
Index: gnome-control-center/panels/sound-nua/gvc-mixer-sink-input.c
12615
12658
===================================================================
12616
12659
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12617
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink-input.c        2012-02-08 00:21:13.853662000 -0500
 
12660
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink-input.c        2012-02-10 14:39:56.993601000 -0500
12618
12661
@@ -0,0 +1,166 @@
12619
12662
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12620
12663
+ *
12785
12828
Index: gnome-control-center/panels/sound-nua/gvc-mixer-sink-input.h
12786
12829
===================================================================
12787
12830
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12788
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink-input.h        2012-02-08 00:21:13.853662000 -0500
 
12831
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink-input.h        2012-02-10 14:39:56.993601000 -0500
12789
12832
@@ -0,0 +1,57 @@
12790
12833
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12791
12834
+ *
12847
12890
Index: gnome-control-center/panels/sound-nua/gvc-mixer-sink.c
12848
12891
===================================================================
12849
12892
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
12850
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink.c      2012-02-08 00:21:13.853662000 -0500
 
12893
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink.c      2012-02-10 14:39:56.993601000 -0500
12851
12894
@@ -0,0 +1,196 @@
12852
12895
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
12853
12896
+ *
13048
13091
Index: gnome-control-center/panels/sound-nua/gvc-mixer-sink.h
13049
13092
===================================================================
13050
13093
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13051
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink.h      2012-02-08 00:21:13.853662000 -0500
 
13094
+++ gnome-control-center/panels/sound-nua/gvc-mixer-sink.h      2012-02-10 14:39:56.993601000 -0500
13052
13095
@@ -0,0 +1,57 @@
13053
13096
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13054
13097
+ *
13110
13153
Index: gnome-control-center/panels/sound-nua/gvc-mixer-source-output.c
13111
13154
===================================================================
13112
13155
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13113
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source-output.c     2012-02-08 00:21:13.853662000 -0500
 
13156
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source-output.c     2012-02-10 14:39:56.993601000 -0500
13114
13157
@@ -0,0 +1,121 @@
13115
13158
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13116
13159
+ *
13236
13279
Index: gnome-control-center/panels/sound-nua/gvc-mixer-source-output.h
13237
13280
===================================================================
13238
13281
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13239
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source-output.h     2012-02-08 00:21:13.853662000 -0500
 
13282
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source-output.h     2012-02-10 14:39:56.993601000 -0500
13240
13283
@@ -0,0 +1,57 @@
13241
13284
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13242
13285
+ *
13298
13341
Index: gnome-control-center/panels/sound-nua/gvc-mixer-source.c
13299
13342
===================================================================
13300
13343
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13301
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source.c    2012-02-08 00:21:13.853662000 -0500
 
13344
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source.c    2012-02-10 14:39:56.993601000 -0500
13302
13345
@@ -0,0 +1,196 @@
13303
13346
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13304
13347
+ *
13499
13542
Index: gnome-control-center/panels/sound-nua/gvc-mixer-source.h
13500
13543
===================================================================
13501
13544
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13502
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source.h    2012-02-08 00:21:13.853662000 -0500
 
13545
+++ gnome-control-center/panels/sound-nua/gvc-mixer-source.h    2012-02-10 14:39:56.993601000 -0500
13503
13546
@@ -0,0 +1,57 @@
13504
13547
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13505
13548
+ *
13561
13604
Index: gnome-control-center/panels/sound-nua/gvc-mixer-stream-private.h
13562
13605
===================================================================
13563
13606
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13564
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-stream-private.h    2012-02-08 00:21:13.853662000 -0500
 
13607
+++ gnome-control-center/panels/sound-nua/gvc-mixer-stream-private.h    2012-02-10 14:39:56.993601000 -0500
13565
13608
@@ -0,0 +1,34 @@
13566
13609
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13567
13610
+ *
13600
13643
Index: gnome-control-center/panels/sound-nua/gvc-mixer-stream.c
13601
13644
===================================================================
13602
13645
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
13603
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-stream.c    2012-02-08 00:21:13.853662000 -0500
 
13646
+++ gnome-control-center/panels/sound-nua/gvc-mixer-stream.c    2012-02-10 14:39:56.993601000 -0500
13604
13647
@@ -0,0 +1,968 @@
13605
13648
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
13606
13649
+ *
14573
14616
Index: gnome-control-center/panels/sound-nua/gvc-mixer-stream.h
14574
14617
===================================================================
14575
14618
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14576
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-stream.h    2012-02-08 00:21:13.853662000 -0500
 
14619
+++ gnome-control-center/panels/sound-nua/gvc-mixer-stream.h    2012-02-10 14:39:56.993601000 -0500
14577
14620
@@ -0,0 +1,128 @@
14578
14621
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
14579
14622
+ *
14706
14749
Index: gnome-control-center/panels/sound-nua/gvc-mixer-ui-device.c
14707
14750
===================================================================
14708
14751
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
14709
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-ui-device.c 2012-02-09 16:15:03.140966793 -0500
14710
 
@@ -0,0 +1,603 @@
 
14752
+++ gnome-control-center/panels/sound-nua/gvc-mixer-ui-device.c 2012-02-10 14:40:47.385282961 -0500
 
14753
@@ -0,0 +1,612 @@
14711
14754
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
14712
14755
+/*
14713
14756
+ * gvc-mixer-ui-device.c
14747
14790
+       GList*                  supported_profiles;
14748
14791
+       UiDeviceDirection       type;
14749
14792
+       GHashTable*             profiles;
14750
 
+       gboolean                        disable_profile_swapping;
14751
 
+       gchar*                          user_preferred_profile;
 
14793
+       gboolean                disable_profile_swapping;
 
14794
+       gchar*                  user_preferred_profile;
14752
14795
+};
14753
14796
+
14754
14797
+enum
15034
15077
+       gint profile_count;
15035
15078
+       GList* t;
15036
15079
+       GHashTable *profile_descriptions;
 
15080
+       if (in_profiles == NULL)
 
15081
+               return;
15037
15082
+
15038
15083
+       device->priv->supported_profiles = in_profiles;
15039
15084
+               
15193
15238
+               // We can't find the ideal profile for the insensitive combo
15194
15239
+               // just pick the one with the highest priority.
15195
15240
+               if (!matched){  
15196
 
+                       GvcMixerCardProfile* p;
 
15241
+                       GvcMixerCardProfile* p = NULL;
15197
15242
+                       // Since the profile list was already sorted on card port creation
15198
15243
+                       // we just need to take the last one as this will have the highest priority
15199
15244
+                       p = g_list_last (in_profiles)->data;
15200
 
+                       g_hash_table_insert (device->priv->profiles, 
15201
 
+                                            "tmp",
15202
 
+                                            p);                        
 
15245
+                       if (p != NULL)
 
15246
+                               g_hash_table_insert (device->priv->profiles, 
 
15247
+                                                    "tmp",
 
15248
+                                                     p);                       
15203
15249
+               }
15204
15250
+       }
15205
15251
+
15268
15314
+}
15269
15315
+
15270
15316
+const gchar*
 
15317
+gvc_mixer_ui_device_get_origin (GvcMixerUIDevice *op)
 
15318
+{
 
15319
+       return op->priv->second_line_desc;
 
15320
+}
 
15321
+
 
15322
+const gchar*
15271
15323
+gvc_mixer_ui_device_get_user_preferred_profile (GvcMixerUIDevice *dev)
15272
15324
+{
15273
15325
+       return dev->priv->user_preferred_profile;
15314
15366
Index: gnome-control-center/panels/sound-nua/gvc-mixer-ui-device.h
15315
15367
===================================================================
15316
15368
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15317
 
+++ gnome-control-center/panels/sound-nua/gvc-mixer-ui-device.h 2012-02-09 16:15:03.140966793 -0500
 
15369
+++ gnome-control-center/panels/sound-nua/gvc-mixer-ui-device.h 2012-02-10 14:39:56.993601000 -0500
15318
15370
@@ -0,0 +1,74 @@
15319
15371
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
15320
15372
+/*
15393
15445
Index: gnome-control-center/panels/sound-nua/gvc-pulseaudio-fake.h
15394
15446
===================================================================
15395
15447
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15396
 
+++ gnome-control-center/panels/sound-nua/gvc-pulseaudio-fake.h 2012-02-08 00:21:13.853662000 -0500
 
15448
+++ gnome-control-center/panels/sound-nua/gvc-pulseaudio-fake.h 2012-02-10 14:39:56.993601000 -0500
15397
15449
@@ -0,0 +1,34 @@
15398
15450
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15399
15451
+ *
15432
15484
Index: gnome-control-center/panels/sound-nua/gvc-sound-theme-chooser.c
15433
15485
===================================================================
15434
15486
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
15435
 
+++ gnome-control-center/panels/sound-nua/gvc-sound-theme-chooser.c     2012-02-08 00:21:13.853662000 -0500
 
15487
+++ gnome-control-center/panels/sound-nua/gvc-sound-theme-chooser.c     2012-02-10 14:39:56.993601000 -0500
15436
15488
@@ -0,0 +1,856 @@
15437
15489
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
15438
15490
+ *
16293
16345
Index: gnome-control-center/panels/sound-nua/gvc-sound-theme-chooser.h
16294
16346
===================================================================
16295
16347
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16296
 
+++ gnome-control-center/panels/sound-nua/gvc-sound-theme-chooser.h     2012-02-08 00:21:13.853662000 -0500
 
16348
+++ gnome-control-center/panels/sound-nua/gvc-sound-theme-chooser.h     2012-02-10 14:39:56.993601000 -0500
16297
16349
@@ -0,0 +1,54 @@
16298
16350
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16299
16351
+ *
16352
16404
Index: gnome-control-center/panels/sound-nua/gvc-speaker-test.c
16353
16405
===================================================================
16354
16406
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16355
 
+++ gnome-control-center/panels/sound-nua/gvc-speaker-test.c    2012-02-08 00:21:13.853662000 -0500
 
16407
+++ gnome-control-center/panels/sound-nua/gvc-speaker-test.c    2012-02-10 14:39:56.993601000 -0500
16356
16408
@@ -0,0 +1,531 @@
16357
16409
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16358
16410
+ *
16888
16940
Index: gnome-control-center/panels/sound-nua/gvc-speaker-test.h
16889
16941
===================================================================
16890
16942
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16891
 
+++ gnome-control-center/panels/sound-nua/gvc-speaker-test.h    2012-02-08 00:21:13.853662000 -0500
 
16943
+++ gnome-control-center/panels/sound-nua/gvc-speaker-test.h    2012-02-10 14:39:56.993601000 -0500
16892
16944
@@ -0,0 +1,57 @@
16893
16945
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16894
16946
+ *
16950
17002
Index: gnome-control-center/panels/sound-nua/gvc-stream-status-icon.c
16951
17003
===================================================================
16952
17004
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
16953
 
+++ gnome-control-center/panels/sound-nua/gvc-stream-status-icon.c      2012-02-08 00:21:13.853662000 -0500
 
17005
+++ gnome-control-center/panels/sound-nua/gvc-stream-status-icon.c      2012-02-10 14:39:56.993601000 -0500
16954
17006
@@ -0,0 +1,780 @@
16955
17007
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16956
17008
+ *
17735
17787
Index: gnome-control-center/panels/sound-nua/gvc-stream-status-icon.h
17736
17788
===================================================================
17737
17789
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
17738
 
+++ gnome-control-center/panels/sound-nua/gvc-stream-status-icon.h      2012-02-08 00:21:13.853662000 -0500
 
17790
+++ gnome-control-center/panels/sound-nua/gvc-stream-status-icon.h      2012-02-10 14:39:56.993601000 -0500
17739
17791
@@ -0,0 +1,63 @@
17740
17792
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
17741
17793
+ *
17803
17855
Index: gnome-control-center/panels/sound-nua/sound-theme-file-utils.c
17804
17856
===================================================================
17805
17857
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
17806
 
+++ gnome-control-center/panels/sound-nua/sound-theme-file-utils.c      2012-02-08 00:21:13.853662000 -0500
 
17858
+++ gnome-control-center/panels/sound-nua/sound-theme-file-utils.c      2012-02-10 14:39:56.993601000 -0500
17807
17859
@@ -0,0 +1,305 @@
17808
17860
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
17809
17861
+ * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
18113
18165
Index: gnome-control-center/panels/sound-nua/sound-theme-file-utils.h
18114
18166
===================================================================
18115
18167
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
18116
 
+++ gnome-control-center/panels/sound-nua/sound-theme-file-utils.h      2012-02-08 00:21:13.853662000 -0500
 
18168
+++ gnome-control-center/panels/sound-nua/sound-theme-file-utils.h      2012-02-10 14:39:56.993601000 -0500
18117
18169
@@ -0,0 +1,37 @@
18118
18170
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
18119
18171
+ * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
18154
18206
+#endif /* __SOUND_THEME_FILE_UTILS_HH__ */
18155
18207
Index: gnome-control-center/panels/sound/data/gnome-sound-panel.desktop.in.in
18156
18208
===================================================================
18157
 
--- gnome-control-center.orig/panels/sound/data/gnome-sound-panel.desktop.in.in 2012-02-08 00:21:13.853662000 -0500
18158
 
+++ gnome-control-center/panels/sound/data/gnome-sound-panel.desktop.in.in      2012-02-08 00:20:45.270751000 -0500
 
18209
--- gnome-control-center.orig/panels/sound/data/gnome-sound-panel.desktop.in.in 2012-02-10 14:39:56.993601000 -0500
 
18210
+++ gnome-control-center/panels/sound/data/gnome-sound-panel.desktop.in.in      2012-02-10 14:39:56.993601000 -0500
18159
18211
@@ -7,7 +7,7 @@
18160
18212
 Type=Application
18161
18213
 StartupNotify=true