Mercurial > audlegacy-plugins

comparison src/alsa-ng/alsa-configure.c @ 3195:16d4308fb36e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
alsa-ng: Set type hint on prefs window, and don't use deprecated GTK funcs.
author John Lindgren <john.lindgren@tds.net>
date Thu, 09 Jul 2009 11:03:32 -0400
parents d1d9b159801a
children
comparison
equal deleted inserted replaced
3194:bbf2cd0df6c3 3195:16d4308fb36e
243 scratch); 243 scratch);
244 } 244 }
245 245
246 void alsaplug_configure(void) 246 void alsaplug_configure(void)
247 { 247 {
248 GtkWidget *vbox, *notebook; 248 GtkWidget * vbox, * adevice_frame, * adevice_box;
249 GtkWidget *dev_vbox, *adevice_frame, *adevice_box;
250 GtkWidget *mixer_frame, *mixer_box, *mixer_table, *mixer_card_om; 249 GtkWidget *mixer_frame, *mixer_box, *mixer_table, *mixer_card_om;
251 GtkWidget *mixer_card_label, *mixer_device_label; 250 GtkWidget *mixer_card_label, *mixer_device_label;
252 GtkWidget *bbox, *ok, *cancel; 251 GtkWidget *bbox, *ok, *cancel;
253 252
254 gint mset; 253 gint mset;
257 { 256 {
258 gtk_window_present(GTK_WINDOW(configure_win)); 257 gtk_window_present(GTK_WINDOW(configure_win));
259 return; 258 return;
260 } 259 }
261 260
262 configure_win = gtk_window_new(GTK_WINDOW_TOPLEVEL); 261 configure_win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
263 gtk_signal_connect(GTK_OBJECT(configure_win), "destroy", 262 gtk_window_set_title ((GtkWindow *) configure_win, _ ("ALSA Output "
264 GTK_SIGNAL_FUNC(gtk_widget_destroyed), 263 "Plugin Preferences"));
265 &configure_win); 264 gtk_window_set_type_hint ((GtkWindow *) configure_win,
266 gtk_window_set_title(GTK_WINDOW(configure_win), 265 GDK_WINDOW_TYPE_HINT_DIALOG);
267 _("ALSA Driver configuration")); 266 gtk_window_set_resizable ((GtkWindow *) configure_win, FALSE);
268 gtk_window_set_policy(GTK_WINDOW(configure_win), 267 gtk_container_set_border_width ((GtkContainer *) configure_win, 6);
269 FALSE, TRUE, FALSE); 268 g_signal_connect ((GObject *) configure_win, "destroy", (GCallback)
270 gtk_container_border_width(GTK_CONTAINER(configure_win), 10); 269 gtk_widget_destroyed, & configure_win);
271 270
272 vbox = gtk_vbox_new(FALSE, 10); 271 vbox = gtk_vbox_new (FALSE, 6);
273 gtk_container_add(GTK_CONTAINER(configure_win), vbox); 272 gtk_container_add ((GtkContainer *) configure_win, vbox);
274 273
275 notebook = gtk_notebook_new(); 274 adevice_frame = gtk_frame_new (_ ("Device:"));
276 gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0); 275 gtk_box_pack_start ((GtkBox *) vbox, adevice_frame, FALSE, FALSE, 0);
277 276
278 dev_vbox = gtk_vbox_new(FALSE, 5); 277 adevice_box = gtk_vbox_new (FALSE, 6);
279 gtk_container_set_border_width(GTK_CONTAINER(dev_vbox), 5); 278 gtk_container_set_border_width ((GtkContainer *) adevice_box, 6);
280 279 gtk_container_add ((GtkContainer *) adevice_frame, adevice_box);
281 adevice_frame = gtk_frame_new(_("Audio device:"));
282 gtk_box_pack_start(GTK_BOX(dev_vbox), adevice_frame, FALSE, FALSE, 0);
283
284 adevice_box = gtk_vbox_new(FALSE, 5);
285 gtk_container_set_border_width(GTK_CONTAINER(adevice_box), 5);
286 gtk_container_add(GTK_CONTAINER(adevice_frame), adevice_box);
287 280
288 devices_combo = gtk_combo_new(); 281 devices_combo = gtk_combo_new();
289 gtk_box_pack_start(GTK_BOX(adevice_box), devices_combo, 282 gtk_box_pack_start(GTK_BOX(adevice_box), devices_combo,
290 FALSE, FALSE, 0); 283 FALSE, FALSE, 0);
291 get_devices(GTK_COMBO(devices_combo)); 284 get_devices(GTK_COMBO(devices_combo));
292 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(devices_combo)->entry), 285 gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(devices_combo)->entry),
293 alsaplug_cfg.pcm_device); 286 alsaplug_cfg.pcm_device);
294 287
295 mixer_frame = gtk_frame_new(_("Mixer:")); 288 mixer_frame = gtk_frame_new (_ ("Mixer:"));
296 gtk_box_pack_start(GTK_BOX(dev_vbox), mixer_frame, FALSE, FALSE, 0); 289 gtk_box_pack_start ((GtkBox *) vbox, mixer_frame, FALSE, FALSE, 0);
297 290
298 mixer_box = gtk_vbox_new(FALSE, 5); 291 mixer_box = gtk_vbox_new (FALSE, 6);
299 gtk_container_set_border_width(GTK_CONTAINER(mixer_box), 5); 292 gtk_container_set_border_width ((GtkContainer *) mixer_box, 6);
300 gtk_container_add(GTK_CONTAINER(mixer_frame), mixer_box); 293 gtk_container_add ((GtkContainer *) mixer_frame, mixer_box);
301 294
302 mixer_table = gtk_table_new(2, 2, FALSE); 295 mixer_table = gtk_table_new(2, 2, FALSE);
303 gtk_table_set_row_spacings(GTK_TABLE(mixer_table), 5); 296 gtk_table_set_row_spacings(GTK_TABLE(mixer_table), 5);
304 gtk_table_set_col_spacings(GTK_TABLE(mixer_table), 5); 297 gtk_table_set_col_spacings(GTK_TABLE(mixer_table), 5);
305 gtk_box_pack_start(GTK_BOX(mixer_box), mixer_table, FALSE, FALSE, 0); 298 gtk_box_pack_start(GTK_BOX(mixer_box), mixer_table, FALSE, FALSE, 0);
329 alsaplug_cfg.mixer_device); 322 alsaplug_cfg.mixer_device);
330 323
331 gtk_table_attach(GTK_TABLE(mixer_table), mixer_devices_combo, 324 gtk_table_attach(GTK_TABLE(mixer_table), mixer_devices_combo,
332 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0); 325 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
333 326
334 gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dev_vbox,
335 gtk_label_new(_("Device settings")));
336
337 bbox = gtk_hbutton_box_new(); 327 bbox = gtk_hbutton_box_new();
338 gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); 328 gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
339 gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5); 329 gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
340 gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); 330 gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
341 331