[Flac-dev] xmms plugin, fileinfo
Miroslav Lichvar
lichvarm at phoenix.inf.upol.cz
Fri Nov 15 12:09:02 PST 2002
Here is preliminary patch for fileinfo for xmms plugin. Saving and
removing of the tag isn't working.
When saving, how handle id3v1, v2?
Display and edit more fields (e.g. performer)?
How handle genres? Combo with predefined values?
--
Miroslav Lichvar
-------------- next part --------------
Index: src/plugin_xmms/Makefile.am
===================================================================
RCS file: /cvsroot/flac/flac/src/plugin_xmms/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- src/plugin_xmms/Makefile.am 14 Nov 2002 04:57:46 -0000 1.18
+++ src/plugin_xmms/Makefile.am 15 Nov 2002 20:05:39 -0000
@@ -36,7 +36,7 @@
xmmsinputplugin_LTLIBRARIES = libxmms-flac.la
-plugin_sources = charset.c configure.c plugin.c wrap_id3.c
+plugin_sources = charset.c configure.c plugin.c wrap_id3.c fileinfo.c
if FLaC__HAS_ID3LIB
libxmms_flac_la_SOURCES = $(plugin_sources)
Index: src/plugin_xmms/fileinfo.c
===================================================================
RCS file: /cvsroot/flac/flac/src/plugin_xmms/fileinfo.c,v
retrieving revision 1.3
diff -u -r1.3 fileinfo.c
--- src/plugin_xmms/fileinfo.c 29 Aug 2002 08:13:58 -0000 1.3
+++ src/plugin_xmms/fileinfo.c 15 Nov 2002 20:05:41 -0000
@@ -17,100 +17,143 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
#include <sys/types.h>
#include <sys/stat.h>
-#include <fcntl.h>
+#include <unistd.h>
#include <stdarg.h>
-#include "FLAC/all.h"
-#include "id3_tag.h"
-#include "configure.h"
-
-gboolean get_file_info(char *filename, flac_file_info_struct *tmp_file_info)
-{
- FLAC__StreamMetadata streaminfo;
-
- if(0 == filename)
- filename = "";
+#include <gtk/gtk.h>
- if(!FLAC__metadata_get_streaminfo(filename, &streaminfo)) {
- return FALSE;
- }
-
- tmp_file_info->sample_rate = streaminfo.data.stream_info.sample_rate;
- tmp_file_info->channels = streaminfo.data.stream_info.channels;
- tmp_file_info->bits_per_sample = streaminfo.data.stream_info.bits_per_sample;
- tmp_file_info->total_samples = streaminfo.data.stream_info.total_samples;
-
- tmp_file_info->length_in_msec = streaminfo.data.stream_info.total_samples * 10 / (streaminfo.data.stream_info.sample_rate / 100);
-
- return TRUE;
-}
+#include "FLAC/metadata.h"
+#include "charset.h"
+#include "configure.h"
+#include "plugin_common/canonical_tag.h"
+#include "plugin_common/locale_hack.h"
static GtkWidget *window = NULL;
+static GList *genre_list = NULL;
static GtkWidget *filename_entry, *id3_frame;
static GtkWidget *title_entry, *artist_entry, *album_entry, *year_entry, *tracknum_entry, *comment_entry;
static GtkWidget *genre_combo;
-static GtkWidget *flac_level, *flac_bitrate, *flac_samplerate, *flac_flags;
-static GtkWidget *flac_fileinfo, *flac_genre;
+static GtkWidget *flac_samplerate, *flac_channels, *flac_bits_per_sample, *flac_blocksize, *flac_samples, *flac_filesize;
static gchar *current_filename = NULL;
-extern gchar *flac_filename;
-extern gint flac_bitrate, flac_frequency, flac_layer, flac_lsf, flac_mode;
-extern gboolean flac_stereo, flac_flac25;
-
-#define MAX_STR_LEN 100
-
-static void set_entry_tag(GtkEntry * entry, gchar * tag, gint length)
+static void label_set_text(GtkWidget * label, char *str, ...)
{
- gint stripped_len;
- gchar *text;
+ va_list args;
+ gchar *tempstr;
+
+ va_start(args, str);
+ tempstr = g_strdup_vprintf(str, args);
+ va_end(args);
- stripped_len = flac_strip_spaces(tag, length);
- text = g_strdup_printf("%-*.*s", stripped_len, stripped_len, tag);
- gtk_entry_set_text(entry, text);
- g_free(text);
+ gtk_label_set_text(GTK_LABEL(label), tempstr);
+ g_free(tempstr);
}
-static void get_entry_tag(GtkEntry * entry, gchar * tag, gint length)
+static void save_cb(GtkWidget * w, gpointer data)
{
- gchar *text;
+}
- text = gtk_entry_get_text(entry);
- memset(tag, ' ', length);
- memcpy(tag, text, strlen(text) > length ? length : strlen(text));
+static void remove_cb(GtkWidget * w, gpointer data)
+{
}
-static gint genre_comp_func(gconstpointer a, gconstpointer b)
+static void show_tag()
{
- return strcasecmp(a, b);
+ FLAC_Plugin__CanonicalTag tag;
+
+ FLAC_plugin__canonical_tag_init(&tag);
+ FLAC_plugin__canonical_tag_get_combined(current_filename, &tag);
+
+ if(flac_cfg.title.convert_char_set) {
+ convert_from_file_to_user_in_place(&tag.title);
+ convert_from_file_to_user_in_place(&tag.composer);
+ convert_from_file_to_user_in_place(&tag.performer);
+ convert_from_file_to_user_in_place(&tag.album);
+ convert_from_file_to_user_in_place(&tag.year_recorded);
+ convert_from_file_to_user_in_place(&tag.year_performed);
+ convert_from_file_to_user_in_place(&tag.track_number);
+ convert_from_file_to_user_in_place(&tag.tracks_in_album);
+ convert_from_file_to_user_in_place(&tag.genre);
+ convert_from_file_to_user_in_place(&tag.comment);
+ }
+
+ if(tag.title)
+ gtk_entry_set_text(GTK_ENTRY(title_entry), tag.title);
+ else
+ gtk_entry_set_text(GTK_ENTRY(title_entry), "");
+ if(tag.composer)
+ gtk_entry_set_text(GTK_ENTRY(artist_entry), tag.composer);
+ else
+ gtk_entry_set_text(GTK_ENTRY(artist_entry), "");
+ if(tag.album)
+ gtk_entry_set_text(GTK_ENTRY(album_entry), tag.album);
+ else
+ gtk_entry_set_text(GTK_ENTRY(album_entry), "");
+ if(tag.year_recorded)
+ gtk_entry_set_text(GTK_ENTRY(year_entry), tag.year_recorded);
+ else
+ gtk_entry_set_text(GTK_ENTRY(year_entry), "");
+ if(tag.track_number)
+ gtk_entry_set_text(GTK_ENTRY(tracknum_entry), tag.track_number);
+ else
+ gtk_entry_set_text(GTK_ENTRY(tracknum_entry), "");
+ if(tag.comment)
+ gtk_entry_set_text(GTK_ENTRY(comment_entry), tag.comment);
+ else
+ gtk_entry_set_text(GTK_ENTRY(comment_entry), "");
+ if(tag.genre)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), tag.genre);
+ else
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), "");
}
-static gchar* channel_mode_name(int mode)
+static void show_file_info()
{
- static const gchar *channel_mode[] = {N_("Mono"), N_("Stereo")};
- if (mode < 1 || mode > 2)
- return "";
- return gettext(channel_mode[mode]);
+ gchar *filename = current_filename;
+ FLAC__StreamMetadata streaminfo;
+ struct stat _stat;
+
+ if(0 == filename)
+ filename = "";
+
+ gtk_label_set_text(GTK_LABEL(flac_samplerate), "");
+ gtk_label_set_text(GTK_LABEL(flac_channels), "");
+ gtk_label_set_text(GTK_LABEL(flac_bits_per_sample), "");
+ gtk_label_set_text(GTK_LABEL(flac_blocksize), "");
+ gtk_label_set_text(GTK_LABEL(flac_samples), "");
+ gtk_label_set_text(GTK_LABEL(flac_filesize), "");
+
+ if(!FLAC__metadata_get_streaminfo(filename, &streaminfo)) {
+ return;
+ }
+
+ label_set_text(flac_samplerate, _("Samplerate: %ld Hz"), streaminfo.data.stream_info.sample_rate);
+ label_set_text(flac_channels, _("Channels: %d"), streaminfo.data.stream_info.channels);
+ label_set_text(flac_bits_per_sample, _("Bits/Sample: %d"), streaminfo.data.stream_info.bits_per_sample);
+ if(streaminfo.data.stream_info.min_blocksize == streaminfo.data.stream_info.max_blocksize)
+ label_set_text(flac_blocksize, _("Blocksize: %d"), streaminfo.data.stream_info.min_blocksize);
+ else
+ label_set_text(flac_blocksize, _("Blocksize: variable\n min/max: %d/%d"), streaminfo.data.stream_info.min_blocksize, streaminfo.data.stream_info.max_blocksize);
+
+ label_set_text(flac_samples, _("Samples: %lld\nLength: %d:%.2d"),
+ streaminfo.data.stream_info.total_samples,
+ (int)(streaminfo.data.stream_info.total_samples / streaminfo.data.stream_info.sample_rate / 60),
+ (int)(streaminfo.data.stream_info.total_samples / streaminfo.data.stream_info.sample_rate % 60));
+
+ if(!stat(filename, &_stat) && S_ISREG(_stat.st_mode))
+ label_set_text(flac_filesize, _("Filesize: %ld B\nAvg. bitrate: %.1f kb/s\nCompression ratio: %.1f%%"),
+ _stat.st_size,
+ (float)(8 * _stat.st_size) / (1000.0 * (float)streaminfo.data.stream_info.total_samples / (float)streaminfo.data.stream_info.sample_rate),
+ 100.0 * (float)_stat.st_size / (float)(streaminfo.data.stream_info.bits_per_sample / 8 * streaminfo.data.stream_info.channels * streaminfo.data.stream_info.total_samples));
}
void FLAC_XMMS__file_info_box(char *filename)
{
gint i;
- FILE *fh;
- gchar *tmp, *title;
-
- gboolean rc;
-
-#ifdef FLAC__HAS_ID3LIB
- File_Tag tag;
- Initialize_File_Tag_Item (&tag);
- rc = Id3tag_Read_File_Tag (filename, &tag);
-#else
- id3v2_struct tag;
- memset(&tag, 0, sizeof(tag));
- rc = get_id3v1_tag_as_v2_(filename, &tag);
-#endif
+ gchar *title;
if (!window)
{
@@ -142,7 +185,7 @@
left_vbox = gtk_vbox_new(FALSE, 10);
gtk_box_pack_start(GTK_BOX(hbox), left_vbox, FALSE, FALSE, 0);
- id3_frame = gtk_frame_new(_("ID3 Tag:"));
+ id3_frame = gtk_frame_new(_("Tag:"));
gtk_box_pack_start(GTK_BOX(left_vbox), id3_frame, FALSE, FALSE, 0);
table = gtk_table_new(5, 5, FALSE);
@@ -153,35 +196,35 @@
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 5, 5);
- title_entry = gtk_entry_new_with_max_length(30);
+ title_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), title_entry, 1, 4, 0, 1, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
label = gtk_label_new(_("Artist:"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 5, 5);
- artist_entry = gtk_entry_new_with_max_length(30);
+ artist_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), artist_entry, 1, 4, 1, 2, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
label = gtk_label_new(_("Album:"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 5, 5);
- album_entry = gtk_entry_new_with_max_length(30);
+ album_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), album_entry, 1, 4, 2, 3, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
label = gtk_label_new(_("Comment:"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 5, 5);
- comment_entry = gtk_entry_new_with_max_length(30);
+ comment_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), comment_entry, 1, 4, 3, 4, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
label = gtk_label_new(_("Year:"));
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 5, 5);
- year_entry = gtk_entry_new_with_max_length(4);
+ year_entry = gtk_entry_new();
gtk_widget_set_usize(year_entry, 40, -1);
gtk_table_attach(GTK_TABLE(table), year_entry, 1, 2, 4, 5, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
@@ -189,7 +232,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), label, 2, 3, 4, 5, GTK_FILL, GTK_FILL, 5, 5);
- tracknum_entry = gtk_entry_new_with_max_length(3);
+ tracknum_entry = gtk_entry_new();
gtk_widget_set_usize(tracknum_entry, 40, -1);
gtk_table_attach(GTK_TABLE(table), tracknum_entry, 3, 4, 4, 5, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
@@ -198,15 +241,18 @@
gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, GTK_FILL, GTK_FILL, 5, 5);
genre_combo = gtk_combo_new();
- gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), FALSE);
+ gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(genre_combo)->entry), TRUE);
+
+ /*
if (!genre_list)
{
- for (i = 0; i < GENRE_MAX; i++)
- genre_list = g_list_prepend(genre_list, (char *) flac_id3_genres[i]);
+ for (i = 0; i < sizeof(FLAC_plugin__id3v1_tag_genre_table) / sizeof(*FLAC_plugin__id3v1_tag_genre_table) ; i++)
+ genre_list = g_list_prepend(genre_list, (char *) FLAC_plugin__id3v1_tag_genre_table[i]);
genre_list = g_list_prepend(genre_list, "");
genre_list = g_list_sort(genre_list, genre_comp_func);
}
gtk_combo_set_popdown_strings(GTK_COMBO(genre_combo), genre_list);
+ */
gtk_table_attach(GTK_TABLE(table), genre_combo, 1, 4, 5, 6, GTK_FILL | GTK_EXPAND | GTK_SHRINK, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 5);
@@ -222,7 +268,7 @@
gtk_widget_grab_default(save);
remove_id3 = gtk_button_new_with_label(_("Remove ID3"));
- gtk_signal_connect(GTK_OBJECT(remove_id3), "clicked", GTK_SIGNAL_FUNC(remove_id3_cb), NULL);
+ gtk_signal_connect(GTK_OBJECT(remove_id3), "clicked", GTK_SIGNAL_FUNC(remove_cb), NULL);
GTK_WIDGET_SET_FLAGS(remove_id3, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(bbox), remove_id3, TRUE, TRUE, 0);
@@ -239,29 +285,35 @@
gtk_container_set_border_width(GTK_CONTAINER(flac_box), 10);
gtk_box_set_spacing(GTK_BOX(flac_box), 0);
- flac_level = gtk_label_new("");
- gtk_widget_set_usize(flac_level, 120, -2);
- gtk_misc_set_alignment(GTK_MISC(flac_level), 0, 0);
- gtk_box_pack_start(GTK_BOX(flac_box), flac_level, FALSE, FALSE, 0);
-
- flac_bitrate = gtk_label_new("");
- gtk_misc_set_alignment(GTK_MISC(flac_bitrate), 0, 0);
- gtk_label_set_justify(GTK_LABEL(flac_bitrate), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start(GTK_BOX(flac_box), flac_bitrate, FALSE, FALSE, 0);
-
flac_samplerate = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(flac_samplerate), 0, 0);
+ gtk_label_set_justify(GTK_LABEL(flac_samplerate), GTK_JUSTIFY_LEFT);
gtk_box_pack_start(GTK_BOX(flac_box), flac_samplerate, FALSE, FALSE, 0);
- flac_flags = gtk_label_new("");
- gtk_misc_set_alignment(GTK_MISC(flac_flags), 0, 0);
- gtk_label_set_justify(GTK_LABEL(flac_flags), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start(GTK_BOX(flac_box), flac_flags, FALSE, FALSE, 0);
-
- flac_fileinfo = gtk_label_new("");
- gtk_misc_set_alignment(GTK_MISC(flac_fileinfo), 0, 0);
- gtk_label_set_justify(GTK_LABEL(flac_fileinfo), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start(GTK_BOX(flac_box), flac_fileinfo, FALSE, FALSE, 0);
+ flac_channels = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(flac_channels), 0, 0);
+ gtk_label_set_justify(GTK_LABEL(flac_channels), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(flac_box), flac_channels, FALSE, FALSE, 0);
+
+ flac_bits_per_sample = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(flac_bits_per_sample), 0, 0);
+ gtk_label_set_justify(GTK_LABEL(flac_bits_per_sample), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(flac_box), flac_bits_per_sample, FALSE, FALSE, 0);
+
+ flac_blocksize = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(flac_blocksize), 0, 0);
+ gtk_label_set_justify(GTK_LABEL(flac_blocksize), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(flac_box), flac_blocksize, FALSE, FALSE, 0);
+
+ flac_samples = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(flac_samples), 0, 0);
+ gtk_label_set_justify(GTK_LABEL(flac_samples), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(flac_box), flac_samples, FALSE, FALSE, 0);
+
+ flac_filesize = gtk_label_new("");
+ gtk_misc_set_alignment(GTK_MISC(flac_filesize), 0, 0);
+ gtk_label_set_justify(GTK_LABEL(flac_filesize), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(flac_box), flac_filesize, FALSE, FALSE, 0);
gtk_widget_show_all(window);
}
@@ -277,46 +329,8 @@
gtk_entry_set_text(GTK_ENTRY(filename_entry), filename);
gtk_editable_set_position(GTK_EDITABLE(filename_entry), -1);
- if (tag.title != NULL && strlen(tag.title) > 0)
- {
- gtk_entry_set_text(GTK_ENTRY(title_entry), tag.title);
- }
- else
- {
- title = g_strdup(g_basename(filename));
- if ((tmp = strrchr(title, '.')) != NULL)
- *tmp = '\0';
- gtk_entry_set_text(GTK_ENTRY(title_entry), title);
- g_free(title);
- }
-
- gtk_entry_set_text(GTK_ENTRY(artist_entry), tag.artist);
- gtk_entry_set_text(GTK_ENTRY(album_entry), tag.album);
- gtk_entry_set_text(GTK_ENTRY(year_entry), tag.year);
- gtk_entry_set_text(GTK_ENTRY(tracknum_entry), tag.track);
- gtk_entry_set_text(GTK_ENTRY(comment_entry), tag.comment);
- gtk_entry_set_text(GTK_ENTRY(genre_entry), tag.genre);
-
- gtk_label_set_text(GTK_LABEL(flac_level), "");
- gtk_label_set_text(GTK_LABEL(flac_bitrate), "");
- gtk_label_set_text(GTK_LABEL(flac_samplerate), "");
- gtk_label_set_text(GTK_LABEL(flac_flags), "");
- gtk_label_set_text(GTK_LABEL(flac_fileinfo), "");
-
- if (!strncasecmp(filename, "http://", 7))
- {
- file_info_http(filename);
- return;
- }
+ show_tag();
+ show_file_info();
gtk_widget_set_sensitive(id3_frame, TRUE);
-
- label_set_text(flac_bitrate, _("Bits/Samples: %d"), tmp_file_info->bits_per_sample);
- /* tmp_file_info->length_in_msec */
-
- label_set_text(flac_samplerate, _("Samplerate: %ld Hz"), tmp_file_info->sample_rate);
- label_set_text(flac_channel, _("Channel: %s"), channel_mode_name(tmp_file_info->channel);
-#if 0
- label_set_text(flac_fileinfo, _("%d frames\nFilesize: %lu B"), num_frames, ftell(fh));
-#endif
}
Index: src/plugin_xmms/plugin.c
===================================================================
RCS file: /cvsroot/flac/flac/src/plugin_xmms/plugin.c,v
retrieving revision 1.39
diff -u -r1.39 plugin.c
--- src/plugin_xmms/plugin.c 15 Nov 2002 05:48:10 -0000 1.39
+++ src/plugin_xmms/plugin.c 15 Nov 2002 20:05:43 -0000
@@ -47,6 +47,7 @@
#endif
#define min(x,y) ((x)<(y)?(x):(y))
+extern void FLAC_XMMS__file_info_box(char *filename);
typedef struct {
FLAC__bool abort_flag;
@@ -108,7 +109,7 @@
NULL,
NULL,
FLAC_XMMS__get_song_info,
- NULL, /* file_info_box */
+ FLAC_XMMS__file_info_box,
NULL
};
More information about the Flac-dev
mailing list