Mercurial > audlegacy
changeset 1271:3f618ef7a892 trunk
[svn] - remove file_info_box code, it sucked.
| author | nenolod |
|---|---|
| date | Thu, 15 Jun 2006 23:02:11 -0700 |
| parents | feff5a622f06 |
| children | 11785f0bf967 |
| files | ChangeLog Plugins/Input/wma/wma.c |
| diffstat | 2 files changed, 13 insertions(+), 437 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 15 22:58:15 2006 -0700 +++ b/ChangeLog Thu Jun 15 23:02:11 2006 -0700 @@ -1,3 +1,13 @@ +2006-06-16 05:58:15 +0000 William Pitcock <nenolod@nenolod.net> + revision [1454] + - improvements + + + Changes: Modified: + +12 -2 trunk/audacious/playlist.c + +1 -1 trunk/audacious/ui_fileinfo.c + + 2006-06-16 05:23:39 +0000 William Pitcock <nenolod@nenolod.net> revision [1452] - hook up fileinfo box stuff
--- a/Plugins/Input/wma/wma.c Thu Jun 15 22:58:15 2006 -0700 +++ b/Plugins/Input/wma/wma.c Thu Jun 15 23:02:11 2006 -0700 @@ -57,9 +57,6 @@ #define PLUGIN_VERSION "v.1.0.5" #define ST_BUFF 1024 -static GtkWidget *dialog; -static GtkWidget *dialog1, *button1, *label1; - static int wma_decode = 0; static gboolean wma_pause = 0; static int wma_seekpos = -1; @@ -83,10 +80,11 @@ static int wma_get_time(void); static void wma_get_song_info(char *filename, char **title, int *length); static TitleInput *wma_get_song_tuple(char *filename); -static void wma_file_info_box(char *filename); static char *wsong_title; static int wsong_time; +static GtkWidget *dialog1, *button1, *label1; + InputPlugin *get_iplugin_info(void); InputPlugin wma_ip = @@ -113,7 +111,7 @@ NULL, // Fill in the stuff that is shown in the player window NULL, // Show some text in the song title box. Filled in by xmms wma_get_song_info, // Function to grab the title string - wma_file_info_box, // Bring up an info window for the filename passed in + NULL, // Bring up an info window for the filename passed in NULL, // Handle to the current output plugin. Filled in by xmms wma_get_song_tuple, // Tuple builder }; @@ -446,435 +444,3 @@ g_thread_join(wma_decode_thread); wma_ip.output->close_audio(); } - -static void wma_file_info_box (char *filename) -{ - GtkWidget *dialog_vbox1; - GtkWidget *vbox1; - GtkWidget *hbox1; - GtkWidget *label_name; - GtkWidget *entry_filename; - GtkWidget *hbox2; - GtkWidget *frame_wma_info; - GtkWidget *alignment1; - GtkWidget *table1; - GtkWidget *label_album; - GtkWidget *label_year; - GtkWidget *label_track; - GtkWidget *label_genre; - GtkWidget *label_comments; - GtkWidget *label_wma_version; - GtkWidget *label_bitrate; - GtkWidget *label_rate; - GtkWidget *label_chans; - GtkWidget *label_play_time; - GtkWidget *label_filesize; - GtkWidget *label_wma_vers_val; - GtkWidget *label_bitrate_val; - GtkWidget *label_rate_val; - GtkWidget *label_chans_val; - GtkWidget *label_playtime_val; - GtkWidget *label_filesize_val; - GtkWidget *label4; - GtkWidget *frame_tags; - GtkWidget *alignment2; - GtkWidget *table2; - GtkWidget *label_artist; - GtkWidget *label_title; - GtkWidget *entry_artist; - GtkWidget *entry_album; - GtkWidget *entry_year; - GtkWidget *entry_title; - GtkWidget *entry_track; - GtkWidget *entry_genre; - GtkWidget *entry_comments; - GtkWidget *label5; - GtkWidget *dialog_action_area1; - GtkWidget *okbutton; - - AVFormatContext *in = NULL; - AVCodecContext *s = NULL; - AVCodec *codec; - gint tns, thh, tmm, tss; - gint i; - gchar *title, - *channels, - *bitrate, - *playtime, - *samplerate, - *filesize; - VFSFile *f; - if (dialog) { - (void)printf(_("Info dialog is already opened!\n")); - return; - } - - if(av_open_input_file(&in, filename, NULL, 0, NULL) < 0) - return; - - for(i = 0; i < in->nb_streams; i++) { - s = &in->streams[i]->codec; - if(s->codec_type == CODEC_TYPE_AUDIO) - break; - } - - av_find_stream_info(in); - codec = avcodec_find_decoder(s->codec_id); - - /* window title */ - title = g_strdup_printf(_("File Info - %s"), g_basename(filename)); - /* channels */ - if (s->channels == 1) - channels = g_strdup("MONO"); - else - channels = g_strdup("STEREO"); - - /* bitrate */ - bitrate = g_strdup_printf(_("%d Kb/s"), (s->bit_rate / 1000)); - - /* playtime */ - if (in->duration != 0) { - tns = in->duration/1000000LL; - thh = tns/3600; - tmm = (tns%3600)/60; - tss = (tns%60); - playtime = g_strdup_printf(_("%02d:%02d:%02d"), thh, tmm, tss); - } else - playtime = g_strdup("N/A"); - - /* samplerate */ - samplerate = g_strdup_printf(_("%d Hz"), s->sample_rate); - - /* filesize */ - f = vfs_fopen(filename, "rb"); - - if (f == NULL) - return; - - vfs_fseek(f, 0, SEEK_END); - filesize = g_strdup_printf(_("%lu Bytes"), vfs_ftell(f)); - vfs_fclose(f); - - dialog = gtk_dialog_new(); - - g_signal_connect(G_OBJECT(dialog), "destroy", - G_CALLBACK(gtk_widget_destroyed), &dialog); - - gtk_window_set_title(GTK_WINDOW(dialog), title); - gtk_window_set_type_hint(GTK_WINDOW(dialog), GDK_WINDOW_TYPE_HINT_DIALOG); - gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, FALSE); - - dialog_vbox1 = GTK_DIALOG(dialog)->vbox; - gtk_widget_show(dialog_vbox1); - - vbox1 = gtk_vbox_new(FALSE, 0); - gtk_widget_show(vbox1); - gtk_box_pack_start(GTK_BOX(dialog_vbox1), vbox1, TRUE, TRUE, 0); - - hbox1 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox1); - gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 0); - - label_name = gtk_label_new(_("<b>Name:</b>")); - gtk_widget_show(label_name); - gtk_box_pack_start(GTK_BOX (hbox1), label_name, FALSE, FALSE, 0); - gtk_misc_set_alignment(GTK_MISC (label_name), 0.48, 0.51); - gtk_misc_set_padding(GTK_MISC (label_name), 10, 10); - gtk_label_set_use_markup(GTK_LABEL(label_name), TRUE); - - entry_filename = gtk_entry_new(); - gtk_widget_show(entry_filename); - gtk_box_pack_start(GTK_BOX(hbox1), entry_filename, TRUE, TRUE, 4); - gtk_editable_set_editable(GTK_EDITABLE(entry_filename), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_filename), filename); - - hbox2 = gtk_hbox_new(FALSE, 0); - gtk_widget_show(hbox2); - gtk_box_pack_start(GTK_BOX(vbox1), hbox2, TRUE, TRUE, 0); - - frame_wma_info = gtk_frame_new(NULL); - gtk_widget_show(frame_wma_info); - gtk_box_pack_start(GTK_BOX(hbox2), frame_wma_info, TRUE, TRUE, 0); - gtk_frame_set_shadow_type(GTK_FRAME (frame_wma_info), GTK_SHADOW_ETCHED_IN); - gtk_container_set_border_width (GTK_CONTAINER(frame_wma_info), 10); - - alignment1 = gtk_alignment_new(0.5, 0.5, 1, 1); - gtk_widget_show(alignment1); - gtk_container_add(GTK_CONTAINER(frame_wma_info), alignment1); - gtk_alignment_set_padding(GTK_ALIGNMENT(alignment1), 0, 0, 0, 0); - gtk_container_set_border_width(GTK_CONTAINER(alignment1), 2); - - table1 = gtk_table_new(6, 2, FALSE); - gtk_widget_show(table1); - gtk_container_add(GTK_CONTAINER(alignment1), table1); - gtk_container_set_border_width(GTK_CONTAINER(table1), 6); - gtk_table_set_row_spacings(GTK_TABLE(table1), 3); - gtk_table_set_col_spacings(GTK_TABLE(table1), 8); - /* WMA Version label */ - label_wma_version = gtk_label_new(_("<b>WMA Version:</b>")); - gtk_widget_show(label_wma_version); - gtk_table_attach(GTK_TABLE(table1), label_wma_version, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_wma_version), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_wma_version), TRUE); - - /* Bitrate */ - label_bitrate = gtk_label_new(_("<b>Bitrate:</b>")); - gtk_widget_show(label_bitrate); - gtk_table_attach(GTK_TABLE(table1), label_bitrate, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_bitrate), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_bitrate), TRUE); - - /* Samplerate */ - label_rate = gtk_label_new(_("<b>Samplerate:</b>")); - gtk_widget_show(label_rate); - gtk_table_attach(GTK_TABLE(table1), label_rate, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_rate), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_rate), TRUE); - - /* Channels */ - label_chans = gtk_label_new(_("<b>Channels:</b>")); - gtk_widget_show(label_chans); - gtk_table_attach(GTK_TABLE (table1), label_chans, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_chans), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_chans), TRUE); - - /* Play time */ - label_play_time = gtk_label_new(_("<b>Play time:</b>")); - gtk_widget_show(label_play_time); - gtk_table_attach(GTK_TABLE (table1), label_play_time, 0, 1, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_play_time), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_play_time), TRUE); - - /* Filesize */ - label_filesize = gtk_label_new(_("<b>Filesize:</b>")); - gtk_widget_show(label_filesize); - gtk_table_attach(GTK_TABLE(table1), label_filesize, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_filesize), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_filesize), TRUE); - - - label_wma_vers_val = gtk_label_new(codec->name); - gtk_widget_show(label_wma_vers_val); - gtk_table_attach(GTK_TABLE(table1), label_wma_vers_val, 1, 2, 0, 1, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_wma_vers_val), 0, 0.5); - - label_bitrate_val = gtk_label_new(bitrate); - gtk_widget_show(label_bitrate_val); - gtk_table_attach(GTK_TABLE(table1), label_bitrate_val, 1, 2, 1, 2, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_bitrate_val), 0, 0.5); - - label_rate_val = gtk_label_new(samplerate); - gtk_widget_show(label_rate_val); - gtk_table_attach(GTK_TABLE(table1), label_rate_val, 1, 2, 2, 3, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_rate_val), 0, 0.5); - - label_chans_val = gtk_label_new(channels); - gtk_widget_show(label_chans_val); - gtk_table_attach(GTK_TABLE(table1), label_chans_val, 1, 2, 3, 4, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC (label_chans_val), 0, 0.5); - - label_playtime_val = gtk_label_new(playtime); - gtk_widget_show(label_playtime_val); - gtk_table_attach(GTK_TABLE(table1), label_playtime_val, 1, 2, 4, 5, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_playtime_val), 0, 0.5); - - label_filesize_val = gtk_label_new(filesize); - gtk_widget_show(label_filesize_val); - gtk_table_attach(GTK_TABLE (table1), label_filesize_val, 1, 2, 5, 6, - (GtkAttachOptions)(GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_filesize_val), 0, 0.5); - - label4 = gtk_label_new (_("WMA Info")); - gtk_widget_show(label4); - gtk_frame_set_label_widget(GTK_FRAME(frame_wma_info), label4); - frame_tags = gtk_frame_new (NULL); - gtk_widget_show (frame_tags); - gtk_box_pack_start (GTK_BOX (hbox2), frame_tags, TRUE, TRUE, 0); - gtk_frame_set_shadow_type (GTK_FRAME (frame_tags), GTK_SHADOW_ETCHED_IN); - gtk_container_set_border_width (GTK_CONTAINER (frame_tags), 10); - - - alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment2); - gtk_container_add (GTK_CONTAINER (frame_tags), alignment2); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment2), 0, 0, 12, 0); - gtk_container_set_border_width (GTK_CONTAINER (alignment2), 2); - - - table2 = gtk_table_new(8, 2, FALSE); - gtk_widget_show(table2); - gtk_container_add(GTK_CONTAINER(alignment2), table2); - gtk_container_set_border_width(GTK_CONTAINER(table2), 6); - gtk_table_set_row_spacings(GTK_TABLE(table2), 3); - gtk_table_set_col_spacings(GTK_TABLE(table2), 8); - - /* Artist */ - label_artist = gtk_label_new(_("<b>Artist:</b>")); - gtk_widget_show(label_artist); - gtk_table_attach(GTK_TABLE (table2), label_artist, 0, 1, 0, 1, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_artist), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_artist), TRUE); - - /* Title */ - label_title = gtk_label_new(_("<b>Title:</b>")); - gtk_widget_show(label_title); - gtk_table_attach(GTK_TABLE (table2), label_title, 0, 1, 1, 2, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_title), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_title), TRUE); - - /* Album */ - label_album = gtk_label_new(_("<b>Album:</b>")); - gtk_widget_show(label_album); - gtk_table_attach(GTK_TABLE (table2), label_album, 0, 1, 2, 3, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_album), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_album), TRUE); - - /* Comments */ - label_comments = gtk_label_new(_("<b>Comments:</b>")); - gtk_widget_show(label_comments); - gtk_table_attach(GTK_TABLE(table2), label_comments, 0, 1, 3, 4, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_comments), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_comments), TRUE); - - /* Year */ - label_year = gtk_label_new(_("<b>Year:</b>")); - gtk_widget_show(label_year); - gtk_table_attach(GTK_TABLE (table2), label_year, 0, 1, 4, 5, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_year), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_year), TRUE); - - /* Track */ - label_track = gtk_label_new(_("<b>Track:</b>")); - gtk_widget_show(label_track); - gtk_table_attach(GTK_TABLE (table2), label_track, 0, 1, 5, 6, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC(label_track), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_track), TRUE); - - /* Genre */ - label_genre = gtk_label_new(_("<b>Genre:</b>")); - gtk_widget_show(label_genre); - gtk_table_attach(GTK_TABLE (table2), label_genre, 0, 1, 6, 7, - (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment(GTK_MISC (label_genre), 0, 0.5); - gtk_label_set_use_markup(GTK_LABEL(label_genre), TRUE); - - - entry_artist = gtk_entry_new(); - gtk_widget_show (entry_artist); - gtk_table_attach (GTK_TABLE (table2), entry_artist, 1, 2, 0, 1, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable (GTK_EDITABLE (entry_artist), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_artist), in->author); - - entry_title = gtk_entry_new(); - gtk_widget_show(entry_title); - gtk_table_attach (GTK_TABLE (table2), entry_title, 1, 2, 1, 2, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable(GTK_EDITABLE (entry_title), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_title), in->title); - - entry_album = gtk_entry_new(); - gtk_widget_show(entry_album); - gtk_table_attach(GTK_TABLE (table2), entry_album, 1, 2, 2, 3, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable(GTK_EDITABLE (entry_album), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_album), in->album); - - entry_comments = gtk_entry_new(); - gtk_widget_show(entry_comments); - gtk_table_attach(GTK_TABLE (table2), entry_comments, 1, 2, 3, 4, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable(GTK_EDITABLE (entry_comments), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_comments), in->comment); - - entry_year = gtk_entry_new(); - gtk_widget_show(entry_year); - gtk_table_attach(GTK_TABLE (table2), entry_year, 1, 2, 4, 5, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable(GTK_EDITABLE (entry_year), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_year), g_strdup_printf("%d", in->year)); - - entry_track = gtk_entry_new(); - gtk_widget_show(entry_track); - gtk_table_attach(GTK_TABLE (table2), entry_track, 1, 2, 5, 6, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable(GTK_EDITABLE (entry_track), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_track), g_strdup_printf("%d", in->track)); - - entry_genre = gtk_entry_new(); - gtk_widget_show(entry_genre); - gtk_table_attach(GTK_TABLE (table2), entry_genre, 1, 2, 6, 7, - (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), - (GtkAttachOptions) (0), 0, 0); - gtk_editable_set_editable(GTK_EDITABLE (entry_genre), FALSE); - gtk_entry_set_text(GTK_ENTRY(entry_genre), in->genre); - - - label5 = gtk_label_new(_("Tags")); - gtk_widget_show(label5); - gtk_frame_set_label_widget(GTK_FRAME(frame_tags), label5); - - - dialog_action_area1 = GTK_DIALOG(dialog)->action_area; - gtk_widget_show(dialog_action_area1); - gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), GTK_BUTTONBOX_END); - - okbutton = gtk_button_new_from_stock("gtk-ok"); - gtk_widget_show(okbutton); - gtk_dialog_add_action_widget(GTK_DIALOG(dialog), okbutton, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS(okbutton, GTK_CAN_DEFAULT); - - g_signal_connect_swapped(G_OBJECT(okbutton), "clicked", - G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(dialog)); - - gtk_widget_show(dialog); - - g_free(title); - g_free(channels); - g_free(bitrate); - g_free(playtime); - g_free(samplerate); - g_free(filesize); -}