comparison src/icecast/icecast.c @ 2799:48550fe6723c

added user/password entryboxes
author Andrew O. Shadoura <bugzilla@tut.by>
date Sat, 05 Jul 2008 23:00:33 +0300
parents 5a10f297b7d0
children d3c4dd274890
comparison
equal deleted inserted replaced
2798:5a10f297b7d0 2799:48550fe6723c
26 26
27 struct format_info input; 27 struct format_info input;
28 28
29 static GtkWidget *configure_win = NULL, *configure_vbox; 29 static GtkWidget *configure_win = NULL, *configure_vbox;
30 static GtkWidget *addr_entry, *port_spin, *timeout_spin, *buffersize_spin, *bufferflush_spin; 30 static GtkWidget *addr_entry, *port_spin, *timeout_spin, *buffersize_spin, *bufferflush_spin;
31 static GtkWidget *user_entry, *password_entry;
31 static GtkWidget *configure_bbox, *configure_ok, *configure_cancel; 32 static GtkWidget *configure_bbox, *configure_ok, *configure_cancel;
32 static guint ice_tid=0; 33 static guint ice_tid=0;
33 34
34 static gint ice_close_timeout; 35 static gint ice_close_timeout;
35 36
66 static gint buffersize_new; 67 static gint buffersize_new;
67 static gint bufferflush_new; 68 static gint bufferflush_new;
68 static gdouble bufferflushperc; 69 static gdouble bufferflushperc;
69 static gchar *server_address = NULL; 70 static gchar *server_address = NULL;
70 static gint server_port=8000; 71 static gint server_port=8000;
72
73 static gchar *server_user = NULL;
74 static gchar *server_password = NULL;
71 75
72 VFSFile *output_file = NULL; 76 VFSFile *output_file = NULL;
73 guint64 written = 0; 77 guint64 written = 0;
74 guint64 offset = 0; 78 guint64 offset = 0;
75 Tuple *tuple = NULL; 79 Tuple *tuple = NULL;
158 buffersize_new=buffersize; 162 buffersize_new=buffersize;
159 aud_cfg_db_get_double(db, "icecast", "bufferflush", &bufferflushperc); 163 aud_cfg_db_get_double(db, "icecast", "bufferflush", &bufferflushperc);
160 if (!bufferflushperc) bufferflushperc=80.0; 164 if (!bufferflushperc) bufferflushperc=80.0;
161 bufferflush=(gint)(buffersize*bufferflushperc); 165 bufferflush=(gint)(buffersize*bufferflushperc);
162 bufferflush_new=bufferflush; 166 bufferflush_new=bufferflush;
167 aud_cfg_db_get_string(db, "icecast", "server_user", &server_user);
168 aud_cfg_db_get_string(db, "icecast", "server_password", &server_password);
163 aud_cfg_db_close(db); 169 aud_cfg_db_close(db);
164 170
165 outputbuffer=g_try_malloc(buffersize); 171 outputbuffer=g_try_malloc(buffersize);
166 172
167 set_plugin(); 173 set_plugin();
489 streamformat = gtk_combo_box_get_active(GTK_COMBO_BOX(streamformat_combo)); 495 streamformat = gtk_combo_box_get_active(GTK_COMBO_BOX(streamformat_combo));
490 496
491 g_free(server_address); 497 g_free(server_address);
492 server_address = g_strdup(gtk_entry_get_text(GTK_ENTRY(addr_entry))); 498 server_address = g_strdup(gtk_entry_get_text(GTK_ENTRY(addr_entry)));
493 499
500 g_free(server_user);
501 server_user = g_strdup(gtk_entry_get_text(GTK_ENTRY(user_entry)));
502
503 g_free(server_password);
504 server_password = g_strdup(gtk_entry_get_text(GTK_ENTRY(password_entry)));
505
494 server_port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(port_spin)); 506 server_port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(port_spin));
495 507
496 ice_close_timeout = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(timeout_spin)); 508 ice_close_timeout = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(timeout_spin));
497 509
498 buffersize_new = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffersize_spin)); 510 buffersize_new = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(buffersize_spin));
501 bufferflush_new=(gint)(buffersize*bufferflushperc); 513 bufferflush_new=(gint)(buffersize*bufferflushperc);
502 514
503 db = aud_cfg_db_open(); 515 db = aud_cfg_db_open();
504 aud_cfg_db_set_int(db, "icecast", "streamformat", streamformat); 516 aud_cfg_db_set_int(db, "icecast", "streamformat", streamformat);
505 aud_cfg_db_set_string(db, "icecast", "server_address", server_address); 517 aud_cfg_db_set_string(db, "icecast", "server_address", server_address);
518 aud_cfg_db_set_string(db, "icecast", "server_user", server_user);
519 aud_cfg_db_set_string(db, "icecast", "server_password", server_password);
506 aud_cfg_db_set_int(db, "icecast", "server_port", server_port); 520 aud_cfg_db_set_int(db, "icecast", "server_port", server_port);
507 aud_cfg_db_set_int(db, "icecast", "timeout", ice_close_timeout); 521 aud_cfg_db_set_int(db, "icecast", "timeout", ice_close_timeout);
508 aud_cfg_db_set_int(db, "icecast", "buffersize", buffersize_new); 522 aud_cfg_db_set_int(db, "icecast", "buffersize", buffersize_new);
509 aud_cfg_db_set_double(db, "icecast", "bufferflush", bufferflushperc); 523 aud_cfg_db_set_double(db, "icecast", "bufferflush", bufferflushperc);
510 524
601 gtk_spin_button_set_digits(GTK_SPIN_BUTTON(port_spin), 0); 615 gtk_spin_button_set_digits(GTK_SPIN_BUTTON(port_spin), 0);
602 616
603 gtk_spin_button_set_value(GTK_SPIN_BUTTON(port_spin), (gdouble)server_port); 617 gtk_spin_button_set_value(GTK_SPIN_BUTTON(port_spin), (gdouble)server_port);
604 618
605 gtk_box_pack_start(GTK_BOX(hbox), port_spin, TRUE, TRUE, 0); 619 gtk_box_pack_start(GTK_BOX(hbox), port_spin, TRUE, TRUE, 0);
620
621 gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_hseparator_new(), FALSE, FALSE, 0);
622
623 hbox = gtk_hbox_new(FALSE, 5);
624 gtk_box_pack_start(GTK_BOX(configure_vbox), hbox, FALSE, FALSE, 0);
625
626 label = gtk_label_new(_("User name:"));
627 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
628
629 user_entry = gtk_entry_new();
630
631 gtk_entry_set_text(GTK_ENTRY(user_entry), server_user);
632
633 gtk_box_pack_start(GTK_BOX(hbox), user_entry, TRUE, TRUE, 0);
634
635 label = gtk_label_new(_("Password:"));
636 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
637
638 password_entry = gtk_entry_new();
639
640 gtk_entry_set_text(GTK_ENTRY(password_entry), server_password);
641
642 gtk_entry_set_visibility(GTK_ENTRY(password_entry), FALSE);
643
644 gtk_box_pack_start(GTK_BOX(hbox), password_entry, TRUE, TRUE, 0);
606 645
607 gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_hseparator_new(), FALSE, FALSE, 0); 646 gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_hseparator_new(), FALSE, FALSE, 0);
608 647
609 hbox = gtk_hbox_new(FALSE, 5); 648 hbox = gtk_hbox_new(FALSE, 5);
610 gtk_box_pack_start(GTK_BOX(configure_vbox), hbox, FALSE, FALSE, 0); 649 gtk_box_pack_start(GTK_BOX(configure_vbox), hbox, FALSE, FALSE, 0);