src/modules/module-device-restore.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 2568542b1839ff7ee02fbe7d766bf8ee0eb88d09
Author: Arun Raghavan <arun.ragha...@collabora.co.uk>
Date: Thu Aug 18 13:34:33 2011 +0530
Revert "device-restore: Make bools not be bit fields"
This reverts commit ba163b8b23bcd72c35b028eb0b43c31a6ae1724d.
After discussion with Colin, decided that we don't want to do this
piecemeal -- need some discussion on the mailing-list and then we should
do this across the tree in one fell swoop post 1.0.
Conflicts:
src/modules/module-device-restore.c
diff --git a/src/modules/module-device-restore.c
b/src/modules/module-device-restore.c
index 6c5c27e..914febe 100644
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -93,10 +93,10 @@ struct userdata {
pa_native_protocol *protocol;
pa_idxset *subscribed;
- pa_bool_t restore_volume;
- pa_bool_t restore_muted;
- pa_bool_t restore_port;
- pa_bool_t restore_formats;
+ pa_bool_t restore_volume:1;
+ pa_bool_t restore_muted:1;
+ pa_bool_t restore_port:1;
+ pa_bool_t restore_formats:1;
};
/* Protocol extention commands */
_______________________________________________
pulseaudio-commits mailing list
pulseaudio-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
