From ec287ed34db17df23ab16d9199fbbb48bd6b246f Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 13 Jul 2010 14:06:55 +0100 Subject: fixed silly previous problem --- src/transport-widget.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c index f02200e..9450ea5 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -149,12 +149,13 @@ transport_widget_button_press_event (GtkWidget *menuitem, gint result = determine_button_event(priv->play_button, event); - GValue value = {0}; - g_value_init(&value, G_TYPE_INT); - g_debug("TransportWidget::menu_press_event - going to send value %i", result); - g_value_set_int(&value, result); - dbusmenu_menuitem_handle_event (priv->twin_item, "Transport state change", &value, 0); - + if(result >= 0){ + GValue value = {0}; + g_value_init(&value, G_TYPE_INT); + g_debug("TransportWidget::menu_press_event - going to send value %i", result); + g_value_set_int(&value, result); + dbusmenu_menuitem_handle_event (priv->twin_item, "Transport state change", &value, 0); + } return TRUE; } -- cgit v1.2.3 From 3866f14c102eec187e6fddbb7cf470df148053a3 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 13 Jul 2010 17:31:19 +0100 Subject: button press background done --- src/transport-widget.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c index 9450ea5..da4f7ad 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -137,9 +137,7 @@ static gboolean transport_widget_button_press_event (GtkWidget *menuitem, GdkEventButton *event) { - if(IS_TRANSPORT_WIDGET(menuitem) == FALSE){ - return FALSE; - } + g_return_val_if_fail(IS_TRANSPORT_WIDGET(menuitem), FALSE); TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem)); @@ -155,6 +153,7 @@ transport_widget_button_press_event (GtkWidget *menuitem, g_debug("TransportWidget::menu_press_event - going to send value %i", result); g_value_set_int(&value, result); dbusmenu_menuitem_handle_event (priv->twin_item, "Transport state change", &value, 0); + play_button_react_to_button_press(priv->play_button, result); } return TRUE; } @@ -165,9 +164,9 @@ transport_widget_button_release_event (GtkWidget *menuitem, GdkEventButton *event) { g_debug("TransportWidget::menu_release_event"); - if(IS_TRANSPORT_WIDGET(menuitem) == FALSE){ - return FALSE; - } + g_return_val_if_fail(IS_TRANSPORT_WIDGET(menuitem), FALSE); + TransportWidgetPrivate * priv = TRANSPORT_WIDGET_GET_PRIVATE(TRANSPORT_WIDGET(menuitem)); + play_button_react_to_button_release(priv->play_button); return TRUE; } -- cgit v1.2.3 From 858c43dbd4be74c8979bc778b83a1642784a7e02 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 13 Jul 2010 18:12:45 +0100 Subject: moving towards the play button pause button swap --- src/transport-widget.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c index da4f7ad..17dfee1 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -180,12 +180,13 @@ transport_widget_property_update(DbusmenuMenuitem* item, gchar* property, GValue* value, gpointer userdata) { g_debug("transport_widget_update_state - with property %s", property); - //int update_value = g_value_get_int(value); - //g_debug("transport_widget_update_state - with value %i", update_value); - - //TransportWidget* bar = (TransportWidget*)userdata; - //TransportWidgetPrivate *priv = TRANSPORT_WIDGET_GET_PRIVATE(bar); + TransportWidget* bar = (TransportWidget*)userdata; + g_return_val_if_fail(IS_TRANSPORT_WIDGET(bar), FALSE); + TransportWidgetPrivate *priv = TRANSPORT_WIDGET_GET_PRIVATE(bar); + int update_value = g_value_get_int(value); + g_debug("transport_widget_update_state - with value %i", update_value); + play_button_toggle_play_pause(priv->play_button, update_value); } /** -- cgit v1.2.3 From 42f71fbdeb2beb78a3c4381caaa75c66e5b1b6b4 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 15 Jul 2010 15:46:54 +0100 Subject: tidied up some enums using typedefs and some more bits and pieces --- src/transport-widget.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c index 17dfee1..3174afe 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -145,13 +145,13 @@ transport_widget_button_press_event (GtkWidget *menuitem, parent = gtk_widget_get_parent (GTK_WIDGET (menuitem)); - gint result = determine_button_event(priv->play_button, event); + PlayButtonEvent result = determine_button_event(priv->play_button, event); - if(result >= 0){ + if(result != TRANSPORT_NADA){ GValue value = {0}; g_value_init(&value, G_TYPE_INT); - g_debug("TransportWidget::menu_press_event - going to send value %i", result); - g_value_set_int(&value, result); + g_debug("TransportWidget::menu_press_event - going to send value %i", (int)result); + g_value_set_int(&value, (int)result); dbusmenu_menuitem_handle_event (priv->twin_item, "Transport state change", &value, 0); play_button_react_to_button_press(priv->play_button, result); } @@ -181,7 +181,7 @@ transport_widget_property_update(DbusmenuMenuitem* item, gchar* property, { g_debug("transport_widget_update_state - with property %s", property); TransportWidget* bar = (TransportWidget*)userdata; - g_return_val_if_fail(IS_TRANSPORT_WIDGET(bar), FALSE); + g_return_if_fail(IS_TRANSPORT_WIDGET(bar)); TransportWidgetPrivate *priv = TRANSPORT_WIDGET_GET_PRIVATE(bar); int update_value = g_value_get_int(value); -- cgit v1.2.3 From d92a4492dcfca6030f8a9b32c111e582ba4e8f96 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 20 Jul 2010 12:24:43 +0200 Subject: play pause both graphically and functionally now working --- src/transport-widget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/transport-widget.c') diff --git a/src/transport-widget.c b/src/transport-widget.c index 3174afe..c616fff 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -186,7 +186,7 @@ transport_widget_property_update(DbusmenuMenuitem* item, gchar* property, TransportWidgetPrivate *priv = TRANSPORT_WIDGET_GET_PRIVATE(bar); int update_value = g_value_get_int(value); g_debug("transport_widget_update_state - with value %i", update_value); - play_button_toggle_play_pause(priv->play_button, update_value); + play_button_toggle_play_pause(priv->play_button, (PlayButtonState)update_value); } /** -- cgit v1.2.3