--- np2/x11/gtk2/dialog_sound.c 2005/03/12 12:36:57 1.3 +++ np2/x11/gtk2/dialog_sound.c 2009/03/05 11:50:39 1.6 @@ -1,4 +1,4 @@ -/* $Id: dialog_sound.c,v 1.3 2005/03/12 12:36:57 monaka Exp $ */ +/* $Id: dialog_sound.c,v 1.6 2009/03/05 11:50:39 monaka Exp $ */ /* * Copyright (c) 2002-2004 NONAKA Kimihiro @@ -269,7 +269,7 @@ static const char *joypad_num_str[256] = "248", "249", "250", "251", "252", "253", "254", "255", }; -static const joydrv_handle_t *joypad_devlist; +static const joymng_devinfo_t **joypad_devlist; static GtkWidget *joypad_use_checkbutton[1]; static GtkWidget *joypad_devlist_combo; static GtkWidget *joypad_axis_combo[JOY_NAXIS]; @@ -279,22 +279,6 @@ static UINT8 joypad_axis[JOY_NAXIS]; static UINT8 joypad_button[JOY_NBUTTON]; -/* - * Driver - */ - -static const char *driver_name[SNDDRV_DRVMAX] = { - "None", - "NetBSD", - "OSS", - "EsounD", - "SDL", -}; - -static GtkWidget *driver_audio_device_entry; -static int driver_snddrv; - - static void ok_button_clicked(GtkButton *b, gpointer d) { @@ -331,9 +315,6 @@ ok_button_clicked(GtkButton *b, gpointer UINT8 joypad[1]; gint joypad_device_index; - /* Driver */ - const gchar *driver_audiodevp; - /* common */ char buf[32]; int i; @@ -379,8 +360,8 @@ ok_button_clicked(GtkButton *b, gpointer for (i = 0; i < NELEMENTS(snd26_ioport_str); i++) { if (strcmp(snd26_ioport, snd26_ioport_str[i]) == 0) { if (SND26_GET_IOPORT() != i) { - snd86opt |= SND26_SET_IOPORT(i); - snd86opt_mask |= SND26_MASK_IOPORT; + snd26opt |= SND26_SET_IOPORT(i); + snd26opt_mask |= SND26_MASK_IOPORT; renewal = TRUE; } break; @@ -579,24 +560,6 @@ ok_button_clicked(GtkButton *b, gpointer } } - /* Driver */ - driver_audiodevp = gtk_entry_get_text(GTK_ENTRY(driver_audio_device_entry)); - - renewal = FALSE; - if (np2oscfg.snddrv != driver_snddrv) { - np2oscfg.snddrv = driver_snddrv; - renewal = TRUE; - } - if (strcmp(np2oscfg.audiodev, driver_audiodevp) != 0) { - milstr_ncpy(np2oscfg.audiodev, driver_audiodevp, sizeof(np2oscfg.audiodev)); - renewal = TRUE; - } - - if (renewal) { - sysmng_update(SYS_UPDATEOSCFG); - soundrenewal = 1; - } - gtk_widget_destroy((GtkWidget *)d); } @@ -684,15 +647,6 @@ spb_default_button_clicked(GtkButton *b, } } -static void -driver_radiobutton_clicked(GtkButton *b, gpointer d) -{ - - UNUSED(b); - - driver_snddrv = (int)d; -} - static GtkWidget * create_mixer_note(void) { @@ -739,7 +693,7 @@ create_mixer_note(void) gtk_widget_show(mixer_default_button); gtk_box_pack_end(GTK_BOX(hbox), mixer_default_button, FALSE, FALSE, 5); g_signal_connect_swapped(GTK_OBJECT(mixer_default_button), "clicked", - GTK_SIGNAL_FUNC(mixer_default_button_clicked), NULL); + G_CALLBACK(mixer_default_button_clicked), NULL); return root_widget; } @@ -787,7 +741,7 @@ create_pc9801_14_note(void) gtk_widget_show(snd14_default_button); gtk_box_pack_end(GTK_BOX(hbox), snd14_default_button, FALSE, FALSE, 5); g_signal_connect_swapped(GTK_OBJECT(snd14_default_button), "clicked", - GTK_SIGNAL_FUNC(snd14_default_button_clicked), NULL); + G_CALLBACK(snd14_default_button_clicked), NULL); return root_widget; } @@ -881,7 +835,7 @@ create_pc9801_26_note(void) gtk_widget_show(snd26_default_button); gtk_box_pack_end(GTK_BOX(hbox), snd26_default_button, FALSE, FALSE, 5); g_signal_connect_swapped(GTK_OBJECT(snd26_default_button), "clicked", - GTK_SIGNAL_FUNC(snd26_default_button_clicked), NULL); + G_CALLBACK(snd26_default_button_clicked), NULL); return root_widget; } @@ -983,7 +937,7 @@ create_pc9801_86_note(void) gtk_widget_show(snd86_default_button); gtk_box_pack_end(GTK_BOX(hbox), snd86_default_button, FALSE, FALSE, 5); g_signal_connect_swapped(GTK_OBJECT(snd86_default_button), "clicked", - GTK_SIGNAL_FUNC(snd86_default_button_clicked), NULL); + G_CALLBACK(snd86_default_button_clicked), NULL); return root_widget; } @@ -1111,7 +1065,7 @@ create_spb_note(void) gtk_widget_show(spb_default_button); gtk_box_pack_end(GTK_BOX(hbox), spb_default_button, FALSE, FALSE, 5); g_signal_connect_swapped(GTK_OBJECT(spb_default_button), "clicked", - GTK_SIGNAL_FUNC(spb_default_button_clicked), NULL); + G_CALLBACK(spb_default_button_clicked), NULL); return root_widget; } @@ -1266,7 +1220,7 @@ create_joypad_note(void) gtk_widget_show(devlist_entry); gtk_editable_set_editable(GTK_EDITABLE(devlist_entry), FALSE); g_signal_connect(GTK_OBJECT(devlist_entry), "changed", - GTK_SIGNAL_FUNC(joypad_device_changed), (gpointer)joypad_devlist_combo); + G_CALLBACK(joypad_device_changed), (gpointer)joypad_devlist_combo); /* Axis */ for (i = 0; i < JOY_NAXIS; ++i) { @@ -1287,7 +1241,7 @@ create_joypad_note(void) gtk_editable_set_editable(GTK_EDITABLE(axis_entry[i]), FALSE); gtk_entry_set_text(GTK_ENTRY(axis_entry[i]), joypad_noconnect_str); g_signal_connect(GTK_OBJECT(axis_entry[i]), "changed", - GTK_SIGNAL_FUNC(joypad_axis_entry_changed), + G_CALLBACK(joypad_axis_entry_changed), (gpointer)(&joypad_axis[i])); } @@ -1310,7 +1264,7 @@ create_joypad_note(void) gtk_editable_set_editable(GTK_EDITABLE(button_entry[i]), FALSE); gtk_entry_set_text(GTK_ENTRY(button_entry[i]), joypad_noconnect_str); g_signal_connect(GTK_OBJECT(button_entry[i]), "changed", - GTK_SIGNAL_FUNC(joypad_button_entry_changed), + G_CALLBACK(joypad_button_entry_changed), (gpointer)(&joypad_button[i])); } @@ -1343,103 +1297,6 @@ create_joypad_note(void) return root_widget; } -static GtkWidget * -create_driver_note(void) -{ - GtkWidget *root_widget; - GtkWidget *driver_frame; - GtkWidget *driver_vbox; - GtkWidget *driver_radiobutton[SNDDRV_DRVMAX]; - GtkWidget *audio_device_label; - GtkWidget *snddrv_hbox; - int i; - - root_widget = gtk_vbox_new(FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER(root_widget), 5); - gtk_widget_show(root_widget); - - driver_frame = gtk_frame_new("Sound driver"); - gtk_widget_show(driver_frame); - gtk_box_pack_start(GTK_BOX(root_widget), driver_frame, TRUE, TRUE, 0); - - driver_vbox = gtk_vbox_new(FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER(driver_vbox), 5); - gtk_widget_show(driver_vbox); - gtk_container_add(GTK_CONTAINER(driver_frame), driver_vbox); - - for (i = 0; i < SNDDRV_DRVMAX; i++) { - driver_radiobutton[i] = gtk_radio_button_new_with_label_from_widget((i > 0) ? GTK_RADIO_BUTTON(driver_radiobutton[i-1]) : NULL, driver_name[i]); - gtk_widget_show(driver_radiobutton[i]); - gtk_box_pack_start(GTK_BOX(driver_vbox), driver_radiobutton[i], TRUE, FALSE, 0); - g_signal_connect(GTK_OBJECT(driver_radiobutton[i]), "clicked", - GTK_SIGNAL_FUNC(driver_radiobutton_clicked), (gpointer)i); - } -#if !defined(USE_NETBSDAUDIO) - gtk_widget_set_sensitive(driver_radiobutton[SNDDRV_NETBSD], FALSE); -#endif -#if !defined(USE_OSSAUDIO) - gtk_widget_set_sensitive(driver_radiobutton[SNDDRV_OSS], FALSE); -#endif -#if !defined(USE_ESDAUDIO) - gtk_widget_set_sensitive(driver_radiobutton[SNDDRV_ESD], FALSE); -#endif -#if !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER) - gtk_widget_set_sensitive(driver_radiobutton[SNDDRV_SDL], FALSE); -#endif - - switch (np2oscfg.snddrv) { - case SNDDRV_NODRV: -#if defined(USE_NETBSDAUDIO) - case SNDDRV_NETBSD: -#endif -#if defined(USE_OSSAUDIO) - case SNDDRV_OSS: -#endif -#if defined(USE_ESDAUDIO) - case SNDDRV_ESD: -#endif -#if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER) - case SNDDRV_SDL: -#endif - g_signal_emit_by_name(GTK_OBJECT(driver_radiobutton[np2oscfg.snddrv]), "clicked"); - break; - -#if !defined(USE_NETBSDAUDIO) - case SNDDRV_NETBSD: -#endif -#if !defined(USE_OSSAUDIO) - case SNDDRV_OSS: -#endif -#if !defined(USE_ESDAUDIO) - case SNDDRV_ESD: -#endif -#if !defined(USE_SDLAUDIO) && !defined(USE_SDLMIXER) - case SNDDRV_SDL: -#endif - case SNDDRV_DRVMAX: - default: - np2oscfg.snddrv = SNDDRV_NODRV; - sysmng_update(SYS_UPDATEOSCFG); - break; - } - - snddrv_hbox = gtk_hbox_new(FALSE, 0); - gtk_container_set_border_width(GTK_CONTAINER(snddrv_hbox), 5); - gtk_widget_show(snddrv_hbox); - gtk_box_pack_start(GTK_BOX(root_widget), snddrv_hbox, FALSE, FALSE, 0); - - audio_device_label = gtk_label_new("Sound device"); - gtk_widget_show(audio_device_label); - gtk_box_pack_start(GTK_BOX(snddrv_hbox), audio_device_label, FALSE, FALSE, 3); - - driver_audio_device_entry = gtk_entry_new(); - gtk_widget_show(driver_audio_device_entry); - gtk_entry_set_text(GTK_ENTRY(driver_audio_device_entry), np2oscfg.audiodev); - gtk_box_pack_start(GTK_BOX(snddrv_hbox), driver_audio_device_entry, TRUE, TRUE, 3); - - return root_widget; -} - void create_sound_dialog(void) { @@ -1452,7 +1309,6 @@ create_sound_dialog(void) GtkWidget *pc9801_86_note; GtkWidget *spb_note; GtkWidget *joypad_note; - GtkWidget *driver_note; GtkWidget *confirm_widget; GtkWidget *ok_button; GtkWidget *cancel_button; @@ -1466,7 +1322,7 @@ create_sound_dialog(void) gtk_window_set_resizable(GTK_WINDOW(sound_dialog), FALSE); g_signal_connect(GTK_OBJECT(sound_dialog), "destroy", - GTK_SIGNAL_FUNC(dialog_destroy), NULL); + G_CALLBACK(dialog_destroy), NULL); main_vbox = gtk_vbox_new(FALSE, 0); gtk_widget_show(main_vbox); @@ -1500,10 +1356,6 @@ create_sound_dialog(void) joypad_note = create_joypad_note(); gtk_notebook_append_page(GTK_NOTEBOOK(notebook), joypad_note, gtk_label_new("JoyPad")); - /* "Driver" note */ - driver_note = create_driver_note(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), driver_note, gtk_label_new("Driver")); - /* * OK, Cancel button */ @@ -1516,7 +1368,7 @@ create_sound_dialog(void) gtk_box_pack_end(GTK_BOX(confirm_widget), cancel_button, FALSE, FALSE, 0); GTK_WIDGET_SET_FLAGS(cancel_button, GTK_CAN_DEFAULT); g_signal_connect_swapped(GTK_OBJECT(cancel_button), "clicked", - GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(sound_dialog)); + G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(sound_dialog)); ok_button = gtk_button_new_from_stock(GTK_STOCK_OK); gtk_widget_show(ok_button); @@ -1524,7 +1376,7 @@ create_sound_dialog(void) GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT); GTK_WIDGET_SET_FLAGS(ok_button, GTK_HAS_DEFAULT); g_signal_connect(GTK_OBJECT(ok_button), "clicked", - GTK_SIGNAL_FUNC(ok_button_clicked), (gpointer)sound_dialog); + G_CALLBACK(ok_button_clicked), (gpointer)sound_dialog); gtk_widget_grab_default(ok_button); gtk_widget_show_all(sound_dialog);