16178N/A--- gnome-media-2.24.0.1/gst-mixer/src/element.c-orig 2009-03-06 15:11:56.690723000 -0600

16178N/A+++ gnome-media-2.24.0.1/gst-mixer/src/element.c 2009-03-06 15:13:22.909421000 -0600

16178N/A@@ -252,15 +252,13 @@ gnome_volume_control_element_change (Gno

16178N/A GtkWidget *right_sep,

16178N/A GtkWidget *flagbox);

16178N/A

16178N/A- } content[4] = {

16178N/A+ } content[3] = {

16178N/A { NULL, NULL, NULL, NULL, FALSE, 0, 5, 1,

16178N/A gnome_volume_control_track_add_playback },

16178N/A { NULL, NULL, NULL, NULL, FALSE, 0, 5, 1,

16178N/A gnome_volume_control_track_add_recording },

16178N/A { NULL, NULL, NULL, NULL, FALSE, 0, 1, 3,

16178N/A gnome_volume_control_track_add_playback },

16178N/A- { NULL, NULL, NULL, NULL, FALSE, 0, 1, 3,

16178N/A- gnome_volume_control_track_add_option }

16178N/A };

16178N/A static gboolean theme_page = FALSE;

16178N/A const GList *item;

16178N/A@@ -307,7 +305,7 @@ gnome_volume_control_element_change (Gno

16178N/A }

16178N/A

16178N/A /* content pages */

16178N/A- for (i = 0; i < 4; i++) {

16178N/A+ for (i = 0; i < 3; i++) {

16178N/A content[i].page = gtk_table_new (content[i].width, content[i].height, FALSE);

16178N/A gtk_container_set_border_width (GTK_CONTAINER (content[i].page), 6);

16178N/A if (i >= 2)

16178N/A@@ -332,12 +330,10 @@ gnome_volume_control_element_change (Gno

16178N/A * _of this type_. We currently destroy it at the

16178N/A * end, so it's not critical, but not nice either.

16178N/A */

16178N/A- if (i == 3) {

16178N/A+ if (i == 2) {

16178N/A content[i].new_sep = gtk_hseparator_new ();

16178N/A- } else if (i < 2) {

16178N/A- content[i].new_sep = gtk_vseparator_new ();

16178N/A } else {

16178N/A- content[i].new_sep = NULL;

16178N/A+ content[i].new_sep = gtk_vseparator_new ();

16178N/A }

16178N/A

16178N/A /* visible? */

16178N/A@@ -395,7 +391,7 @@ gnome_volume_control_element_change (Gno

16178N/A /* show - need to build the tabs backwards so that deleting the "Sound Theme"

16178N/A * page can be avoided.

16178N/A */

16178N/A- for (i = 3; i >= 0; i--) {

16178N/A+ for (i = 2; i >= 0; i--) {

16178N/A GtkWidget *label, *view, *viewport;

16178N/A GtkAdjustment *hadjustment, *vadjustment;

16178N/A

16178N/A@@ -542,7 +538,7 @@ cb_gconf (GConfClient *client,

16178N/A

16178N/A if (value->type == GCONF_VALUE_BOOL) {

16178N/A gboolean active = gconf_value_get_bool (value),

16178N/A- first[4] = { TRUE, TRUE, TRUE, TRUE };

16178N/A+ first[3] = { TRUE, TRUE, TRUE };

16178N/A gint n, page = get_page_num (el->mixer, track);

16178N/A

16178N/A gnome_volume_control_track_show (trkw, active);

16178N/A--- gnome-media-2.24.0.1/gst-mixer/src/misc.c 2009-03-05 14:33:09.453181745 -0800

16178N/A+++ gnome-media-2.24.0.1/gst-mixer/src/misc.c 2009-03-05 14:47:07.165228853 -0800

16178N/A@@ -37,17 +37,13 @@

16178N/A if ((gst_mixer_get_mixer_flags (GST_MIXER (mixer)) &

16178N/A GST_MIXER_FLAG_GROUPING) == 0) {

16178N/A /* old style grouping, only volume sliders on the first two pages */

16178N/A- if (GST_IS_MIXER_OPTIONS (track))

16178N/A- return 3;

16178N/A- else if (track->num_channels == 0)

16178N/A+ if (track->num_channels == 0)

16178N/A return 2;

16178N/A }

16178N/A if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_INPUT))

16178N/A return 1;

16178N/A else if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_OUTPUT))

16178N/A return 0;

16178N/A- else if (GST_IS_MIXER_OPTIONS (track))

16178N/A- return 3;

16178N/A else

16178N/A return 2;

16178N/A

16178N/A@@ -56,15 +52,12 @@

16178N/A

16178N/A gchar *get_page_description (gint n)

16178N/A {

16178N/A- /* needs i18n work */

16178N/A switch (n) {

16178N/A case 0:

16178N/A return _("Playback");

16178N/A case 1:

16178N/A return _("Recording");

16178N/A case 2:

16178N/A- return _("Switches");

16178N/A- case 3:

16178N/A return _("Options");

16178N/A }

16178N/A