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.
(In case pine breaks the attachment it's also available from
http://www.lstud.ii.uib.no/~s864/alsa )
--
Ronny V. Vindenes <[EMAIL PROTECTED]>
--- envy24control.orig/configure.in 2001-02-25 23:37:18.000000000 +0100
+++ envy24control/configure.in 2003-02-22 14:18:53.000000000 +0100
@@ -1,9 +1,9 @@
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_GTK_2_0(2.0.1)
AM_PATH_ALSA(0.9.0)
CFLAGS="$CFLAGS $GTK_CFLAGS $ALSA_FLAGS"
LDFLAGS="$LDFLAGS $GTK_LIBS $ALSA_LIBS"
--- envy24control.orig/envy24control.c 2002-12-03 18:10:35.000000000 +0100
+++ envy24control/envy24control.c 2003-02-22 14:24:10.000000000 +0100
@@ -127,8 +127,7 @@
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_widget_set_size_request(frame, 98, 338);
gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
fixed1 = gtk_fixed_new();
@@ -141,8 +140,7 @@
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_widget_set_size_request(vscale, 18, 218);
gtk_scale_set_value_pos(GTK_SCALE(vscale), GTK_POS_BOTTOM);
gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
@@ -159,8 +157,7 @@
(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);
+ gtk_widget_set_size_request(drawing, 45, 202);
adj = gtk_adjustment_new(96, 0, 96, 1, 16, 0);
mixer_adj[stream-1][1] = adj;
@@ -168,8 +165,7 @@
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_widget_set_size_request(vscale, 18, 218);
gtk_scale_set_value_pos(GTK_SCALE(vscale), GTK_POS_BOTTOM);
gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
@@ -178,21 +174,18 @@
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);
+ gtk_widget_set_size_request(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);
+ gtk_widget_set_size_request(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_widget_set_size_request(toggle, 36, 22);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
(GtkSignalFunc)mixer_toggled_mute, (gpointer)((stream <<
16) + 0));
@@ -201,8 +194,7 @@
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_widget_set_size_request(toggle, 36, 22);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
gtk_signal_connect(GTK_OBJECT(toggle), "toggled",
(GtkSignalFunc)mixer_toggled_mute, (gpointer)((stream <<
16) + 1));
@@ -210,15 +202,13 @@
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);
+ gtk_widget_set_size_request(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_widget_set_size_request(toggle, 85, 32);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), TRUE);
}
@@ -265,33 +255,28 @@
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);
+ gtk_widget_set_size_request(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);
+ gtk_widget_set_size_request(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);
+ gtk_widget_set_size_request(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);
+ gtk_widget_set_size_request(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_widget_set_size_request(button, 100, 35);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(level_meters_reset_peaks), NULL);
@@ -349,8 +334,7 @@
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);
+ gtk_widget_set_size_request(frame, 125, 340);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -361,16 +345,14 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)patchbay_toggled, (gpointer)((stream << 16)
+ 0));
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);
+ gtk_widget_set_size_request(hseparator, 125, 16);
if (stream == 1 || stream == 2 || stream == 9 || stream == 10) {
radio = gtk_radio_button_new_with_label(group, stream & 1 ? "Digital
Mix L" : "Digital Mix R");
@@ -378,8 +360,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)patchbay_toggled, (gpointer)((stream
<< 16) + 1));
}
@@ -387,8 +368,7 @@
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);
+ gtk_widget_set_size_request(hseparator, 125, 16);
for (idx = 0; idx < 10; idx++) {
radio = gtk_radio_button_new_with_label(group, table[idx]);
@@ -396,8 +376,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)patchbay_toggled, (gpointer)((stream
<< 16) + 2 + idx));
}
@@ -445,8 +424,7 @@
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);
+ gtk_widget_set_size_request(frame, 135, 197);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -457,8 +435,7 @@
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_widget_set_usize(radio, 115, 16);
+ gtk_widget_set_size_request(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"22050");
@@ -467,8 +444,7 @@
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_widget_set_size_request(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"32000");
@@ -477,8 +453,7 @@
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_widget_set_size_request(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"44100");
@@ -487,8 +462,7 @@
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_widget_set_size_request(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"48000");
@@ -497,8 +471,7 @@
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_widget_set_size_request(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"88200");
@@ -507,8 +480,7 @@
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_widget_set_size_request(radio, 115, 16);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"96000");
@@ -517,8 +489,7 @@
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_widget_set_usize(radio, 115, 24);
+ gtk_widget_set_size_request(radio, 115, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled, (gpointer)"SPDIF");
@@ -530,16 +501,14 @@
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_widget_set_size_request(radio, 115, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)internal_clock_toggled,
(gpointer)"WordClock");
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);
+ gtk_widget_set_size_request(viewport, 90, 26);
fixed2 = gtk_fixed_new();
gtk_widget_show(fixed2);
@@ -549,8 +518,7 @@
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);
+ gtk_widget_set_size_request(label, 86, 16);
}
static void create_rate_state(GtkWidget *fixed)
@@ -562,8 +530,7 @@
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);
+ gtk_widget_set_size_request(frame, 135, 39);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -573,8 +540,7 @@
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_widget_set_size_request(check, 115, 16);
gtk_signal_connect(GTK_OBJECT(check), "toggled",
(GtkSignalFunc)rate_locking_toggled, (gpointer)"locked");
@@ -582,8 +548,7 @@
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_widget_set_size_request(check, 115, 16);
gtk_signal_connect(GTK_OBJECT(check), "toggled",
(GtkSignalFunc)rate_reset_toggled, (gpointer)"reset");
@@ -600,8 +565,7 @@
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);
+ gtk_widget_set_size_request(frame, 135, 45);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -610,8 +574,7 @@
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);
+ gtk_widget_set_size_request(viewport, 90, 21);
fixed2 = gtk_fixed_new();
gtk_widget_show(fixed2);
@@ -621,8 +584,7 @@
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);
+ gtk_widget_set_size_request(label, 86, 16);
}
@@ -637,8 +599,7 @@
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);
+ gtk_widget_set_size_request(frame, 135, 58);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -650,8 +611,7 @@
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_widget_set_size_request(spin, 53, 22);
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(spin), TRUE);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
GTK_SIGNAL_FUNC(volume_change_rate_adj), NULL);
@@ -659,8 +619,7 @@
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);
+ gtk_widget_set_size_request(label, 41, 16);
}
static void create_spdif_output_settings_profi_data(GtkWidget *fixed)
@@ -673,8 +632,7 @@
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);
+ gtk_widget_set_size_request(frame, 150, 81);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -685,8 +643,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_data_toggled, (gpointer)"Non-audio");
@@ -695,8 +652,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_data_toggled, (gpointer)"Audio");
}
@@ -711,8 +667,7 @@
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);
+ gtk_widget_set_size_request(frame, 150, 81);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -723,8 +678,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_stream_toggled, (gpointer)"Stereo");
@@ -733,8 +687,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_stream_toggled, (gpointer)"NOTID");
}
@@ -749,8 +702,7 @@
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);
+ gtk_widget_set_size_request(frame, 150, 131);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -761,8 +713,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"No");
@@ -771,8 +722,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"5015");
@@ -781,8 +731,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"CCITT");
@@ -791,8 +740,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)profi_emphasis_toggled, (gpointer)"NOTID");
}
@@ -824,8 +772,7 @@
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);
+ gtk_widget_set_size_request(frame, 150, 81);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -836,8 +783,7 @@
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_widget_set_size_request(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copyright_toggled,
(gpointer)"Copyright");
@@ -846,8 +792,7 @@
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_widget_set_size_request(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copyright_toggled,
(gpointer)"Permitted");
}
@@ -862,8 +807,7 @@
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);
+ gtk_widget_set_size_request(frame, 150, 81);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -874,8 +818,7 @@
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_widget_set_size_request(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copy_toggled, (gpointer)"1st");
@@ -884,8 +827,7 @@
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_widget_set_size_request(radio, 130, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_copy_toggled, (gpointer)"Original");
}
@@ -900,8 +842,7 @@
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);
+ gtk_widget_set_size_request(frame, 150, 81);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -912,8 +853,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_emphasis_toggled, (gpointer)"No");
@@ -922,8 +862,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_emphasis_toggled, (gpointer)"5015");
}
@@ -938,8 +877,7 @@
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);
+ gtk_widget_set_size_request(frame, 150, 131);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -950,8 +888,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled, (gpointer)"DAT");
@@ -960,8 +897,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled, (gpointer)"PCM");
@@ -970,8 +906,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled, (gpointer)"CD");
@@ -980,8 +915,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)consumer_category_toggled,
(gpointer)"General");
}
@@ -1015,8 +949,7 @@
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);
+ gtk_widget_set_size_request(frame, 580, 350);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -1027,8 +960,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_output_toggled,
(gpointer)"Professional");
@@ -1037,8 +969,7 @@
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_widget_set_size_request(radio, 120, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_output_toggled, (gpointer)"Consumer");
@@ -1046,8 +977,7 @@
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);
+ gtk_widget_set_size_request(notebook, 565, 290);
create_spdif_output_settings_profi(notebook, 0);
create_spdif_output_settings_consumer(notebook, 1);
@@ -1067,8 +997,7 @@
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);
+ gtk_widget_set_size_request(frame, 200, 79);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -1079,8 +1008,7 @@
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_widget_set_size_request(radio, 82, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_input_toggled, (gpointer)"Coaxial");
@@ -1089,8 +1017,7 @@
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_widget_set_size_request(radio, 82, 24);
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)spdif_input_toggled, (gpointer)"Optical");
@@ -1134,22 +1061,19 @@
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);
+ gtk_widget_set_size_request(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);
+ gtk_widget_set_size_request(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);
+ gtk_widget_set_size_request(label, 736, 16);
}
static void create_analog_volume(GtkWidget *main, GtkWidget *notebook, int page)
@@ -1191,8 +1115,7 @@
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);
+ gtk_widget_set_size_request(frame, 115, 338);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -1204,7 +1127,7 @@
gtk_scale_set_draw_value(GTK_SCALE(vscale), FALSE);
gtk_widget_show(vscale);
gtk_fixed_put(GTK_FIXED(fixed1), vscale, 26, 2);
- gtk_widget_set_usize(vscale, 66, 230);
+ gtk_widget_set_size_request(vscale, 66, 230);
gtk_scale_set_value_pos(GTK_SCALE(vscale), GTK_POS_BOTTOM);
gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
@@ -1214,8 +1137,7 @@
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);
+ gtk_widget_set_size_request(label, 105, 16);
if (i >= envy_dac_senses())
continue;
@@ -1227,7 +1149,7 @@
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)dac_sense_toggled,
(gpointer)((i << 8) + j));
gtk_fixed_put(GTK_FIXED(fixed1), radio, 2, 202 + j * 20);
- gtk_widget_set_usize(radio, 66, 24);
+ gtk_widget_set_size_request(radio, 66, 24);
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
}
}
@@ -1240,8 +1162,7 @@
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);
+ gtk_widget_set_size_request(frame, 115, 338);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -1253,7 +1174,7 @@
gtk_scale_set_draw_value(GTK_SCALE(vscale), FALSE);
gtk_widget_show(vscale);
gtk_fixed_put(GTK_FIXED(fixed1), vscale, 26, 2);
- gtk_widget_set_usize(vscale, 66, 230);
+ gtk_widget_set_size_request(vscale, 66, 230);
gtk_scale_set_value_pos(GTK_SCALE(vscale), GTK_POS_BOTTOM);
gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
@@ -1263,8 +1184,7 @@
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);
+ gtk_widget_set_size_request(label, 105, 16);
if (i >= envy_adc_senses())
continue;
@@ -1276,7 +1196,7 @@
gtk_signal_connect(GTK_OBJECT(radio), "toggled",
(GtkSignalFunc)adc_sense_toggled,
(gpointer)((i << 8) + j));
gtk_fixed_put(GTK_FIXED(fixed1), radio, 2, 202 + j * 20);
- gtk_widget_set_usize(radio, 66, 24);
+ gtk_widget_set_size_request(radio, 66, 24);
group = gtk_radio_button_group(GTK_RADIO_BUTTON(radio));
}
}
@@ -1289,8 +1209,7 @@
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);
+ gtk_widget_set_size_request(frame, 115, 338);
fixed1 = gtk_fixed_new();
gtk_widget_show(fixed1);
@@ -1302,7 +1221,7 @@
gtk_scale_set_draw_value(GTK_SCALE(vscale), FALSE);
gtk_widget_show(vscale);
gtk_fixed_put(GTK_FIXED(fixed1), vscale, 26, 2);
- gtk_widget_set_usize(vscale, 66, 230);
+ gtk_widget_set_size_request(vscale, 66, 230);
gtk_scale_set_value_pos(GTK_SCALE(vscale), GTK_POS_BOTTOM);
gtk_scale_set_digits(GTK_SCALE(vscale), 0);
gtk_signal_connect(GTK_OBJECT(adj), "value_changed",
@@ -1312,8 +1231,7 @@
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);
+ gtk_widget_set_size_request(label, 105, 16);
}
}
@@ -1402,7 +1320,7 @@
gtk_signal_connect(GTK_OBJECT (window), "delete_event",
(GtkSignalFunc) gtk_main_quit, NULL);
signal(SIGINT, (void *)gtk_main_quit);
- gtk_widget_set_usize(window, 740, 400);
+ gtk_widget_set_size_request(window, 740, 400);
gtk_window_set_policy(GTK_WINDOW (window), FALSE, TRUE, FALSE);
gtk_widget_realize(window);
