From d3092d40dec49c23fe848ba3331357a6d7e40bf9 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Thu, 29 Aug 2002 08:13:58 +0000 Subject: [PATCH] minor formatting --- src/plugin_common/id3v1.h | 2 +- src/plugin_xmms/configure.c | 33 ++++++++++++++++----------------- src/plugin_xmms/fileinfo.c | 6 +++--- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/plugin_common/id3v1.h b/src/plugin_common/id3v1.h index d2fa0a9d..e74e677e 100644 --- a/src/plugin_common/id3v1.h +++ b/src/plugin_common/id3v1.h @@ -45,7 +45,7 @@ typedef struct { FLAC__bool FLAC_plugin__id3v1_tag_get(const char *filename, FLAC_Plugin__Id3v1_Tag *tag); -#define ID3_INVALID_GENRE 255 +#define FLAC_PLUGIN__ID3V1_TAG_INVALID_GENRE 255 const char *FLAC_plugin__id3v1_tag_get_genre_as_string(unsigned char genre_code); unsigned FLAC_plugin__id3v1_tag_genre_table_max(); diff --git a/src/plugin_xmms/configure.c b/src/plugin_xmms/configure.c index 7c229107..35438940 100644 --- a/src/plugin_xmms/configure.c +++ b/src/plugin_xmms/configure.c @@ -33,7 +33,7 @@ #include #include -#include "mylocale.h" +#include "plugin_common/locale_hack.h" #include "charset.h" #include "configure.h" @@ -68,7 +68,7 @@ static void flac_configurewin_ok(GtkWidget * widget, gpointer data) (void)widget, (void)data; /* unused arguments */ g_free(flac_cfg.tag_format); - flac_cfg.tag_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(title_tag_entry))); + flac_cfg.tag_format = g_strdup(gtk_entry_get_text(GTK_ENTRY(title_tag_entry))); flac_cfg.file_char_set = Charset_Get_Name_From_Title(gtk_entry_get_text_1(fileCharacterSetEntry)); flac_cfg.user_char_set = Charset_Get_Name_From_Title(gtk_entry_get_text_1(userCharacterSetEntry)); @@ -150,7 +150,7 @@ void FLAC_XMMS__configure(void) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(convert_char_set), flac_cfg.convert_char_set); gtk_signal_connect(GTK_OBJECT(convert_char_set), "clicked", convert_char_set_cb, NULL); gtk_box_pack_start(GTK_BOX(title_tag_vbox), convert_char_set, FALSE, FALSE, 0); - // Combo boxes... + /* Combo boxes... */ hbox = gtk_hbox_new(FALSE,4); gtk_container_add(GTK_CONTAINER(title_tag_vbox),hbox); label = gtk_label_new(_("Convert character set from :")); @@ -183,13 +183,13 @@ void FLAC_XMMS__configure(void) gtk_signal_connect(GTK_OBJECT(title_tag_override), "clicked", title_tag_override_cb, NULL); gtk_box_pack_start(GTK_BOX(title_tag_vbox), title_tag_override, FALSE, FALSE, 0); - title_tag_box = gtk_hbox_new(FALSE, 5); + title_tag_box = gtk_hbox_new(FALSE, 5); gtk_widget_set_sensitive(title_tag_box, flac_cfg.tag_override); gtk_box_pack_start(GTK_BOX(title_tag_vbox), title_tag_box, FALSE, FALSE, 0); - + title_tag_label = gtk_label_new(_("Title format:")); gtk_box_pack_start(GTK_BOX(title_tag_box), title_tag_label, FALSE, FALSE, 0); - + title_tag_entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(title_tag_entry), flac_cfg.tag_format); gtk_box_pack_start(GTK_BOX(title_tag_box), title_tag_entry, TRUE, TRUE, 0); @@ -248,15 +248,14 @@ void FLAC_XMMS__aboutbox() */ static gchar *gtk_entry_get_text_1 (GtkWidget *widget) { - if (GTK_IS_COMBO(widget)) - { - return gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry)); - }else if (GTK_IS_ENTRY(widget)) - { - return gtk_entry_get_text(GTK_ENTRY(widget)); - }else - { - return NULL; - } + if (GTK_IS_COMBO(widget)) + { + return gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(widget)->entry)); + }else if (GTK_IS_ENTRY(widget)) + { + return gtk_entry_get_text(GTK_ENTRY(widget)); + }else + { + return NULL; + } } - diff --git a/src/plugin_xmms/fileinfo.c b/src/plugin_xmms/fileinfo.c index 99820922..83e83798 100644 --- a/src/plugin_xmms/fileinfo.c +++ b/src/plugin_xmms/fileinfo.c @@ -118,7 +118,7 @@ void FLAC_XMMS__file_info_box(char *filename) GtkWidget *flac_frame, *flac_box; GtkWidget *label, *filename_hbox; GtkWidget *bbox, *save, *remove_id3, *cancel; - + window = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE); gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &window); @@ -135,10 +135,10 @@ void FLAC_XMMS__file_info_box(char *filename) filename_entry = gtk_entry_new(); gtk_editable_set_editable(GTK_EDITABLE(filename_entry), FALSE); gtk_box_pack_start(GTK_BOX(filename_hbox), filename_entry, TRUE, TRUE, 0); - + hbox = gtk_hbox_new(FALSE, 10); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); - + left_vbox = gtk_vbox_new(FALSE, 10); gtk_box_pack_start(GTK_BOX(hbox), left_vbox, FALSE, FALSE, 0);