changeset 458:154ca7ff713f trunk

[svn] Temporarily stop building the WMA plugin until it can be fixed.
author chainsaw
date Tue, 17 Jan 2006 17:26:38 -0800
parents d4e91d775520
children 03bbb5bc74c0
files Plugins/Input/Makefile.am Plugins/Input/wma/wma.c
diffstat 2 files changed, 412 insertions(+), 132 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/Makefile.am	Tue Jan 17 17:24:38 2006 -0800
+++ b/Plugins/Input/Makefile.am	Tue Jan 17 17:26:38 2006 -0800
@@ -1,2 +1,2 @@
-ALL_PLUGINS = mpg123 aac modplug vorbis tonegen cdaudio sid wav flac console wma timidity musepack sexypsf adplug
+ALL_PLUGINS = mpg123 aac modplug vorbis tonegen cdaudio sid wav flac console timidity musepack sexypsf adplug
 SUBDIRS = $(INPUT_PLUGINS)
--- a/Plugins/Input/wma/wma.c	Tue Jan 17 17:24:38 2006 -0800
+++ b/Plugins/Input/wma/wma.c	Tue Jan 17 17:26:38 2006 -0800
@@ -1,10 +1,12 @@
 /*
- *  Audacious WMA input support
+ *  Audacious WMA input plugin
  *  (C) 2005 Audacious development team
  *
  *  Based on:
  *  xmms-wma - WMA player for BMP
  *  Copyright (C) 2004,2005 McMCC <mcmcc@mail.ru>
+ *  bmp-wma - WMA player for BMP
+ *  Copyright (C) 2004 Roman Bogorodskiy <bogorodskiy@inbox.ru>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -20,9 +22,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#ifndef __XMMS_WMA_C__
-#define __XMMS_WMA_C__
-
 #include <stdlib.h>
 #include <math.h>
 #include <stdbool.h>
@@ -40,7 +39,8 @@
 #include "iir.h"
 
 #define ABOUT_TXT "Adapted for use in audacious by Tony Vroon (chainsaw@gentoo.org) from\n \
-the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru).\n \
+the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru)\n \
+and the BMP-WMA plugin which is Copyright (C) 2004 Roman Bogorodskiy <bogorodskiy@inbox.ru>.\n \
 This plugin based on source code " LIBAVCODEC_IDENT "\nby Fabrice Bellard from \
 http://ffmpeg.sourceforge.net.\n\n \
 This program is free software; you can redistribute it and/or modify \n \
@@ -55,11 +55,11 @@
 #define PLUGIN_VERSION "v.1.0.5"
 #define ST_BUFF 1024
 
+static GtkWidget *dialog;
 static GtkWidget *dialog1, *button1, *label1;
-static GtkWidget *dialog, *button, *label;
-static gboolean wma_decode = 0;
+
+static int wma_decode = 0;
 static gboolean wma_pause = 0;
-static gboolean wma_eq_on = 0;
 static int wma_seekpos = -1;
 static int wma_st_buff, wma_idx;
 static GThread *wma_decode_thread;
@@ -430,152 +430,432 @@
 
 static void wma_file_info_box (char *filename) 
 {
-    char *title;
-    char *tmp;
-    char *message;
+    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;
-    int tns, thh, tmm, tss, i;
+    gint tns, thh, tmm, tss;
+    gint i;
+    gchar *title,
+          *channels,
+          *bitrate,
+          *playtime,
+          *samplerate,
+          *filesize;
+    FILE *f;
+    if (dialog) {
+        (void)printf("Info dialog is already opened!\n");
+        return;
+    }
 
-    if(dialog) return;
-
-    if(av_open_input_file(&in, str_twenty_to_space(filename), NULL, 0, NULL) < 0) 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;
+        if(s->codec_type == CODEC_TYPE_AUDIO)
+            break;
     }
-	
+
     av_find_stream_info(in);
     codec = avcodec_find_decoder(s->codec_id);
 
-    title = (char *)g_malloc(15);
-    message = (char *)g_malloc(10000);
-    tmp = (char *)g_malloc(256);
-    memset(tmp, 0, 256);
-    memset(title, 0, 15);
-    memset(message, 0, 10000);
+    /* 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");
 
-    strcpy(message, "\n\n\n");
-    strcat(message, "File Name: ");
-    strcat(message, slashkill(filename));
-    strcat(message, "\n\n");
-    strcat(message, "Audio Info:\n");
-    strcat(message, "WMA Version: ");
-    strcat(message, codec->name);
-    strcat(message, "\n");
-    strcat(message, "Bitrate: ");
-    sprintf(tmp, "%d", s->bit_rate / 1000);
-    strcat(message, tmp);
-    memset(tmp, 0, 256);
-    strcat(message, " kb/s");
-    strcat(message, "\n");
-    strcat(message, "Samplerate: ");
-    sprintf(tmp, "%d", s->sample_rate);
-    strcat(message, tmp);
-    memset(tmp, 0, 256);
-    strcat(message, " Hz");
-    strcat(message, "\n");
-    strcat(message, "Channels: ");
-    if(s->channels == 1)
-	strcat(message, "MONO\n");
-    else
-	strcat(message, "STEREO\n");
-    if (in->duration != 0)
-    {
+    /* 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);
-	strcat(message, "Play Time: ");
-	sprintf(tmp, "%2d:%02d:%02d",thh, tmm, tss);
-        strcat(message, tmp);
-	memset(tmp, 0, 256);
-	strcat(message, "\n");
-    }
-    strcat(message, "\n");
-    strcat(message, "Text Info:\n");
-    if (in->title[0] != '\0')
-    {
-	strcat(message, "Title: ");
-	strcat(message, in->title);
-	strcat(message, "\n");
-    }	
-    if (in->author[0] != '\0')
-    {
-	strcat(message, "Author: ");
-	strcat(message, in->author);
-	strcat(message, "\n");
-    }	
-    if (in->album[0] != '\0')
-    {
-	strcat(message, "Album: ");
-	strcat(message, in->album);
-	strcat(message, "\n");
-    }
-    if (in->year != 0)
-    {
-	strcat(message, "Year: ");
-	sprintf(tmp, "%d", in->year);
-	strcat(message, tmp);
-	memset(tmp, 0, 256);
-	strcat(message, "\n");
-    }
-    if (in->track != 0)
-    {
-	strcat(message, "Track: ");
-	sprintf(tmp, "%d", in->track);
-	strcat(message, tmp);
-	memset(tmp, 0, 256);
-	strcat(message, "\n");
-    }
-    if (in->genre[0] != '\0')
-    {
-	strcat(message, "Genre: ");
-	strcat(message, in->genre);
-	strcat(message, "\n");
-    }
-    if (in->comment[0] != '\0')
-    {
-	strcat(message, "Comments: ");
-	strcat(message, in->comment);
-	strcat(message, "\n");
-    }
-    if (in->copyright[0] != '\0')
-    {
-	strcat(message, "Copyright: ");
-	strcat(message, in->copyright);
-	strcat(message, "\n");
-    }
-    strcat(message, "\n\n");
-    strcpy(title, "WMA file info:");
-    
-    if(tmp) g_free(tmp);
-    if(in) av_close_input_file(in);
+        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 = fopen(filename, "rb");
+
+    if (f == NULL)
+        return;
+
+    fseek(f, 0, SEEK_END);
+    filesize = g_strdup_printf("%lu Bytes", ftell(f));
+    fclose(f);
 
     dialog = gtk_dialog_new();
+
     gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
-                        GTK_SIGNAL_FUNC(gtk_widget_destroyed), &dialog);
+        GTK_SIGNAL_FUNC(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);
-    gtk_container_border_width(GTK_CONTAINER(dialog), 5);
-    label = gtk_label_new(message);
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
-    gtk_widget_show(label);
+
+    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);
+
 
-    button = gtk_button_new_with_label(" Close ");
-    gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
-	                        GTK_SIGNAL_FUNC(gtk_widget_destroy),
-    	                        GTK_OBJECT(dialog));
-    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button,
-                     FALSE, FALSE, 0);
+    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);
+
 
-    gtk_widget_show(button);
+    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);
+
+    gtk_signal_connect_object(GTK_OBJECT(okbutton), "clicked",
+            GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(dialog));
+
     gtk_widget_show(dialog);
-    gtk_widget_grab_focus(button);
+
     g_free(title);
-    g_free(message);
+    g_free(channels);
+    g_free(bitrate);
+    g_free(playtime);
+    g_free(samplerate);
+    g_free(filesize);
 }
-
-#endif