adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

darksnow now compiles com gtk 3.0. Issue: #63

This commit is contained in:
rafael@riseup.net 2013-05-14 17:20:23 +00:00
parent 9cecd3f493
commit 78f9bf2894
8 changed files with 248 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
darkice-gui/trunk/Makefile.in
View File

@ -22,7 +22,8 @@ PREFIX=@prefix@
INTLPREFIX=@prefix@ INTLPREFIX=@prefix@
CC=@CC@ CC=@CC@
VERSION=@VERSION@ VERSION=@VERSION@
CFLAGS+=-Wall #CFLAGS+=-Wall -DGTK_DISABLE_DEPRECATED=1
CFLAGS+=-Wall
INSTALL=install INSTALL=install
ARCH=`uname -m` ARCH=`uname -m`
@ -38,7 +39,7 @@ CFLAGS+= -DUSE_TOOLTIP
all: darksnow all: darksnow
darksnow: darksnow.o interface.o config_files.o tooltips.o man_gzip darksnow: darksnow.o interface.o config_files.o tooltips.o man_gzip
$(CC) $(CFLAGS) @GTK_LIBS@ @GTK_CFLAGS@ -DVERSION="\"$(VERSION)\"" darksnow.o interface.o config_files.o tooltips.o -o darksnow $(CC) darksnow.o interface.o config_files.o tooltips.o -o darksnow @GTK_LIBS@ @GTK_CFLAGS@ -DVERSION="\"$(VERSION)\""
darksnow.o: darksnow.c darksnow.o: darksnow.c
$(CC) $(FUNNY) @GTK_CFLAGS@ -DINTLPREFIX="\"$(INTLPREFIX)\"" -DVERSION="\"$(VERSION)\"" -c darksnow.c -o darksnow.o $(CC) $(FUNNY) @GTK_CFLAGS@ -DINTLPREFIX="\"$(INTLPREFIX)\"" -DVERSION="\"$(VERSION)\"" -c darksnow.c -o darksnow.o

24
darkice-gui/trunk/config_files.c
View File

@ -84,18 +84,18 @@ gboolean darksnow_config_store(char opt, char *save_path) {
adddate = (char) (gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (checkbutton_adddate) ))? '1': '0'; adddate = (char) (gtk_toggle_button_get_active ( GTK_TOGGLE_BUTTON (checkbutton_adddate) ))? '1': '0';
/* Combo box inputs */ /* Combo box inputs */
icecast = (char *) gtk_combo_box_get_active_text(GTK_COMBO_BOX(combo_icecast)); icecast = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_icecast));
format = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO (combo_format)->entry )); format = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_format));
bitrate = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_bitrate)->entry)); bitrate = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_bitrate));
bitratemode = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_bitratemode)->entry)); bitratemode = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_bitratemode));
samplerate = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_samplerate)->entry)); samplerate = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_samplerate));
quality = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_quality)->entry)); quality = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_quality));
bitspersample = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_bitspersample)->entry)); bitspersample = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_bitspersample));
channel = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_channel)->entry)); channel = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_channel));
buffersize = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_buffersize)->entry)); buffersize = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_buffersize));
device = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_device)->entry)); device = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_device));
public = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_public)->entry)); public = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_public));
verbosity = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_verbosity)->entry)); verbosity = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_verbosity));
if (!( f_darksnow_cfg = (opt != 0)? fopen(darksnow_cfg, "w") : fopen(save_path, "w"))) { if (!( f_darksnow_cfg = (opt != 0)? fopen(darksnow_cfg, "w") : fopen(save_path, "w"))) {

9
darkice-gui/trunk/configure.in
View File

@ -1,11 +1,12 @@
AC_INIT(darksnow.c) AC_INIT
AC_CONFIG_SRCDIR([darksnow.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
dnl set CC dnl set CC
AC_PROG_CC AC_PROG_CC
dnl tests C compiler dnl tests C compiler
AC_LANG_C AC_LANG([C])
VERSION="0.6.2" VERSION="0.6.2"
AC_SUBST(VERSION) AC_SUBST(VERSION)
@ -13,6 +14,8 @@ AC_SUBST(VERSION)
AC_CHECK_FUNC(mmap,,AC_MSG_ERROR(Sorry, you need mmap. If you are reading this, email-me and report this problem and your system description - rafael@riseup.net)) AC_CHECK_FUNC(mmap,,AC_MSG_ERROR(Sorry, you need mmap. If you are reading this, email-me and report this problem and your system description - rafael@riseup.net))
AC_CHECK_FUNC(gettext,,AC_MSG_ERROR(Sorry, you need gettext. If you are reading this, email-me and report this problem and your system description - rafael@riseup.net)) AC_CHECK_FUNC(gettext,,AC_MSG_ERROR(Sorry, you need gettext. If you are reading this, email-me and report this problem and your system description - rafael@riseup.net))
#AM_PATH_GTK_3_0(3.0.0)
AM_PATH_GTK_2_0(2.0.0) AM_PATH_GTK_2_0(2.0.0)
AC_OUTPUT(Makefile) AC_CONFIG_FILES([Makefile])
AC_OUTPUT

349
darkice-gui/trunk/darksnow.c
View File

@ -3,7 +3,7 @@
* *
* This source code is free software; you can redistribute it and/or * This source code is free software; you can redistribute it and/or
* modify it under the terms of the GNU Public License as published * modify it under the terms of the GNU Public License as published
* by the Free Software Foundation; either version 3 of the License, * by the Free Software Foundation; either version 2 of the License,
* or (at your option) any later version. * or (at your option) any later version.
* *
* This source code is distributed in the hope that it will be useful, * This source code is distributed in the hope that it will be useful,
@ -168,28 +168,26 @@ int main( int argc, char *argv[], char *envp[]) {
gtk_menu_shell_append (GTK_MENU_SHELL (menu_file), menu_item_quit_nd); gtk_menu_shell_append (GTK_MENU_SHELL (menu_file), menu_item_quit_nd);
gtk_menu_shell_append (GTK_MENU_SHELL (menu_file), menu_item_quit); gtk_menu_shell_append (GTK_MENU_SHELL (menu_file), menu_item_quit);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item_file), menu_file); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item_file), menu_file);
gtk_menu_bar_append ( GTK_MENU_BAR (menu_bar), menu_item_file ); gtk_menu_shell_append ( GTK_MENU_SHELL (menu_bar), menu_item_file );
menu_help = gtk_menu_new(); menu_help = gtk_menu_new();
menu_item_help = gtk_menu_item_new_with_label ( gettext("Help") ); menu_item_help = gtk_menu_item_new_with_label ( gettext("Help") );
menu_item_about = gtk_menu_item_new_with_label ( gettext("About") ); menu_item_about = gtk_menu_item_new_with_label ( gettext("About") );
gtk_menu_shell_append (GTK_MENU_SHELL (menu_help), menu_item_about); gtk_menu_shell_append (GTK_MENU_SHELL (menu_help), menu_item_about);
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item_help), menu_help); gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item_help), menu_help);
gtk_menu_bar_append ( GTK_MENU_BAR (menu_bar), menu_item_help ); gtk_menu_shell_append ( GTK_MENU_SHELL (menu_bar), menu_item_help );
gtk_box_pack_start (GTK_BOX (vbox), menu_bar, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), menu_bar, FALSE, FALSE, 0);
/* sets up the about dialog */ /* sets up the about dialog */
dialog_about = gtk_about_dialog_new ();
sprintf(bar, gettext("DarkSnow version: %s\nSoftware written by Rafael Diniz\nLicense: GNU Public License v3"),VERSION); const gchar *authors[] = {"Rafael Diniz", NULL};
dialog_about = gtk_dialog_new (); gtk_about_dialog_set_program_name( GTK_ABOUT_DIALOG( dialog_about), "DarkSnow");
label_about = gtk_label_new ( bar ); gtk_about_dialog_set_version( GTK_ABOUT_DIALOG( dialog_about), VERSION);
button_about = gtk_button_new_with_label ( gettext("Close")); gtk_about_dialog_set_authors( GTK_ABOUT_DIALOG(dialog_about), authors);
gtk_window_set_title(GTK_WINDOW (dialog_about), gettext("About DarkSnow")); /* gtk_about_dialog_set_license_type( GTK_ABOUT_DIALOG(dialog_about), GTK_LICENSE_GPL_3_0);*/
gtk_widget_set_size_request (GTK_WIDGET (dialog_about), 350, 200); gtk_about_dialog_set_website( GTK_ABOUT_DIALOG(dialog_about), "http://darksnow.radiolivre.org");
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_about)->action_area), button_about, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_about)->vbox), label_about, TRUE, TRUE, 0);
/* sets up the exit window */ /* sets up the exit window */
dialog_darkkill = gtk_dialog_new (); dialog_darkkill = gtk_dialog_new ();
@ -198,19 +196,37 @@ int main( int argc, char *argv[], char *envp[]) {
button_no_darkkill = gtk_button_new_with_label (gettext("No")); button_no_darkkill = gtk_button_new_with_label (gettext("No"));
gtk_window_set_title(GTK_WINDOW (dialog_darkkill), gettext("Darkice is running")); gtk_window_set_title(GTK_WINDOW (dialog_darkkill), gettext("Darkice is running"));
gtk_widget_set_size_request (GTK_WIDGET (dialog_darkkill), 300, 200); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area( GTK_DIALOG (dialog_darkkill))), button_yes_darkkill, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_darkkill)->action_area), button_yes_darkkill, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area( GTK_DIALOG (dialog_darkkill))), button_no_darkkill, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_darkkill)->action_area), button_no_darkkill, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area( GTK_DIALOG (dialog_darkkill))), label_darkkill, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_darkkill)->vbox), label_darkkill, TRUE, TRUE, 0);
g_signal_connect_swapped (G_OBJECT (dialog_darkkill), "delete_event",G_CALLBACK (gtk_widget_hide), dialog_darkkill); g_signal_connect_swapped (G_OBJECT (dialog_darkkill), "delete_event",G_CALLBACK (gtk_widget_hide), dialog_darkkill);
g_signal_connect (G_OBJECT (button_yes_darkkill), "clicked",G_CALLBACK (delete_event), NULL); g_signal_connect (G_OBJECT (button_yes_darkkill), "clicked",G_CALLBACK (delete_event), NULL);
g_signal_connect (G_OBJECT (button_no_darkkill), "clicked",G_CALLBACK (delete_event_nd), NULL); g_signal_connect (G_OBJECT (button_no_darkkill), "clicked",G_CALLBACK (delete_event_nd), NULL);
/* sets up the file selectors */ /* sets up the file selectors */
file_open = gtk_file_selection_new ( gettext("Open File") ); file_open = gtk_file_chooser_dialog_new ( gettext("Open File"),
file_save = gtk_file_selection_new ( gettext("Save File") ); NULL,
file_localdump = gtk_file_selection_new ( gettext("Local Dump File") ); GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
file_save = gtk_file_chooser_dialog_new ( gettext("Save File"),
NULL,
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
file_localdump = gtk_file_chooser_dialog_new ( gettext("Local Dump File"),
NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
gtk_file_chooser_set_local_only ( GTK_FILE_CHOOSER( file_open), FALSE);
gtk_file_chooser_set_local_only ( GTK_FILE_CHOOSER( file_save), FALSE);
gtk_file_chooser_set_local_only ( GTK_FILE_CHOOSER( file_localdump), FALSE);
/* sets up the notebook stuff */ /* sets up the notebook stuff */
notebook = gtk_notebook_new (); notebook = gtk_notebook_new ();
@ -230,11 +246,11 @@ int main( int argc, char *argv[], char *envp[]) {
/* Server Options Widgets */ /* Server Options Widgets */
label_icecast = gtk_label_new ( gettext("Streaming Destination: ")); label_icecast = gtk_label_new ( gettext("Streaming Destination: "));
combo_icecast = gtk_combo_box_entry_new_text(); combo_icecast = gtk_combo_box_text_new_with_entry ();
gchar *txt[] = {"Icecast 1", "Icecast 2", "Shoutcast", NULL }; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_icecast), "Icecast 1");
gchar **p=txt; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_icecast), "Icecast 2");
while (*p) gtk_combo_box_append_text(GTK_COMBO_BOX(combo_icecast), *p++); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_icecast), "Shoutcast");
gtk_combo_box_set_active ( GTK_COMBO_BOX(combo_icecast), 1); gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_icecast))),"Icecast 2");
label_server = gtk_label_new ( gettext("Server: ")); label_server = gtk_label_new ( gettext("Server: "));
entry_server = gtk_entry_new (); entry_server = gtk_entry_new ();
@ -247,20 +263,20 @@ int main( int argc, char *argv[], char *envp[]) {
gtk_entry_set_visibility (GTK_ENTRY(entry_pass), FALSE); gtk_entry_set_visibility (GTK_ENTRY(entry_pass), FALSE);
label_verbosity = gtk_label_new ( gettext ("Verbosity level: ")); label_verbosity = gtk_label_new ( gettext ("Verbosity level: "));
combo_verbosity = gtk_combo_new (); combo_verbosity = gtk_combo_box_text_new_with_entry();
glist_verbosity = NULL;
glist_verbosity = g_list_append (glist_verbosity, "0"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "0");
glist_verbosity = g_list_append (glist_verbosity, "1"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "1");
glist_verbosity = g_list_append (glist_verbosity, "2"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "2");
glist_verbosity = g_list_append (glist_verbosity, "3"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "3");
glist_verbosity = g_list_append (glist_verbosity, "4"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "4");
glist_verbosity = g_list_append (glist_verbosity, "5"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "5");
glist_verbosity = g_list_append (glist_verbosity, "6"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "6");
glist_verbosity = g_list_append (glist_verbosity, "7"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "7");
glist_verbosity = g_list_append (glist_verbosity, "8"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "8");
glist_verbosity = g_list_append (glist_verbosity, "9"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "9");
glist_verbosity = g_list_append (glist_verbosity, "10"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_verbosity), "10");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_verbosity), glist_verbosity); gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_verbosity))),"0");
label_remotedump = gtk_label_new ( gettext ("Remote Dump File: ")); label_remotedump = gtk_label_new ( gettext ("Remote Dump File: "));
entry_remotedump = gtk_entry_new (); entry_remotedump = gtk_entry_new ();
@ -274,138 +290,124 @@ int main( int argc, char *argv[], char *envp[]) {
/* Audio Options Widgets */ /* Audio Options Widgets */
label_format = gtk_label_new ( gettext("Format: ")); label_format = gtk_label_new ( gettext("Format: "));
combo_format = gtk_combo_new (); combo_format = gtk_combo_box_text_new_with_entry ();
glist_format = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("mp3"));
glist_format = g_list_append (glist_format, gettext("mp3")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("ogg/vorbis"));
glist_format = g_list_append (glist_format, gettext("ogg/vorbis")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("aac"));
glist_format = g_list_append (glist_format, gettext("aac")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("mp2"));
glist_format = g_list_append (glist_format, gettext("mp2")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_format), gettext("aacp"));
glist_format = g_list_append (glist_format, gettext("aacp")); gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_format))),"ogg/vorbis");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_format), glist_format);
label_bitratemode = gtk_label_new ( gettext("BitRateMode: ")); label_bitratemode = gtk_label_new ( gettext("BitRateMode: "));
combo_bitratemode = gtk_combo_new (); combo_bitratemode = gtk_combo_box_text_new_with_entry ();
glist_bitratemode = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitratemode), gettext("Constant"));
glist_bitratemode = g_list_append (glist_bitratemode, gettext("Constant")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitratemode), gettext("Average"));
glist_bitratemode = g_list_append (glist_bitratemode, gettext("Average")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitratemode), gettext("Variable"));
glist_bitratemode = g_list_append (glist_bitratemode, gettext("Variable")); gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_bitratemode))),"Constant");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_bitratemode), glist_bitratemode);
label_bitrate = gtk_label_new ( gettext("BitRate: ")); label_bitrate = gtk_label_new ( gettext("BitRate: "));
combo_bitrate = gtk_combo_new (); combo_bitrate = gtk_combo_box_text_new_with_entry ();
glist_bitrate = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "16");
glist_bitrate = g_list_append (glist_bitrate, "16"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "24");
glist_bitrate = g_list_append (glist_bitrate, "24"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "32");
glist_bitrate = g_list_append (glist_bitrate, "32"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "40");
glist_bitrate = g_list_append (glist_bitrate, "40"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "48");
glist_bitrate = g_list_append (glist_bitrate, "48"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "56");
glist_bitrate = g_list_append (glist_bitrate, "56"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "64");
glist_bitrate = g_list_append (glist_bitrate, "64"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "72");
glist_bitrate = g_list_append (glist_bitrate, "72"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "80");
glist_bitrate = g_list_append (glist_bitrate, "80"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "88");
glist_bitrate = g_list_append (glist_bitrate, "88"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "96");
glist_bitrate = g_list_append (glist_bitrate, "96"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "104");
glist_bitrate = g_list_append (glist_bitrate, "104"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "112");
glist_bitrate = g_list_append (glist_bitrate, "112"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "120");
glist_bitrate = g_list_append (glist_bitrate, "120"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "128");
glist_bitrate = g_list_append (glist_bitrate, "128"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "160");
glist_bitrate = g_list_append (glist_bitrate, "160"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "192");
glist_bitrate = g_list_append (glist_bitrate, "192"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "224");
glist_bitrate = g_list_append (glist_bitrate, "224"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitrate), "256");
glist_bitrate = g_list_append (glist_bitrate, "256"); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_bitrate))),"128");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_bitrate), glist_bitrate);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_bitrate)->entry), "32");
label_samplerate = gtk_label_new ( gettext("SampleRate: ")); label_samplerate = gtk_label_new ( gettext("SampleRate: "));
combo_samplerate = gtk_combo_new (); combo_samplerate = gtk_combo_box_text_new_with_entry ();
glist_samplerate = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "8000");
glist_samplerate = g_list_append (glist_samplerate, "8000"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "11025");
glist_samplerate = g_list_append (glist_samplerate, "11025"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "16000");
glist_samplerate = g_list_append (glist_samplerate, "16000"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "22050");
glist_samplerate = g_list_append (glist_samplerate, "22050"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "24000");
glist_samplerate = g_list_append (glist_samplerate, "24000"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "32000");
glist_samplerate = g_list_append (glist_samplerate, "32000"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "44100");
glist_samplerate = g_list_append (glist_samplerate, "44100"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "48000");
glist_samplerate = g_list_append (glist_samplerate, "48000"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_samplerate), "96000");
glist_samplerate = g_list_append (glist_samplerate, "96000"); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_samplerate))),"44100");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_samplerate), glist_samplerate);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_samplerate)->entry), "44100");
label_quality = gtk_label_new ( gettext("Quality: ")); label_quality = gtk_label_new ( gettext("Quality: "));
combo_quality = gtk_combo_new (); combo_quality = gtk_combo_box_text_new_with_entry ();
glist_quality = g_list_append (glist_quality, "1.0"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "1.0");
glist_quality = g_list_append (glist_quality, "0.9"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.9");
glist_quality = g_list_append (glist_quality, "0.8"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.8");
glist_quality = g_list_append (glist_quality, "0.7"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.7");
glist_quality = g_list_append (glist_quality, "0.6"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.6");
glist_quality = g_list_append (glist_quality, "0.5"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.5");
glist_quality = g_list_append (glist_quality, "0.4"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.4");
glist_quality = g_list_append (glist_quality, "0.3"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.3");
glist_quality = g_list_append (glist_quality, "0.2"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.2");
glist_quality = g_list_append (glist_quality, "0.1"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_quality), "0.1");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_quality), glist_quality); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_quality))),"0.8");
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_quality)->entry), "0.8");
label_bitspersample = gtk_label_new ( gettext("Bits per Sample: ")); label_bitspersample = gtk_label_new ( gettext("Bits per Sample: "));
combo_bitspersample = gtk_combo_new (); combo_bitspersample = gtk_combo_box_text_new_with_entry ();
glist_bitspersample = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitspersample), "16");
glist_bitspersample = g_list_append (glist_bitspersample, "16"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_bitspersample), "8");
glist_bitspersample = g_list_append (glist_bitspersample, "8"); gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo_bitspersample))),"16");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_bitspersample), glist_bitspersample);
label_channel = gtk_label_new ( gettext("Number of channels: ")); label_channel = gtk_label_new ( gettext("Number of channels: "));
combo_channel = gtk_combo_new (); combo_channel = gtk_combo_box_text_new_with_entry ();
glist_channel = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_channel), "2 - Stereo");
glist_channel = g_list_append (glist_channel, "2 - Stereo"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_channel), "1 - Mono");
glist_channel = g_list_append (glist_channel, "1 - Mono"); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_channel))),"1 - Mono");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_channel), glist_channel);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_channel)->entry), "1 - Mono");
label_buffersize = gtk_label_new ( gettext ("Buffer Size: ")); label_buffersize = gtk_label_new ( gettext ("Buffer Size: "));
combo_buffersize = gtk_combo_new (); combo_buffersize = gtk_combo_box_text_new_with_entry ();
glist_buffersize = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "1");
glist_buffersize = g_list_append (glist_buffersize, "1"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "2");
glist_buffersize = g_list_append (glist_buffersize, "2"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "3");
glist_buffersize = g_list_append (glist_buffersize, "3"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "4");
glist_buffersize = g_list_append (glist_buffersize, "4"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "5");
glist_buffersize = g_list_append (glist_buffersize, "5"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "6");
glist_buffersize = g_list_append (glist_buffersize, "6"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "7");
glist_buffersize = g_list_append (glist_buffersize, "7"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "8");
glist_buffersize = g_list_append (glist_buffersize, "8"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "9");
glist_buffersize = g_list_append (glist_buffersize, "9"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "10");
glist_buffersize = g_list_append (glist_buffersize, "10"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "11");
glist_buffersize = g_list_append (glist_buffersize, "11"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "12");
glist_buffersize = g_list_append (glist_buffersize, "12"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "13");
glist_buffersize = g_list_append (glist_buffersize, "13"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "14");
glist_buffersize = g_list_append (glist_buffersize, "14"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "15");
glist_buffersize = g_list_append (glist_buffersize, "15"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "16");
glist_buffersize = g_list_append (glist_buffersize, "16"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "17");
glist_buffersize = g_list_append (glist_buffersize, "17"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "18");
glist_buffersize = g_list_append (glist_buffersize, "18"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "19");
glist_buffersize = g_list_append (glist_buffersize, "19"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_buffersize), "20");
glist_buffersize = g_list_append (glist_buffersize, "20"); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_buffersize))),"10");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_buffersize), glist_buffersize);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_buffersize)->entry), "10");
label_device = gtk_label_new ( gettext ("Device Input: ")); label_device = gtk_label_new ( gettext ("Device Input: "));
combo_device = gtk_combo_new (); combo_device = gtk_combo_box_text_new_with_entry ();
glist_device = g_list_append (glist_device, "jack"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "jack");
glist_device = g_list_append (glist_device, "jack_auto"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "jack_auto");
glist_device = g_list_append (glist_device, "/dev/dsp"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "default");
glist_device = g_list_append (glist_device, "/dev/dsp0"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp");
glist_device = g_list_append (glist_device, "/dev/dsp1"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp0");
glist_device = g_list_append (glist_device, "/dev/dsp2"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp1");
glist_device = g_list_append (glist_device, "/dev/dsp3"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp2");
glist_device = g_list_append (glist_device, "hw:0,0"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "/dev/dsp3");
glist_device = g_list_append (glist_device, "hw:0,1"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "hw:0,0");
glist_device = g_list_append (glist_device, "hw:0,2"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "hw:0,1");
glist_device = g_list_append (glist_device, "hw:1,0"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "hw:0,2");
glist_device = g_list_append (glist_device, "hw:1,1"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "hw:1,0");
glist_device = g_list_append (glist_device, "hw:1,2"); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "hw:1,1");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_device), glist_device); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_device), "hw:1,2");
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_device)->entry), "/dev/dsp"); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_device))),"/dev/dsp");
/* End Audio Options Widgets */ /* End Audio Options Widgets */
@ -423,12 +425,10 @@ int main( int argc, char *argv[], char *envp[]) {
label_public = gtk_label_new ( gettext("Public: ")); label_public = gtk_label_new ( gettext("Public: "));
combo_public = gtk_combo_new (); combo_public = gtk_combo_box_text_new_with_entry ();
glist_public = NULL; gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_public), "yes");
glist_public = g_list_append (glist_public, gettext("yes")); gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT (combo_public), "no");
glist_public = g_list_append (glist_public, gettext("no")); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_public))),"no");
gtk_combo_set_popdown_strings (GTK_COMBO (combo_public), glist_public);
/* text view stuff */ /* text view stuff */
tag = gtk_text_tag_new (""); tag = gtk_text_tag_new ("");
@ -457,32 +457,23 @@ int main( int argc, char *argv[], char *envp[]) {
g_signal_connect (G_OBJECT (window), "delete_event",G_CALLBACK (main_quit), NULL); g_signal_connect (G_OBJECT (window), "delete_event",G_CALLBACK (main_quit), NULL);
g_signal_connect_swapped (G_OBJECT (dialog_about), "delete_event",G_CALLBACK (gtk_widget_hide), dialog_about); g_signal_connect_swapped (G_OBJECT (dialog_about), "response",G_CALLBACK (gtk_widget_hide), dialog_about);
g_signal_connect_swapped (G_OBJECT (button_about), "clicked",G_CALLBACK (gtk_widget_hide), dialog_about);
g_signal_connect (G_OBJECT (button_start), "clicked", G_CALLBACK (dark_start), NULL); g_signal_connect (G_OBJECT (button_start), "clicked", G_CALLBACK (dark_start), NULL);
g_signal_connect (G_OBJECT (button_stop), "clicked", G_CALLBACK (dark_stop), NULL); g_signal_connect (G_OBJECT (button_stop), "clicked", G_CALLBACK (dark_stop), NULL);
g_signal_connect (G_OBJECT (button_detail), "clicked", G_CALLBACK (dark_detail), NULL); g_signal_connect (G_OBJECT (button_detail), "clicked", G_CALLBACK (dark_detail), NULL);
g_signal_connect_swapped (G_OBJECT (menu_item_open), "activate", G_CALLBACK (gtk_widget_show), file_open); g_signal_connect_swapped (G_OBJECT (menu_item_open), "activate", G_CALLBACK (gtk_dialog_run), file_open);
g_signal_connect_swapped (G_OBJECT (menu_item_save), "activate", G_CALLBACK (gtk_widget_show), file_save); g_signal_connect_swapped (G_OBJECT (menu_item_save), "activate", G_CALLBACK (gtk_dialog_run), file_save);
g_signal_connect (G_OBJECT (menu_item_quit), "activate", G_CALLBACK (main_quit), NULL); g_signal_connect (G_OBJECT (menu_item_quit), "activate", G_CALLBACK (main_quit), NULL);
g_signal_connect (G_OBJECT (menu_item_quit_nd), "activate", G_CALLBACK (delete_event_nd), NULL); g_signal_connect (G_OBJECT (menu_item_quit_nd), "activate", G_CALLBACK (delete_event_nd), NULL);
g_signal_connect (G_OBJECT (menu_item_about), "activate", G_CALLBACK (dark_about), NULL); g_signal_connect_swapped (G_OBJECT (menu_item_about), "activate", G_CALLBACK (gtk_dialog_run), dialog_about);
g_signal_connect_swapped (G_OBJECT (button_localdump), "clicked", G_CALLBACK (gtk_dialog_run), file_localdump);
g_signal_connect_swapped (G_OBJECT (button_localdump), "clicked", G_CALLBACK (gtk_widget_show), file_localdump);
g_signal_connect ( G_OBJECT (GTK_FILE_SELECTION (file_open)->ok_button), "clicked", G_CALLBACK (dark_put_in_box), NULL); g_signal_connect ( G_OBJECT (GTK_FILE_CHOOSER_DIALOG (file_open)), "response", G_CALLBACK (dark_put_in_box), NULL);
g_signal_connect_swapped ( G_OBJECT (GTK_FILE_SELECTION (file_open)->cancel_button), "clicked", G_CALLBACK (gtk_widget_hide), file_open); g_signal_connect ( G_OBJECT (GTK_FILE_CHOOSER_DIALOG (file_save)), "response", G_CALLBACK (dark_write_config), NULL);
g_signal_connect_swapped ( G_OBJECT (file_open), "delete_event", G_CALLBACK (gtk_widget_hide), file_open); g_signal_connect ( G_OBJECT (GTK_FILE_CHOOSER_DIALOG (file_localdump)), "response", G_CALLBACK (dark_localdump), NULL);
g_signal_connect ( G_OBJECT (GTK_FILE_SELECTION (file_save)->ok_button), "clicked", G_CALLBACK (dark_write_config), NULL);
g_signal_connect_swapped ( G_OBJECT (GTK_FILE_SELECTION (file_save)->cancel_button), "clicked", G_CALLBACK (gtk_widget_hide), file_save);
g_signal_connect_swapped ( G_OBJECT (file_save), "delete_event", G_CALLBACK (gtk_widget_hide), file_save);
g_signal_connect ( G_OBJECT (GTK_FILE_SELECTION (file_localdump)->ok_button), "clicked", G_CALLBACK (dark_localdump), NULL);
g_signal_connect_swapped ( G_OBJECT (GTK_FILE_SELECTION (file_localdump)->cancel_button), "clicked", G_CALLBACK (gtk_widget_hide), file_localdump);
g_signal_connect_swapped ( G_OBJECT (file_localdump), "delete_event", G_CALLBACK (gtk_widget_hide), file_localdump);
/* pack the notebook, the buttons and textview widgets into the main table */ /* pack the notebook, the buttons and textview widgets into the main table */
gtk_table_attach (GTK_TABLE (table), notebook, 0, SIZE_X, 0, 400, (GTK_FILL | GTK_SHRINK | GTK_EXPAND), (GTK_FILL | GTK_SHRINK), 5, 5); gtk_table_attach (GTK_TABLE (table), notebook, 0, SIZE_X, 0, 400, (GTK_FILL | GTK_SHRINK | GTK_EXPAND), (GTK_FILL | GTK_SHRINK), 5, 5);
@ -578,8 +569,6 @@ int main( int argc, char *argv[], char *envp[]) {
gtk_widget_show (button_detail); gtk_widget_show (button_detail);
gtk_widget_show (label_status); gtk_widget_show (label_status);
gtk_widget_show (label_about);
gtk_widget_show (button_about);
gtk_widget_show (label_icecast); gtk_widget_show (label_icecast);
gtk_widget_show (combo_icecast); gtk_widget_show (combo_icecast);

17
darkice-gui/trunk/global.h
View File

@ -49,8 +49,6 @@ GtkWidget *table;
/* About Dialog box */ /* About Dialog box */
GtkWidget *dialog_about; GtkWidget *dialog_about;
GtkWidget *label_about;
GtkWidget *button_about;
/* darkice not found dialog box */ /* darkice not found dialog box */
GtkWidget *dialog_darkdep; GtkWidget *dialog_darkdep;
@ -120,41 +118,28 @@ GtkWidget *entry_genre;
/* darksnow configuration stuff - label + combo box */ /* darksnow configuration stuff - label + combo box */
GtkWidget *label_icecast; GtkWidget *label_icecast;
GtkWidget *combo_icecast; GtkWidget *combo_icecast;
GList *glist_icecast;
GtkWidget *label_format; GtkWidget *label_format;
GtkWidget *combo_format; GtkWidget *combo_format;
GList *glist_format;
GtkWidget *label_bitrate; GtkWidget *label_bitrate;
GtkWidget *combo_bitrate; GtkWidget *combo_bitrate;
GList *glist_bitrate;
GtkWidget *label_bitratemode; GtkWidget *label_bitratemode;
GtkWidget *combo_bitratemode; GtkWidget *combo_bitratemode;
GList *glist_bitratemode;
GtkWidget *label_samplerate; GtkWidget *label_samplerate;
GtkWidget *combo_samplerate; GtkWidget *combo_samplerate;
GList *glist_samplerate;
GtkWidget *label_quality; GtkWidget *label_quality;
GtkWidget *combo_quality; GtkWidget *combo_quality;
GList *glist_quality;
GtkWidget *label_bitspersample; GtkWidget *label_bitspersample;
GtkWidget *combo_bitspersample; GtkWidget *combo_bitspersample;
GList *glist_bitspersample;
GtkWidget *label_channel; GtkWidget *label_channel;
GtkWidget *combo_channel; GtkWidget *combo_channel;
GList *glist_channel;
GtkWidget *label_buffersize; GtkWidget *label_buffersize;
GtkWidget *combo_buffersize; GtkWidget *combo_buffersize;
GList *glist_buffersize;
GtkWidget *label_device; GtkWidget *label_device;
GtkWidget *combo_device; GtkWidget *combo_device;
GList *glist_device;
GtkWidget *label_public; GtkWidget *label_public;
GtkWidget *combo_public; GtkWidget *combo_public;
GList *glist_public;
GtkWidget *label_verbosity; GtkWidget *label_verbosity;
GtkWidget *combo_verbosity; GtkWidget *combo_verbosity;
GList *glist_verbosity;
/* text view stuff */ /* text view stuff */
GtkWidget *text; GtkWidget *text;
@ -166,4 +151,4 @@ GtkTextTag *tag;
GtkWidget *scroll_text; GtkWidget *scroll_text;
/* The GTK ToolTips */ /* The GTK ToolTips */
GtkTooltips *tooltip; GtkTooltip *tooltip;

72
darkice-gui/trunk/interface.c
View File

@ -69,7 +69,7 @@ void dark_start( GtkWidget *widget, gpointer data) {
/* call the function that translate the darksnow config file to the darkice config file */ /* call the function that translate the darksnow config file to the darkice config file */
darksnow2darkice_cfg(); darksnow2darkice_cfg();
darkice_verbosity = (char *) gtk_entry_get_text ( GTK_ENTRY(GTK_COMBO(combo_verbosity)->entry)); darkice_verbosity = gtk_combo_box_text_get_active_text ( GTK_COMBO_BOX_TEXT(combo_verbosity));
strcpy(command,"darkice"); strcpy(command,"darkice");
strcat(command," -v "); strcat(command," -v ");
@ -115,7 +115,7 @@ void dark_stop( GtkWidget *widget, gpointer data ){
} }
void dark_put_in_box ( GtkWidget *widget, gpointer data ) { void dark_put_in_box ( GtkWidget *widget, gint response_id, gpointer data ) {
FILE *f_darksnow_cfg; FILE *f_darksnow_cfg;
char *darksnow_path; char *darksnow_path;
char foo[256] = {0}; char foo[256] = {0};
@ -144,7 +144,12 @@ void dark_put_in_box ( GtkWidget *widget, gpointer data ) {
char verbosity[8] = {0}; char verbosity[8] = {0};
DIR *directory; DIR *directory;
darksnow_path = (char *) gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_open)); if (response_id != GTK_RESPONSE_ACCEPT) {
gtk_widget_hide(file_open);
return ;
}
darksnow_path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_open));
if ( (directory = opendir(darksnow_path))) { if ( (directory = opendir(darksnow_path))) {
printf("Error: %s is a directory\n", darksnow_path); printf("Error: %s is a directory\n", darksnow_path);
@ -156,7 +161,7 @@ void dark_put_in_box ( GtkWidget *widget, gpointer data ) {
printf("Error: Cannot open %s\n", darksnow_path); printf("Error: Cannot open %s\n", darksnow_path);
return; return;
} }
fscanf(f_darksnow_cfg, "%[^=]=%[^\n]\n", foo, server); fscanf(f_darksnow_cfg, "%[^=]=%[^\n]\n", foo, server);
fscanf(f_darksnow_cfg, "%[^=]=%[^\n]\n", foo, port); fscanf(f_darksnow_cfg, "%[^=]=%[^\n]\n", foo, port);
fscanf(f_darksnow_cfg, "%[^=]=%[^\n]\n", foo, mountpoint); fscanf(f_darksnow_cfg, "%[^=]=%[^\n]\n", foo, mountpoint);
@ -192,23 +197,19 @@ void dark_put_in_box ( GtkWidget *widget, gpointer data ) {
gtk_entry_set_text ( (GtkEntry *) entry_server, server); gtk_entry_set_text ( (GtkEntry *) entry_server, server);
gtk_entry_set_text ( (GtkEntry *) entry_remotedump, remotedump); gtk_entry_set_text ( (GtkEntry *) entry_remotedump, remotedump);
gtk_entry_set_text ( (GtkEntry *) entry_localdump, localdump); gtk_entry_set_text ( (GtkEntry *) entry_localdump, localdump);
if (strcmp(icecast, "Icecast 1") == 0) gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_icecast))), icecast);
gtk_combo_box_set_active ( GTK_COMBO_BOX(combo_icecast), 0); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_format))), format);
if (strcmp(icecast, "Icecast 2") == 0) gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_bitrate))), bitrate);
gtk_combo_box_set_active ( GTK_COMBO_BOX(combo_icecast), 1); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_bitratemode))), bitratemode);
if (strcmp(icecast, "Shoutcast") == 0) gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_samplerate))), samplerate);
gtk_combo_box_set_active ( GTK_COMBO_BOX(combo_icecast), 2); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_quality))), quality);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_format)->entry), format); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_bitspersample))), bitspersample);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_bitrate)->entry), bitrate); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_channel))), channel);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_bitratemode)->entry), bitratemode); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_buffersize))), buffersize);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_samplerate)->entry), samplerate); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_device))), device);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_quality)->entry), quality); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_public))), public);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_bitspersample)->entry), bitspersample); gtk_entry_set_text ( GTK_ENTRY(gtk_bin_get_child (GTK_BIN (combo_verbosity))),verbosity);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_channel)->entry), channel);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_buffersize)->entry), buffersize);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_device)->entry), device);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_public)->entry), public);
gtk_entry_set_text ( GTK_ENTRY(GTK_COMBO(combo_verbosity)->entry), verbosity);
if (adddate == '1') if (adddate == '1')
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON (checkbutton_adddate), TRUE); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON (checkbutton_adddate), TRUE);
@ -221,23 +222,30 @@ void dark_put_in_box ( GtkWidget *widget, gpointer data ) {
} }
void dark_write_config ( GtkWidget *widget, gpointer data ) { void dark_write_config ( GtkWidget *widget, gint response_id, gpointer data ) {
char *darksnow_path; char *darksnow_path;
darksnow_path = (char *) gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_save)); if (response_id != GTK_RESPONSE_ACCEPT) {
gtk_widget_hide(file_save);
return ;
}
darksnow_path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_save));
if (darksnow_config_store (0, darksnow_path)) if (darksnow_config_store (0, darksnow_path))
gtk_widget_hide(file_save); gtk_widget_hide(file_save);
} }
void dark_about ( GtkWidget *widget, gpointer data ) {
gtk_widget_show (dialog_about);
}
void dark_localdump (GtkWidget *widget, gpointer data){ void dark_localdump (GtkWidget *widget, gint response_id, gpointer data){
gtk_entry_set_text ( (GtkEntry *) entry_localdump, (char *) gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_localdump)) ); if (response_id != GTK_RESPONSE_ACCEPT) {
gtk_widget_hide(file_localdump);
return ;
}
gtk_entry_set_text ( (GtkEntry *) entry_localdump, gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_localdump)));
gtk_widget_hide (file_localdump); gtk_widget_hide (file_localdump);
} }
@ -368,10 +376,10 @@ void darkice_not_found() {
label_darkdep = gtk_label_new ( bar ); label_darkdep = gtk_label_new ( bar );
button_darkdep = gtk_button_new_with_label ( gettext("Close")); button_darkdep = gtk_button_new_with_label ( gettext("Close"));
gtk_window_set_title(GTK_WINDOW (dialog_darkdep), gettext("Error")); gtk_window_set_title(GTK_WINDOW (dialog_darkdep), gettext("Error"));
gtk_widget_set_size_request (GTK_WIDGET (dialog_darkdep), 350, 200);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_darkdep)->action_area), button_darkdep, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area( GTK_DIALOG (dialog_darkdep))), button_darkdep, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog_darkdep)->vbox), label_darkdep, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area( GTK_DIALOG (dialog_darkdep))), label_darkdep, TRUE, TRUE, 0);
g_signal_connect (G_OBJECT (dialog_darkdep), "delete_event",G_CALLBACK (delete_event), NULL); g_signal_connect (G_OBJECT (dialog_darkdep), "delete_event",G_CALLBACK (delete_event), NULL);
g_signal_connect (G_OBJECT (button_darkdep), "clicked",G_CALLBACK (delete_event), NULL); g_signal_connect (G_OBJECT (button_darkdep), "clicked",G_CALLBACK (delete_event), NULL);

9
darkice-gui/trunk/interface.h
View File

@ -34,16 +34,13 @@ void dark_stop (GtkWidget *widget, gpointer data);
void dark_load (GtkWidget *widget, gpointer data); void dark_load (GtkWidget *widget, gpointer data);
/* Callback for OK button of the "Open File" file selector, displayed by dark_open */ /* Callback for OK button of the "Open File" file selector, displayed by dark_open */
void dark_put_in_box (GtkWidget *widget, gpointer data); void dark_put_in_box (GtkWidget *widget, gint response_id, gpointer data);
/* Callback for OK button of the "Save File" file selector, displayed by dark_save */ /* Callback for OK button of the "Save File" file selector, displayed by dark_save */
void dark_write_config ( GtkWidget *widget, gpointer data ); void dark_write_config ( GtkWidget *widget, gint response_id, gpointer data );
/* Callback for About Menu Option */
void dark_about (GtkWidget *widget, gpointer data);
/* Callback for the local dump file selector 'ok' button */ /* Callback for the local dump file selector 'ok' button */
void dark_localdump (GtkWidget *widget, gpointer data); void dark_localdump (GtkWidget *widget, gint response_id, gpointer data);
/* Cleans the buffer inside the view box */ /* Cleans the buffer inside the view box */
void clean_text_view_memory(); void clean_text_view_memory();

32
darkice-gui/trunk/tooltips.c
View File

@ -36,30 +36,26 @@
#include <libintl.h> #include <libintl.h>
void set_all_tooltips(){ void set_all_tooltips(){
tooltip = gtk_tooltips_new ();
if (TOOLTIP) { if (TOOLTIP) {
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), entry_server, gettext("Field that indicates the name of the server.\nEg: orelha2.radiolivre.org"), ""); gtk_widget_set_tooltip_text ( entry_server, gettext("Field that indicates the name of the server.\nEg: orelha2.radiolivre.org"));
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), entry_port, gettext("Field that indicates the server port that you'll connect.\nEg: 8000"), ""); gtk_widget_set_tooltip_text ( entry_port, gettext("Field that indicates the server port that you'll connect.\nEg: 8000"));
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), entry_mountpoint, gettext("Field that indicates the mount point for the stream.\nEg: radio_x.ogg\n Remember to put a \".ogg\" at the end of the mountpoint if you want to use ogg/vorbis!"), ""); gtk_widget_set_tooltip_text ( entry_mountpoint, gettext("Field that indicates the mount point for the stream.\nEg: radio_x.ogg\n Remember to put a \".ogg\" at the end of the mountpoint if you want to use ogg/vorbis!"));
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), entry_pass, gettext("Field that indicates the password for the stream, provided by the server administrator."), ""); gtk_widget_set_tooltip_text ( entry_pass, gettext("Field that indicates the password for the stream, provided by the server administrator."));
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), entry_remotedump, gettext("Field that indicates the file \ gtk_widget_set_tooltip_text ( entry_remotedump, gettext("Field that indicates the file \
the IceCast server should dump the contents of this stream on its side (server side).\nEg: remote_file_name.mp3"), ""); the IceCast server should dump the contents of this stream on its side (server side).\nEg: remote_file_name.mp3"));
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), entry_localdump, gettext("Field that indicates the file where \ gtk_widget_set_tooltip_text ( entry_localdump, gettext("Field that indicates the file where \
the same data sent to the stream will be dumped.\nEg: local_file_name.mp3"), ""); the same data sent to the stream will be dumped.\nEg: local_file_name.mp3"));
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), checkbutton_adddate, gettext("If you want to automatically \ gtk_widget_set_tooltip_text ( checkbutton_adddate, gettext("If you want to automatically \
insert a date string in the localDumpFile name, check this option."), ""); insert a date string in the localDumpFile name, check this option."));
gtk_widget_set_tooltip_text ( combo_verbosity, gettext("Field that indicates the verbosity level of darkice.\nUse a value greater than 0 if you want more information in 'Details Window'."));
gtk_widget_set_tooltip_text ( combo_device, gettext("For OSS DSP audio \
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), (GTK_COMBO(combo_verbosity))->entry, gettext("Field that indicates the verbosity level of darkice.\nUse a value greater than 0 if you want more information in 'Details Window'."), "");
gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltip), (GTK_COMBO(combo_device))->entry, gettext("For OSS DSP audio \
device to record from, use /dev/dsp_ (eg. /dev/dsp), for ALSA, use hw:_,_ (eg. hw:0,0), and to create an \ device to record from, use /dev/dsp_ (eg. /dev/dsp), for ALSA, use hw:_,_ (eg. hw:0,0), and to create an \
unconnected input \ unconnected input \
port in jack, use 'jack', or use 'jack_auto' to automatically make Jack connect \ port in jack, use 'jack', or use 'jack_auto' to automatically make Jack connect \
to the first source. (if you choose jack you must set the samplerate to the same jack samplerate!)"), ""); to the first source. (if you choose jack you must set the samplerate to the same jack samplerate!)"));
} }
else /* if compiling without tooltip */
free (tooltip);
} }