Author: jannis
Date: 2008-06-21 18:10:10 +0000 (Sat, 21 Jun 2008)
New Revision: 27116
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
Log:
* libxfce4mixer/xfce-mixer-card.c: Mark cards as ready when
creating them. If the state is changed asynchroneously, wait
until the state change is done before returning from
xfce_mixer_card_set_state_ready().
Modified: xfce4-mixer/trunk/ChangeLog
===================================================================
--- xfce4-mixer/trunk/ChangeLog 2008-06-21 17:14:33 UTC (rev 27115)
+++ xfce4-mixer/trunk/ChangeLog 2008-06-21 18:10:10 UTC (rev 27116)
@@ -1,5 +1,12 @@
2008-06-21 Jannis Pohlmann <[EMAIL PROTECTED]>
+ * libxfce4mixer/xfce-mixer-card.c: Mark cards as ready when
+ creating them. If the state is changed asynchroneously, wait
+ until the state change is done before returning from
+ xfce_mixer_card_set_state_ready().
+
+2008-06-21 Jannis Pohlmann <[EMAIL PROTECTED]>
+
* panel-plugin/xfce-volume-button.c: Remove the keyboard
grabbing feature. It causes too much problems. People without
a mousewheel will have to click the plugin and use the real
Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c
===================================================================
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c 2008-06-21 17:14:33 UTC
(rev 27115)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-card.c 2008-06-21 18:10:10 UTC
(rev 27116)
@@ -155,6 +155,8 @@
card->element = element;
card->display_name = g_strdup (g_object_get_data (G_OBJECT (card->element),
"xfce-mixer-control-name"));
+ xfce_mixer_card_set_ready (card);
+
return card;
}
@@ -197,7 +199,9 @@
xfce_mixer_card_set_ready (XfceMixerCard *card)
{
g_return_if_fail (IS_XFCE_MIXER_CARD (card));
+
gst_element_set_state (card->element, GST_STATE_READY);
+ gst_element_get_state (card->element, NULL, NULL, GST_CLOCK_TIME_NONE);
}
@@ -241,7 +245,7 @@
tracks = gst_mixer_list_tracks (GST_MIXER (card->element));
- for (iter = g_list_first (tracks); iter != NULL; iter = g_list_next (iter))
+ for (iter = tracks; iter != NULL; iter = iter->next)
if (G_UNLIKELY (g_utf8_collate (GST_MIXER_TRACK (iter->data)->label,
track_name) == 0))
{
track = GST_MIXER_TRACK (iter->data);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
