diff options
author | Michal Ratajsky <[email protected]> | 2014-06-20 00:12:40 +0200 |
---|---|---|
committer | Michal Ratajsky <[email protected]> | 2014-06-20 00:12:40 +0200 |
commit | 6be9a89195e0d3bf8408cea661f22cb97b638f24 (patch) | |
tree | 745cfec763facc62b6c3bc51cd246e5cad4d9f68 /libmatemixer/matemixer-enum-types.c | |
parent | a2290d5e13ccee88fd9ae66a3895eb4da646f81f (diff) | |
download | libmatemixer-6be9a89195e0d3bf8408cea661f22cb97b638f24.tar.bz2 libmatemixer-6be9a89195e0d3bf8408cea661f22cb97b638f24.tar.xz |
Pulse and API updates, fixes
Diffstat (limited to 'libmatemixer/matemixer-enum-types.c')
-rw-r--r-- | libmatemixer/matemixer-enum-types.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/libmatemixer/matemixer-enum-types.c b/libmatemixer/matemixer-enum-types.c index 43249a3..e353e0c 100644 --- a/libmatemixer/matemixer-enum-types.c +++ b/libmatemixer/matemixer-enum-types.c @@ -64,19 +64,20 @@ mate_mixer_backend_type_get_type (void) } GType -mate_mixer_port_status_get_type (void) +mate_mixer_port_flags_get_type (void) { static GType etype = 0; if (etype == 0) { - static const GEnumValue values[] = { - { MATE_MIXER_PORT_UNKNOWN_STATUS, "MATE_MIXER_PORT_UNKNOWN_STATUS", "unknown-status" }, + static const GFlagsValue values[] = { + { MATE_MIXER_PORT_NO_FLAGS, "MATE_MIXER_PORT_NO_FLAGS", "no-flags" }, { MATE_MIXER_PORT_AVAILABLE, "MATE_MIXER_PORT_AVAILABLE", "available" }, - { MATE_MIXER_PORT_UNAVAILABLE, "MATE_MIXER_PORT_UNAVAILABLE", "unavailable" }, + { MATE_MIXER_PORT_INPUT, "MATE_MIXER_PORT_INPUT", "input" }, + { MATE_MIXER_PORT_OUTPUT, "MATE_MIXER_PORT_OUTPUT", "output" }, { 0, NULL, NULL } }; - etype = g_enum_register_static ( - g_intern_static_string ("MateMixerPortStatus"), + etype = g_flags_register_static ( + g_intern_static_string ("MateMixerPortFlags"), values); } return etype; @@ -94,14 +95,16 @@ mate_mixer_stream_flags_get_type (void) { MATE_MIXER_STREAM_OUTPUT, "MATE_MIXER_STREAM_OUTPUT", "output" }, { MATE_MIXER_STREAM_CLIENT, "MATE_MIXER_STREAM_CLIENT", "client" }, { MATE_MIXER_STREAM_APPLICATION, "MATE_MIXER_STREAM_APPLICATION", "application" }, - { MATE_MIXER_STREAM_OUTPUT_MONITOR, "MATE_MIXER_STREAM_OUTPUT_MONITOR", "output-monitor" }, + { MATE_MIXER_STREAM_EVENT, "MATE_MIXER_STREAM_EVENT", "event" }, { MATE_MIXER_STREAM_HAS_MUTE, "MATE_MIXER_STREAM_HAS_MUTE", "has-mute" }, { MATE_MIXER_STREAM_HAS_VOLUME, "MATE_MIXER_STREAM_HAS_VOLUME", "has-volume" }, { MATE_MIXER_STREAM_HAS_DECIBEL_VOLUME, "MATE_MIXER_STREAM_HAS_DECIBEL_VOLUME", "has-decibel-volume" }, { MATE_MIXER_STREAM_HAS_FLAT_VOLUME, "MATE_MIXER_STREAM_HAS_FLAT_VOLUME", "has-flat-volume" }, + { MATE_MIXER_STREAM_HAS_MONITOR, "MATE_MIXER_STREAM_HAS_MONITOR", "has-monitor" }, { MATE_MIXER_STREAM_CAN_BALANCE, "MATE_MIXER_STREAM_CAN_BALANCE", "can-balance" }, { MATE_MIXER_STREAM_CAN_FADE, "MATE_MIXER_STREAM_CAN_FADE", "can-fade" }, { MATE_MIXER_STREAM_CAN_SET_VOLUME, "MATE_MIXER_STREAM_CAN_SET_VOLUME", "can-set-volume" }, + { MATE_MIXER_STREAM_CAN_SUSPEND, "MATE_MIXER_STREAM_CAN_SUSPEND", "can-suspend" }, { 0, NULL, NULL } }; etype = g_flags_register_static ( @@ -112,20 +115,20 @@ mate_mixer_stream_flags_get_type (void) } GType -mate_mixer_stream_status_get_type (void) +mate_mixer_stream_state_get_type (void) { static GType etype = 0; if (etype == 0) { static const GEnumValue values[] = { - { MATE_MIXER_STREAM_UNKNOWN_STATUS, "MATE_MIXER_STREAM_UNKNOWN_STATUS", "unknown-status" }, + { MATE_MIXER_STREAM_UNKNOWN_STATE, "MATE_MIXER_STREAM_UNKNOWN_STATE", "unknown-state" }, { MATE_MIXER_STREAM_RUNNING, "MATE_MIXER_STREAM_RUNNING", "running" }, { MATE_MIXER_STREAM_IDLE, "MATE_MIXER_STREAM_IDLE", "idle" }, { MATE_MIXER_STREAM_SUSPENDED, "MATE_MIXER_STREAM_SUSPENDED", "suspended" }, { 0, NULL, NULL } }; etype = g_enum_register_static ( - g_intern_static_string ("MateMixerStreamStatus"), + g_intern_static_string ("MateMixerStreamState"), values); } return etype; |