diff --git a/cardselect.ui b/cardselect.ui
deleted file mode 100644
index cbd6682..0000000
--- a/cardselect.ui
+++ /dev/null
@@ -1,109 +0,0 @@
-
-
-
-
-
diff --git a/gui.c b/gui.c
index 64e6982..31f13c9 100644
--- a/gui.c
+++ b/gui.c
@@ -14,7 +14,6 @@ void createGUI() {
builder = gtk_builder_new();
gtk_builder_add_from_file(builder, "slowrx.ui", NULL);
gtk_builder_add_from_file(builder, "aboutdialog.ui", NULL);
- gtk_builder_add_from_file(builder, "cardselect.ui", NULL);
vugrid = GTK_WIDGET(gtk_builder_get_object(builder,"vugrid"));
mainwindow = GTK_WIDGET(gtk_builder_get_object(builder,"mainwindow"));
@@ -24,7 +23,6 @@ void createGUI() {
quititem = GTK_WIDGET(gtk_builder_get_object(builder,"quititem"));
aboutitem = GTK_WIDGET(gtk_builder_get_object(builder,"aboutitem"));
aboutdialog = GTK_WIDGET(gtk_builder_get_object(builder,"aboutdialog"));
- sdialog = GTK_WIDGET(gtk_builder_get_object(builder,"sdialog"));
cardcombo = GTK_WIDGET(gtk_builder_get_object(builder,"cardcombo"));
g_signal_connect (quititem, "activate", G_CALLBACK(delete_event), NULL);
diff --git a/pcm.c b/pcm.c
index 30b5110..93c4318 100644
--- a/pcm.c
+++ b/pcm.c
@@ -35,19 +35,11 @@ void initPcmDevice() {
if (numcards == 0) {
printf("No sound cards found!\n");
exit(EXIT_SUCCESS);
- } else if (numcards == 1) {
- cardnum = 0;
} else {
-
- gtk_combo_box_set_active(GTK_COMBO_BOX(cardcombo), 0);
- gtk_widget_show_all (sdialog);
-
- gint result = gtk_dialog_run(GTK_DIALOG(sdialog));
- if (result == GTK_RESPONSE_CLOSE) exit(EXIT_SUCCESS);
- cardnum = gtk_combo_box_get_active (GTK_COMBO_BOX(cardcombo));
+ cardnum = 0;
}
- gtk_widget_destroy(sdialog);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(cardcombo), 0);
if (cardnum == 0) {
sprintf(pcm_name,"default");
diff --git a/slowrx.ui b/slowrx.ui
index 87a1d87..8574ff5 100644
--- a/slowrx.ui
+++ b/slowrx.ui
@@ -102,78 +102,246 @@
10
10
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
False
True
- 2
+ 1
@@ -416,7 +433,7 @@
False
True
- 3
+ 2