[Xfce4-commits] r29424 - in xfce4-mixer/trunk: . libxfce4mixer xfce4-mixer
Jannis Pohlmann
jannis at xfce.org
Sun Feb 1 18:02:47 CET 2009
Author: jannis
Date: 2009-02-01 17:02:47 +0000 (Sun, 01 Feb 2009)
New Revision: 29424
Modified:
xfce4-mixer/trunk/ChangeLog
xfce4-mixer/trunk/libxfce4mixer/libxfce4mixer.c
xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c
xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
Log:
* libxfce4mixer/libxfce4mixer.c,
libxfce4mixer/xfce-mixer-preferences.c,
libxfce4mixer/xfce-mixer-track-combo.c,
xfce4-mixer/xfce-mixer-controls-dialog.c,
xfce4-mixer/xfce-mixer-option.c, xfce4-mixer/xfce-mixer-switch.c,
xfce4-mixer/xfce-mixer-track.c, xfce4-mixer/xfce-mixer.c: Don't read
track labels from the 'label' member of the GstMixerTrack struct.
Instead, use the 'label' property. The struct member is undocumented
and may not work with all backends.
Modified: xfce4-mixer/trunk/ChangeLog
===================================================================
--- xfce4-mixer/trunk/ChangeLog 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/ChangeLog 2009-02-01 17:02:47 UTC (rev 29424)
@@ -1,3 +1,15 @@
+2009-02-01 Jannis Pohlmann <jannis at xfce.org>
+
+ * libxfce4mixer/libxfce4mixer.c,
+ libxfce4mixer/xfce-mixer-preferences.c,
+ libxfce4mixer/xfce-mixer-track-combo.c,
+ xfce4-mixer/xfce-mixer-controls-dialog.c,
+ xfce4-mixer/xfce-mixer-option.c, xfce4-mixer/xfce-mixer-switch.c,
+ xfce4-mixer/xfce-mixer-track.c, xfce4-mixer/xfce-mixer.c: Don't read
+ track labels from the 'label' member of the GstMixerTrack struct.
+ Instead, use the 'label' property. The struct member is undocumented
+ and may not work with all backends.
+
2009-01-25 Jannis Pohlmann <jannis at xfce.org>
* == 4.5.99.1 released! ==
Modified: xfce4-mixer/trunk/libxfce4mixer/libxfce4mixer.c
===================================================================
--- xfce4-mixer/trunk/libxfce4mixer/libxfce4mixer.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/libxfce4mixer/libxfce4mixer.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -164,17 +164,25 @@
{
GstMixerTrack *track = NULL;
const GList *iter;
+ gchar *label;
g_return_val_if_fail (GST_IS_MIXER (card), NULL);
g_return_val_if_fail (track_name != NULL, NULL);
for (iter = gst_mixer_list_tracks (GST_MIXER (card)); iter != NULL; iter = g_list_next (iter))
- if (g_utf8_collate (GST_MIXER_TRACK (iter->data)->label, track_name) == 0)
- {
- track = iter->data;
- break;
- }
+ {
+ g_object_get (GST_MIXER_TRACK (iter->data), "label", &label, NULL);
+ if (g_utf8_collate (label, track_name) == 0)
+ {
+ track = iter->data;
+ g_free (label);
+ break;
+ }
+
+ g_free (label);
+ }
+
return track;
}
Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c
===================================================================
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-preferences.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -373,24 +373,29 @@
gchar * const *controls;
const gchar *card_name;
gboolean visible = FALSE;
+ gchar *label;
gint i;
g_return_val_if_fail (IS_XFCE_MIXER_PREFERENCES (preferences), FALSE);
g_return_val_if_fail (GST_IS_MIXER (card), FALSE);
g_return_val_if_fail (GST_IS_MIXER_TRACK (track), FALSE);
+ g_object_get (track, "label", &label, NULL);
+
card_name = xfce_mixer_get_card_internal_name (card);
controls = g_hash_table_lookup (preferences->controls, card_name);
if (G_LIKELY (controls != NULL))
{
for (i = 0; controls != NULL && controls[i] != NULL; ++i)
- if (g_utf8_collate (controls[i], track->label) == 0)
+ if (g_utf8_collate (controls[i], label) == 0)
{
visible = TRUE;
break;
}
}
+ g_free (label);
+
return visible;
}
Modified: xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c
===================================================================
--- xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/libxfce4mixer/xfce-mixer-track-combo.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -193,6 +193,7 @@
GtkTreeIter tree_iter;
const GList *iter;
GList *cards;
+ gchar *label;
gint counter;
gint active_index = 0;
@@ -218,11 +219,15 @@
if (type == XFCE_MIXER_TRACK_TYPE_PLAYBACK || type == XFCE_MIXER_TRACK_TYPE_CAPTURE)
{
+ g_object_get (GST_MIXER_TRACK (iter->data), "label", &label, NULL);
+
gtk_list_store_append (combo->list_store, &tree_iter);
gtk_list_store_set (combo->list_store, &tree_iter,
- NAME_COLUMN, GST_MIXER_TRACK (iter->data)->label,
+ NAME_COLUMN, label,
TRACK_COLUMN, GST_MIXER_TRACK (iter->data), -1);
+ g_free (label);
+
if (G_UNLIKELY (combo->track != NULL && combo->track == GST_MIXER_TRACK (iter->data)))
active_index = counter;
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-controls-dialog.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -251,6 +251,7 @@
GtkWidget *frame;
GtkWidget *scrollwin;
GList *item;
+ gchar *label;
gboolean visible;
dialog->store = gtk_list_store_new (2, G_TYPE_BOOLEAN, G_TYPE_STRING);
@@ -293,11 +294,15 @@
{
visible = xfce_mixer_preferences_get_control_visible (preferences, dialog->card, iter->data);
+ g_object_get (GST_MIXER_TRACK (iter->data), "label", &label, NULL, NULL);
+
gtk_list_store_append (dialog->store, &tree_iter);
gtk_list_store_set (dialog->store, &tree_iter,
VISIBLE_COLUMN, visible,
- NAME_COLUMN, GST_MIXER_TRACK (iter->data)->label,
+ NAME_COLUMN, label,
-1);
+
+ g_free (label);
}
}
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-option.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -164,13 +164,16 @@
GtkWidget *label;
const GList *iter;
const gchar *active_option;
+ gchar *track_label;
gchar *title;
gint i;
gtk_box_set_homogeneous (GTK_BOX (option), FALSE);
gtk_box_set_spacing (GTK_BOX (option), 12);
- title = g_strdup_printf ("%s:", option->track->label);
+ g_object_get (option->track, "label", &track_label, NULL);
+ title = g_strdup_printf ("%s:", track_label);
+ g_free (track_label);
label = gtk_label_new (title);
gtk_box_pack_start (GTK_BOX (option), label, FALSE, FALSE, 0);
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-switch.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -160,10 +160,14 @@
static void
xfce_mixer_switch_create_contents (XfceMixerSwitch *mixer_switch)
{
+ gchar *label;
+
gtk_box_set_homogeneous (GTK_BOX (mixer_switch), FALSE);
gtk_box_set_spacing (GTK_BOX (mixer_switch), 12);
- mixer_switch->check_button = gtk_check_button_new_with_mnemonic (mixer_switch->track->label);
+ g_object_get (mixer_switch->track, "label", &label, NULL);
+ mixer_switch->check_button = gtk_check_button_new_with_mnemonic (label);
+ g_free (label);
gtk_box_pack_start (GTK_BOX (mixer_switch), mixer_switch->check_button, FALSE, FALSE, 0);
gtk_widget_show (mixer_switch->check_button);
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -185,6 +185,7 @@
GtkWidget *button_box;
GtkWidget *fader;
gdouble step;
+ gchar *track_label;
gint channel;
gint columns;
gint *volumes;
@@ -200,7 +201,9 @@
gtk_table_set_col_spacings (GTK_TABLE (track), 6);
/* Put the name of the track on top of the other elements */
- label = gtk_label_new (track->gst_track->label);
+ g_object_get (track->gst_track, "label", &track_label, NULL);
+ label = gtk_label_new (track_label);
+ g_free (track_label);
gtk_misc_set_alignment (GTK_MISC (label), 0.5f, 0.5f);
gtk_table_attach (GTK_TABLE (track), label, 0, columns, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0);
gtk_widget_show (label);
Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c
===================================================================
--- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2009-02-01 13:35:26 UTC (rev 29423)
+++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2009-02-01 17:02:47 UTC (rev 29424)
@@ -161,7 +161,7 @@
XfceMixerTrackType type;
GstMixerTrack *track;
const GList *iter;
- const gchar *titles[4] = { _("Playback"), _("Capture"), _("Switches"), _("Options") };
+ const gchar *titles[4] = { N_("Playback"), N_("Capture"), N_("Switches"), N_("Options") };
GtkWidget *track_widget;
GtkWidget *labels[4];
GtkWidget *scrollwins[4];
@@ -170,6 +170,7 @@
GtkWidget *label1;
GtkWidget *label2;
GList *visible_controls;
+ gchar *label;
guint num_children[4] = { 0, 0, 0, 0 };
gint i;
@@ -178,7 +179,7 @@
/* Create widgets for all four tabs */
for (i = 0; i < 4; ++i)
{
- labels[i] = gtk_label_new (titles[i]);
+ labels[i] = gtk_label_new (_(titles[i]));
scrollwins[i] = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwins[i]), GTK_SHADOW_IN);
gtk_container_set_border_width (GTK_CONTAINER (scrollwins[i]), 6);
@@ -210,6 +211,8 @@
/* Determine the type of the mixer track */
type = xfce_mixer_track_type_new (track);
+ g_object_get (GST_MIXER_TRACK (track), "label", &label, NULL);
+
switch (type)
{
case XFCE_MIXER_TRACK_TYPE_PLAYBACK:
@@ -228,7 +231,7 @@
num_children[0]++;
/* Add the track to the hash table */
- g_hash_table_insert (mixer->widgets, track->label, track_widget);
+ g_hash_table_insert (mixer->widgets, label, track_widget);
break;
case XFCE_MIXER_TRACK_TYPE_CAPTURE:
@@ -247,7 +250,7 @@
num_children[1]++;
/* Add the track to the hash table */
- g_hash_table_insert (mixer->widgets, track->label, track_widget);
+ g_hash_table_insert (mixer->widgets, label, track_widget);
break;
case XFCE_MIXER_TRACK_TYPE_SWITCH:
@@ -257,7 +260,7 @@
num_children[2]++;
/* Add the track to the hash table */
- g_hash_table_insert (mixer->widgets, track->label, track_widget);
+ g_hash_table_insert (mixer->widgets, label, track_widget);
break;
case XFCE_MIXER_TRACK_TYPE_OPTIONS:
@@ -267,9 +270,11 @@
num_children[3]++;
/* Add the track to the hash table */
- g_hash_table_insert (mixer->widgets, track->label, track_widget);
+ g_hash_table_insert (mixer->widgets, label, track_widget);
break;
}
+
+ g_free (label);
}
/* Append tab or destroy all its widgets - depending on the contents of each tab */
More information about the Xfce4-commits
mailing list