diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-06-29 18:35:06 +0300 |
| commit | 0bc538b08ca5c4efea86700cb6c4685da3f34345 (patch) | |
| tree | e5b0fe4b967ecb7e9251faf21904bbbe825aaab7 /src/pulsecore/card.h | |
| parent | b152f3a052eca7225870a7dc4d8a719bee107f0f (diff) | |
| parent | 2654eb7781ddcfe53064745bbad77bffe5c8eada (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
Diffstat (limited to 'src/pulsecore/card.h')
| -rw-r--r-- | src/pulsecore/card.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/pulsecore/card.h b/src/pulsecore/card.h index 3b7608f6..2d691b67 100644 --- a/src/pulsecore/card.h +++ b/src/pulsecore/card.h @@ -63,7 +63,7 @@ struct pa_card { pa_hashmap *profiles; pa_card_profile *active_profile; - pa_bool_t save_profile; + pa_bool_t save_profile:1; void *userdata; @@ -72,9 +72,8 @@ struct pa_card { typedef struct pa_card_new_data { char *name; - char *description; - pa_proplist *proplist; + const char *driver; pa_module *module; @@ -99,6 +98,6 @@ void pa_card_free(pa_card *c); int pa_card_set_profile(pa_card *c, const char *name, pa_bool_t save); -int pa_card_suspend(pa_card *c, pa_bool_t suspend); +int pa_card_suspend(pa_card *c, pa_bool_t suspend, pa_suspend_cause_t cause); #endif |