From 7ba3797b9006f0a7e048787ee6de91fd05e60d2b Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 4 Feb 2011 14:08:09 +0000 Subject: on the last hurdle --- src/active-sink.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 93 insertions(+), 8 deletions(-) (limited to 'src/active-sink.c') diff --git a/src/active-sink.c b/src/active-sink.c index e85aab8..b41d6d3 100644 --- a/src/active-sink.c +++ b/src/active-sink.c @@ -17,15 +17,24 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include -#include +#include + #include "active-sink.h" +#include "slider-menu-item.h" +#include "mute-menu-item.h" + + typedef struct _ActiveSinkPrivate ActiveSinkPrivate; struct _ActiveSinkPrivate { - sink_details* details; + gboolean is_active; + SliderMenuItem* volume_slider_menuitem; + MuteMenuItem* mute_menuitem; + SoundState current_sound_state; + gint index; + SoundServiceDbus* service; }; #define ACTIVE_SINK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ACTIVE_SINK_TYPE, ActiveSinkPrivate)) @@ -36,6 +45,8 @@ static void active_sink_init (ActiveSink *self); static void active_sink_dispose (GObject *object); static void active_sink_finalize (GObject *object); +static SoundState active_sink_get_state_from_volume (ActiveSink* self); + G_DEFINE_TYPE (ActiveSink, active_sink, G_TYPE_OBJECT); static void @@ -54,6 +65,15 @@ active_sink_init(ActiveSink *self) { ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (self); priv->details = NULL; + priv->mute_menuitem = NULL; + priv->volume_slider_menuitem = NULL; + priv->current_sound_state = UNAVAILABLE; + priv->is_active = TRUE; + priv->index = -1; + + // Init our menu items. + priv->mute_menuitem = g_object_new (MUTE_MENU_ITEM_TYPE, NULL); + priv->volume_slider_menuitem = g_object_new (SLIDER_MENU_ITEM_TYPE, NULL); } static void @@ -76,38 +96,103 @@ active_sink_finalize (GObject *object) G_OBJECT_CLASS (active_sink_parent_class)->finalize (object); } +// This needs to populate the appropriate values on the menu items void -active_sink_update_details (ActiveSink* sink, sink_details* details) +active_sink_populate (ActiveSink* sink, + gdouble volume, + gboolean mute, + gint device_index) { ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE(sink); - priv->details = details; + active_sink_update_volume (sink, volume); + active_sink_update_mute (sink, mute); + priv->index = device_index; + priv->is_active = TRUE; } gboolean active_sink_is_populated (ActiveSink* sink) { ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (sink); - return (priv->details != NULL); + return priv->is_active; } gboolean active_sink_is_muted (ActiveSink* self) { - return FALSE; + ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (self); + return mute_menu_item_is_muted (priv->mute_menuitem); } gint active_sink_get_index (ActiveSink* self) { - return 0; + ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (self); + return priv->index; } void active_sink_update_volume (ActiveSink* self, gdouble percent) { + ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (self); + slider_menu_item_update (priv->volume_slider_menuitem, percent); + sound_service_dbus_update_sound_state (priv->service, + active_sink_get_state_from_volume (self)); } void active_sink_update_mute (ActiveSink* self, gboolean muted) { + ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (self); + mute_menu_item_update (priv->mute_menuitem, muted); + SoundState state = active_sink_get_state_from_volume (self); + + if (muted == TRUE){ + state = MUTED; + } + sound_service_dbus_update_sound_state (priv->service, state); +} + +SoundState +active_sink_get_state (ActiveSink* self) +{ + ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (self); + return priv->current_sound_state; +} + + +static SoundState +active_sink_get_state_from_volume (ActiveSink* self) +{ + ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (self); + GVariant* v = dbusmenu_menuitem_property_get_variant (DBUSMENU_MENUITEM(priv->volume_slider_menuitem), + DBUSMENU_VOLUME_MENUITEM_LEVEL); + gdouble volume_percent = g_variant_get_double (v); + + SoundState state = LOW_LEVEL; + + if (volume_percent < 30.0 && volume_percent > 0) { + state = LOW_LEVEL; + } + else if (volume_percent < 70.0 && volume_percent >= 30.0) { + state = MEDIUM_LEVEL; + } + else if (volume_percent >= 70.0) { + state = HIGH_LEVEL; + } + else if (volume_percent == 0.0) { + state = ZERO_LEVEL; + } + return state; +} + +ActiveSink* active_sink_new (SoundServiceDbus* service) +{ + ActiveSink* sink = g_object_new (ACTIVE_SINK_TYPE, NULL); + ActiveSinkPrivate* priv = ACTIVE_SINK_GET_PRIVATE (sink); + priv->service = service; + sound_service_dbus_build_sound_menu (service, + priv->mute_menuitem, + priv->voluem_slider_menuitem); + return sink; } -- cgit v1.2.3