Author: jannis Date: 2008-06-22 02:01:36 +0000 (Sun, 22 Jun 2008) New Revision: 27122
Modified: xfce4-mixer/trunk/ChangeLog xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c Log: * xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as they are owned by GStreamer. That introduced a really, really weird bug ... * xfce4-mixer/xfce-mixer-track.c: Use 5% step size for all faders. Modified: xfce4-mixer/trunk/ChangeLog =================================================================== --- xfce4-mixer/trunk/ChangeLog 2008-06-22 01:50:16 UTC (rev 27121) +++ xfce4-mixer/trunk/ChangeLog 2008-06-22 02:01:36 UTC (rev 27122) @@ -1,5 +1,13 @@ 2008-06-22 Jannis Pohlmann <[EMAIL PROTECTED]> + * xfce4-mixer/xfce-mixer.c: Don't free the hash table keys as + they are owned by GStreamer. That introduced a really, really + weird bug ... + * xfce4-mixer/xfce-mixer-track.c: Use 5% step size for all + faders. + +2008-06-22 Jannis Pohlmann <[EMAIL PROTECTED]> + * xfce4-mixer/xfce-mixer-track.c: Fix crash when moving the fader of a mixer track with only one channel (which was caused by accessing the unitialized track->lock_button Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c =================================================================== --- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2008-06-22 01:50:16 UTC (rev 27121) +++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer-track.c 2008-06-22 02:01:36 UTC (rev 27122) @@ -192,6 +192,7 @@ GtkWidget *button_box; GtkWidget *fader; const GList *iter; + gdouble step; gint channel; gint columns; gint *volumes; @@ -212,10 +213,12 @@ gtk_table_attach (GTK_TABLE (track), label, 0, columns, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0); gtk_widget_show (label); + step = (gdouble) (track->gst_track->max_volume - track->gst_track->min_volume) / (gdouble) 20; + /* Create a fader for each channel */ for (channel = 0; channel < track->gst_track->num_channels; ++channel) { - fader = gtk_vscale_new_with_range (track->gst_track->min_volume, track->gst_track->max_volume, 1); + fader = gtk_vscale_new_with_range (track->gst_track->min_volume, track->gst_track->max_volume, step); gtk_scale_set_draw_value (GTK_SCALE (fader), FALSE); gtk_range_set_inverted (GTK_RANGE (fader), TRUE); gtk_range_set_value (GTK_RANGE (fader), volumes[channel]); Modified: xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c =================================================================== --- xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2008-06-22 01:50:16 UTC (rev 27121) +++ xfce4-mixer/trunk/xfce4-mixer/xfce-mixer.c 2008-06-22 02:01:36 UTC (rev 27122) @@ -118,7 +118,7 @@ static void xfce_mixer_init (XfceMixer *mixer) { - mixer->widgets = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); + mixer->widgets = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, NULL); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits