On Tue, 25 Feb 2003, Takashi Iwai wrote:
> At Mon, 24 Feb 2003 13:55:18 +0100 (CET),
> Ronny V. Vindenes <[EMAIL PROTECTED]> wrote:
> >
> > Here's a trivial patch against cvs that converts envy24control to use
> > gtk2, it doesn't fix any of the gui problems so envy24control is still
> > fundamentally broken with regards to translation, theme & font handling.
> >
> > I'm tempted to write a proper gnome 2.0 version (with tray icon goodness)
> > if there are no plans to update this.
>
> so far we have no plan for that. at least, i don't want to drop the
> gtk1 support at this moment.
Here's a redone patch that retains gtk1 support, but prefers gtk2 (unless
disabled with --disable-gtk2) if found. I post this more for those out
there who would like gtk2 version than for getting it included in cvs
> but please feel free to fork a new version of envy24control for gtk2.
I've begun work on this and will post a link as soon as it's in a usable
state.
--
Ronny V. Vindenes <[EMAIL PROTECTED]>
--- envy24control.orig/configure.in 2001-02-25 23:37:18.000000000 +0100
+++ envy24control/configure.in 2003-02-27 15:20:58.000000000 +0100
@@ -1,11 +1,30 @@
AC_INIT(envy24control.c)
-AM_INIT_AUTOMAKE(envy24control, 0.1.0)
+AM_INIT_AUTOMAKE(envy24control, 0.1.1)
AC_PROG_CC
AC_PROG_INSTALL
AC_HEADER_STDC
AM_PATH_GTK(1.0.1)
AM_PATH_ALSA(0.9.0)
-CFLAGS="$CFLAGS $GTK_CFLAGS $ALSA_FLAGS"
-LDFLAGS="$LDFLAGS $GTK_LIBS $ALSA_LIBS"
+
+PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, have_gtk2=yes, have_gtk2=no)
+
+AC_ARG_ENABLE(gtk2,
+[ --enable-gtk2 Enable GTK2 graphical interface (default=yes)],
+[if test "$enableval" = "no"
+then
+have_gtk2=no
+fi])
+
+CFLAGS="$CFLAGS $ALSA_FLAGS"
+LDFLAGS="$LDFLAGS $ALSA_LIBS"
+
+if test "$have_gtk2" = "yes"
+then
+ CFLAGS="$CFLAGS $GTK2_CFLAGS"
+ LDFLAGS="$LDFLAGS $GTK2_LIBS"
+else
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LDFLAGS="$LDFLAGS $GTK_LIBS"
+fi
AC_OUTPUT(Makefile)
--- envy24control.orig/envy24control.c 2002-12-03 18:10:35.000000000 +0100
+++ envy24control/envy24control.c 2003-03-05 17:05:27.000000000 +0100
@@ -127,7 +127,6 @@
frame = gtk_frame_new(str);
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 2 + (stream - 1) * 102, 2);
- gtk_widget_set_uposition(frame, 2 + (stream - 1) * 102, 2);
gtk_widget_set_usize(frame, 98, 338);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
@@ -141,7 +140,6 @@
mixer_vscale[stream-1][0] = vscale;
gtk_widget_show(vscale);
gtk_fixed_put(GTK_FIXED(fixed1), vscale, 8, 8);
- gtk_widget_set_uposition(vscale, 7, 8);
gtk_widget_set_usize(vscale, 18, 218);
gtk_scale_set_value_pos(GTK_SCALE(vscale), GTK_POS_BOTTOM);
gtk_scale_set_digits(GTK_SCALE(vscale), 0);
@@ -159,7 +157,6 @@
(GtkSignalFunc)level_meters_configure_event, NULL);
gtk_widget_set_events(drawing, GDK_EXPOSURE_MASK);
gtk_fixed_put(GTK_FIXED(fixed1), drawing, 24, 9);
- gtk_widget_set_uposition(drawing, 24, 9);
gtk_widget_set_usize(drawing, 45, 202);
adj = gtk_adjustment_new(96, 0, 96, 1, 16, 0);
@@ -168,7 +165,6 @@
mixer_vscale[stream-1][1] = vscale;
gtk_widget_show(vscale);
gtk_fixed_put(GTK_FIXED(fixed1), vscale, 70, 8);
- gtk_widget_set_uposition(vscale, 69, 8);
gtk_widget_set_usize(vscale, 18, 218);
gtk_scale_set_value_pos(GTK_SCALE(vscale), GTK_POS_BOTTOM);
gtk_scale_set_digits(GTK_SCALE(vscale), 0);
@@ -178,20 +174,17 @@
label = gtk_label_new("Left");
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed1), label, 0, 232);
- gtk_widget_set_uposition(label, 0, 232);
gtk_widget_set_usize(label, 41, 16);
label = gtk_label_new("Right");
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed1), label, 45, 232);
- gtk_widget_set_uposition(label, 45, 232);
gtk_widget_set_usize(label, 41, 16);
toggle = gtk_toggle_button_new_with_label("Mute");
mixer_mute_toggle[stream-1][0] = toggle;
gtk_widget_show(toggle);
gtk_fixed_put(GTK_FIXED(fixed1), toggle, 8, 252);
- gtk_widget_set_uposition(toggle, 8, 252);
gtk_widget_set_usize(toggle, 36, 22);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@@ -201,7 +194,6 @@
mixer_mute_toggle[stream-1][1] = toggle;
gtk_widget_show(toggle);
gtk_fixed_put(GTK_FIXED(fixed1), toggle, 48, 252);
- gtk_widget_set_uposition(toggle, 48, 252);
gtk_widget_set_usize(toggle, 36, 22);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
@@ -210,14 +202,12 @@
hseparator = gtk_hseparator_new();
gtk_widget_show(hseparator);
gtk_fixed_put(GTK_FIXED(fixed1), hseparator, 0, 272);
- gtk_widget_set_uposition(hseparator, 0, 272);
gtk_widget_set_usize(hseparator, 92, 16);
toggle = gtk_toggle_button_new_with_label("L/R Gang");
mixer_stereo_toggle[stream-1] = toggle;
gtk_widget_show(toggle);
gtk_fixed_put(GTK_FIXED(fixed1), toggle, 3, 285);
- gtk_widget_set_uposition(toggle, 3, 285);
gtk_widget_set_usize(toggle, 85, 32);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
}
@@ -265,32 +255,27 @@
gtk_widget_set_events(drawing, GDK_EXPOSURE_MASK);
gtk_widget_show(drawing);
gtk_fixed_put(GTK_FIXED(fixed), drawing, 4, 2);
- gtk_widget_set_uposition(drawing, 4, 2);
gtk_widget_set_usize(drawing, 98, 276);
label = gtk_label_new("Left");
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed), label, 10, 282);
- gtk_widget_set_uposition(label, 10, 282);
gtk_widget_set_usize(label, 34, 16);
label = gtk_label_new("Right");
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed), label, 60, 282);
- gtk_widget_set_uposition(label, 60, 282);
gtk_widget_set_usize(label, 34, 16);
hseparator = gtk_hseparator_new();
gtk_widget_show(hseparator);
gtk_fixed_put(GTK_FIXED(fixed), hseparator, 0, 294);
- gtk_widget_set_uposition(hseparator, 0, 294);
gtk_widget_set_usize(hseparator, 104, 16);
button = gtk_button_new_with_label("Reset Peaks");
mixer_clear_peaks_button = button;
gtk_widget_show(button);
gtk_fixed_put(GTK_FIXED(fixed), button, 3, 306);
- gtk_widget_set_uposition(button, 3, 306);
gtk_widget_set_usize(button, 100, 35);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(level_meters_reset_peaks), NULL);
@@ -349,7 +334,6 @@
frame = gtk_frame_new(str);
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 2 + pos * 130, 2);
- gtk_widget_set_uposition(frame, 2 + pos * 130, 2);
gtk_widget_set_usize(frame, 125, 340);
fixed1 = gtk_fixed_new();
@@ -361,7 +345,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 0, 0);
- gtk_widget_set_uposition(radio, 0, 0);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)patchbay_toggled, (gpointer)((stream << 16)
+ 0));
@@ -369,7 +352,6 @@
hseparator = gtk_hseparator_new();
gtk_widget_show(hseparator);
gtk_fixed_put(GTK_FIXED(fixed1), hseparator, 0, 21);
- gtk_widget_set_uposition(hseparator, 0, 21);
gtk_widget_set_usize(hseparator, 125, 16);
if (stream == 1 || stream == 2 || stream == 9 || stream == 10) {
@@ -378,7 +360,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 0, 32);
- gtk_widget_set_uposition(radio, 0, 32);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)patchbay_toggled, (gpointer)((stream
<< 16) + 1));
@@ -387,7 +368,6 @@
hseparator = gtk_hseparator_new();
gtk_widget_show(hseparator);
gtk_fixed_put(GTK_FIXED(fixed1), hseparator, 0, 52);
- gtk_widget_set_uposition(hseparator, 0, 52);
gtk_widget_set_usize(hseparator, 125, 16);
for (idx = 0; idx < 10; idx++) {
@@ -396,7 +376,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 0, 64 + (idx * 25));
- gtk_widget_set_uposition(radio, 0, 64 + (idx * 25));
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)patchbay_toggled, (gpointer)((stream
<< 16) + 2 + idx));
@@ -445,7 +424,6 @@
frame = gtk_frame_new("Master Clock");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 8, 8);
- gtk_widget_set_uposition(frame, 8, 8);
gtk_widget_set_usize(frame, 135, 197);
fixed1 = gtk_fixed_new();
@@ -456,8 +434,7 @@
hw_master_clock_xtal_22050 = radio;
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
- gtk_fixed_put(GTK_FIXED(fixed1), radio, 24, 0);
- gtk_widget_set_uposition(radio, 24, 0);
+ gtk_fixed_put(GTK_FIXED(fixed1), radio, 12, 0);
gtk_widget_set_usize(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"22050");
@@ -467,7 +444,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 12, 16);
- gtk_widget_set_uposition(radio, 12, 16);
gtk_widget_set_usize(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"32000");
@@ -477,7 +453,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 12, 32);
- gtk_widget_set_uposition(radio, 12, 32);
gtk_widget_set_usize(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"44100");
@@ -487,7 +462,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 12, 48);
- gtk_widget_set_uposition(radio, 12, 48);
gtk_widget_set_usize(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"48000");
@@ -497,7 +471,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 12, 64);
- gtk_widget_set_uposition(radio, 12, 64);
gtk_widget_set_usize(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"88200");
@@ -507,7 +480,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 12, 80);
- gtk_widget_set_uposition(radio, 12, 80);
gtk_widget_set_usize(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"96000");
@@ -516,8 +488,7 @@
hw_master_clock_spdif_radio = radio;
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
- gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 104);
- gtk_widget_set_uposition(radio, 8, 104);
+ gtk_fixed_put(GTK_FIXED(fixed1), radio, 12, 104);
gtk_widget_set_usize(radio, 115, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"SPDIF");
@@ -530,7 +501,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 128);
- gtk_widget_set_uposition(radio, 8, 128);
gtk_widget_set_usize(radio, 115, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled,
(gpointer)"WordClock");
@@ -538,7 +508,6 @@
viewport = gtk_viewport_new(NULL, NULL);
gtk_widget_show(viewport);
gtk_fixed_put(GTK_FIXED(fixed1), viewport, 9, 147);
- gtk_widget_set_uposition(viewport, 9, 147);
gtk_widget_set_usize(viewport, 90, 26);
fixed2 = gtk_fixed_new();
@@ -549,7 +518,6 @@
hw_master_clock_status_label = label;
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed2), label, 0, 3);
- gtk_widget_set_uposition(label, 0, 3);
gtk_widget_set_usize(label, 86, 16);
}
@@ -562,7 +530,6 @@
frame = gtk_frame_new("Rate State");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 8, 208);
- gtk_widget_set_uposition(frame, 8, 208);
gtk_widget_set_usize(frame, 135, 39);
fixed1 = gtk_fixed_new();
@@ -573,7 +540,6 @@
hw_rate_locking_check = check;
gtk_widget_show(check);
gtk_fixed_put(GTK_FIXED(fixed1), check, 8, 0);
- gtk_widget_set_uposition(check, 8, 0);
gtk_widget_set_usize(check, 115, 16);
gtk_signal_connect(GTK_OBJECT(check), "toggled",
(GtkSignalFunc)rate_locking_toggled, (gpointer)"locked");
@@ -582,7 +548,6 @@
hw_rate_reset_check = check;
gtk_widget_show(check);
gtk_fixed_put(GTK_FIXED(fixed1), check, 76, 0);
- gtk_widget_set_uposition(check, 76, 0);
gtk_widget_set_usize(check, 115, 16);
gtk_signal_connect(GTK_OBJECT(check), "toggled",
(GtkSignalFunc)rate_reset_toggled, (gpointer)"reset");
@@ -600,7 +565,6 @@
frame = gtk_frame_new("Actual Rate");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 8, 251);
- gtk_widget_set_uposition(frame, 8, 251);
gtk_widget_set_usize(frame, 135, 45);
fixed1 = gtk_fixed_new();
@@ -610,7 +574,6 @@
viewport = gtk_viewport_new(NULL, NULL);
gtk_widget_show(viewport);
gtk_fixed_put(GTK_FIXED(fixed1), viewport, 9, 0);
- gtk_widget_set_uposition(viewport, 9, 0);
gtk_widget_set_usize(viewport, 90, 21);
fixed2 = gtk_fixed_new();
@@ -621,7 +584,6 @@
hw_master_clock_actual_rate_label = label;
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed2), label, 0, 1);
- gtk_widget_set_uposition(label, 0, 1);
gtk_widget_set_usize(label, 86, 16);
}
@@ -637,7 +599,6 @@
frame = gtk_frame_new("Volume Change");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 8, 300);
- gtk_widget_set_uposition(frame, 8, 300);
gtk_widget_set_usize(frame, 135, 58);
fixed1 = gtk_fixed_new();
@@ -650,7 +611,6 @@
hw_volume_change_spin = spin;
gtk_widget_show(spin);
gtk_fixed_put(GTK_FIXED(fixed1), spin, 58, 6);
- gtk_widget_set_uposition(spin, 58, 6);
gtk_widget_set_usize(spin, 53, 22);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin), TRUE);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
@@ -659,7 +619,6 @@
label = gtk_label_new("Rate:");
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed1), label, 8, 8);
- gtk_widget_set_uposition(label, 8, 8);
gtk_widget_set_usize(label, 41, 16);
}
@@ -673,7 +632,6 @@
frame = gtk_frame_new("Data Mode");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 10, 10);
- gtk_widget_set_uposition(frame, 10, 10);
gtk_widget_set_usize(frame, 150, 81);
fixed1 = gtk_fixed_new();
@@ -685,7 +643,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 8);
- gtk_widget_set_uposition(radio, 8, 8);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_data_toggled, (gpointer)"Non-audio");
@@ -695,7 +652,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 32);
- gtk_widget_set_uposition(radio, 8, 32);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_data_toggled, (gpointer)"Audio");
@@ -711,7 +667,6 @@
frame = gtk_frame_new("Stream");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 10, 105);
- gtk_widget_set_uposition(frame, 10, 105);
gtk_widget_set_usize(frame, 150, 81);
fixed1 = gtk_fixed_new();
@@ -723,7 +678,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 8);
- gtk_widget_set_uposition(radio, 8, 8);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_stream_toggled, (gpointer)"Stereo");
@@ -733,7 +687,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 32);
- gtk_widget_set_uposition(radio, 8, 32);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_stream_toggled, (gpointer)"NOTID");
@@ -749,7 +702,6 @@
frame = gtk_frame_new("Emphasis");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 175, 10);
- gtk_widget_set_uposition(frame, 175, 10);
gtk_widget_set_usize(frame, 150, 131);
fixed1 = gtk_fixed_new();
@@ -761,7 +713,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 8);
- gtk_widget_set_uposition(radio, 8, 8);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"No");
@@ -771,7 +722,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 32);
- gtk_widget_set_uposition(radio, 8, 32);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"5015");
@@ -781,7 +731,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 56);
- gtk_widget_set_uposition(radio, 8, 56);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"CCITT");
@@ -791,7 +740,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 80);
- gtk_widget_set_uposition(radio, 8, 80);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"NOTID");
@@ -824,7 +772,6 @@
frame = gtk_frame_new("Copyright");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 10, 10);
- gtk_widget_set_uposition(frame, 10, 10);
gtk_widget_set_usize(frame, 150, 81);
fixed1 = gtk_fixed_new();
@@ -836,7 +783,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 8);
- gtk_widget_set_uposition(radio, 8, 8);
gtk_widget_set_usize(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copyright_toggled,
(gpointer)"Copyright");
@@ -846,7 +792,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 32);
- gtk_widget_set_uposition(radio, 8, 32);
gtk_widget_set_usize(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copyright_toggled,
(gpointer)"Permitted");
@@ -862,7 +807,6 @@
frame = gtk_frame_new("Copy");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 10, 105);
- gtk_widget_set_uposition(frame, 10, 105);
gtk_widget_set_usize(frame, 150, 81);
fixed1 = gtk_fixed_new();
@@ -874,7 +818,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 8);
- gtk_widget_set_uposition(radio, 8, 8);
gtk_widget_set_usize(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copy_toggled, (gpointer)"1st");
@@ -884,7 +827,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 32);
- gtk_widget_set_uposition(radio, 8, 32);
gtk_widget_set_usize(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copy_toggled, (gpointer)"Original");
@@ -900,7 +842,6 @@
frame = gtk_frame_new("Emphasis");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 175, 10);
- gtk_widget_set_uposition(frame, 175, 10);
gtk_widget_set_usize(frame, 150, 81);
fixed1 = gtk_fixed_new();
@@ -912,7 +853,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 8);
- gtk_widget_set_uposition(radio, 8, 8);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_emphasis_toggled, (gpointer)"No");
@@ -922,7 +862,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 32);
- gtk_widget_set_uposition(radio, 8, 32);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_emphasis_toggled, (gpointer)"5015");
@@ -938,7 +877,6 @@
frame = gtk_frame_new("Category");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 340, 10);
- gtk_widget_set_uposition(frame, 340, 10);
gtk_widget_set_usize(frame, 150, 131);
fixed1 = gtk_fixed_new();
@@ -950,7 +888,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 8);
- gtk_widget_set_uposition(radio, 8, 8);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled, (gpointer)"DAT");
@@ -960,7 +897,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 32);
- gtk_widget_set_uposition(radio, 8, 32);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled, (gpointer)"PCM");
@@ -970,7 +906,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 56);
- gtk_widget_set_uposition(radio, 8, 56);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled, (gpointer)"CD");
@@ -980,7 +915,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 8, 80);
- gtk_widget_set_uposition(radio, 8, 80);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled,
(gpointer)"General");
@@ -1015,7 +949,6 @@
frame = gtk_frame_new("S/PDIF Output Settings");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 150, 8);
- gtk_widget_set_uposition(frame, 150, 8);
gtk_widget_set_usize(frame, 580, 350);
fixed1 = gtk_fixed_new();
@@ -1027,7 +960,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 15, 4);
- gtk_widget_set_uposition(radio, 15, 4);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_output_toggled,
(gpointer)"Professional");
@@ -1037,7 +969,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 140, 4);
- gtk_widget_set_uposition(radio, 140, 4);
gtk_widget_set_usize(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_output_toggled, (gpointer)"Consumer");
@@ -1046,7 +977,6 @@
hw_spdif_output_notebook = notebook;
gtk_widget_show(notebook);
gtk_fixed_put(GTK_FIXED(fixed1), notebook, 5, 31);
- gtk_widget_set_uposition(notebook, 5, 31);
gtk_widget_set_usize(notebook, 565, 290);
create_spdif_output_settings_profi(notebook, 0);
@@ -1067,7 +997,6 @@
frame = gtk_frame_new("S/PDIF Input");
gtk_widget_show(frame);
gtk_fixed_put(GTK_FIXED(fixed), frame, 530, 8);
- gtk_widget_set_uposition(frame, 530, 8);
gtk_widget_set_usize(frame, 200, 79);
fixed1 = gtk_fixed_new();
@@ -1079,7 +1008,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 15, 4);
- gtk_widget_set_uposition(radio, 15, 4);
gtk_widget_set_usize(radio, 82, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_input_toggled, (gpointer)"Coaxial");
@@ -1089,7 +1017,6 @@
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
gtk_widget_show(radio);
gtk_fixed_put(GTK_FIXED(fixed1), radio, 100, 4);
- gtk_widget_set_uposition(radio, 100, 4);
gtk_widget_set_usize(radio, 82, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_input_toggled, (gpointer)"Optical");
@@ -1134,21 +1061,18 @@
label = gtk_label_new("Envy24 Control Utility " VERSION);
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed), label, 0, 72);
- gtk_widget_set_uposition(label, 0, 72);
gtk_widget_set_usize(label, 736, 16);
/* create second line */
label = gtk_label_new("A GTK Tool for Envy24 PCI Audio Chip");
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed), label, 0, 104);
- gtk_widget_set_uposition(label, 0, 104);
gtk_widget_set_usize(label, 736, 16);
/* create third line */
label = gtk_label_new("Copyright (c) 2000 by Jaroslav Kysela <[EMAIL
PROTECTED]>");
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed), label, 0, 152);
- gtk_widget_set_uposition(label, 0, 152);
gtk_widget_set_usize(label, 736, 16);
}
@@ -1191,7 +1115,6 @@
gtk_widget_show(frame);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_fixed_put(GTK_FIXED(fixed), frame, 2 + i * 120, 2);
- gtk_widget_set_uposition(frame, 2 + i * 120, 2);
gtk_widget_set_usize(frame, 115, 338);
fixed1 = gtk_fixed_new();
@@ -1214,7 +1137,6 @@
av_dac_volume_label[i] = (GtkLabel *)label;
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed1), label, 4, 232);
- gtk_widget_set_uposition(label, 4, 232);
gtk_widget_set_usize(label, 105, 16);
if (i >= envy_dac_senses())
@@ -1240,7 +1162,6 @@
gtk_widget_show(frame);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_fixed_put(GTK_FIXED(fixed), frame, 2 + (i + envy_dac_volumes()) *
120, 2);
- gtk_widget_set_uposition(frame, 2 + (i + envy_dac_volumes()) * 120, 2);
gtk_widget_set_usize(frame, 115, 338);
fixed1 = gtk_fixed_new();
@@ -1263,7 +1184,6 @@
av_adc_volume_label[i] = (GtkLabel *)label;
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed1), label, 4, 232);
- gtk_widget_set_uposition(label, 4, 232);
gtk_widget_set_usize(label, 105, 16);
if (i >= envy_adc_senses())
@@ -1289,7 +1209,6 @@
gtk_widget_show(frame);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_fixed_put(GTK_FIXED(fixed), frame, 2 + (i + envy_dac_volumes() +
envy_adc_volumes()) * 120, 2);
- gtk_widget_set_uposition(frame, 2 + (i + envy_dac_volumes() +
envy_adc_volumes()) * 120, 2);
gtk_widget_set_usize(frame, 115, 338);
fixed1 = gtk_fixed_new();
@@ -1312,7 +1231,6 @@
av_ipga_volume_label[i] = (GtkLabel *)label;
gtk_widget_show(label);
gtk_fixed_put(GTK_FIXED(fixed1), label, 4, 232);
- gtk_widget_set_uposition(label, 4, 232);
gtk_widget_set_usize(label, 105, 16);
}
}
