claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

rewrite to use new functionality in plugin_common

Browse Source
This commit is contained in:
Josh Coalson
2002-08-29 08:13:01 +00:00
parent d426aee019
commit aad7aa723a
3 changed files with 193 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

246
src/plugin_xmms/wrap_id3.c
View File

@@ -29,58 +29,19 @@
#include <xmms/titlestring.h>
#include "FLAC/metadata.h"
#include "mylocale.h"
#include "plugin_common/id3v1.h"
#include "plugin_common/id3v2.h"
#include "charset.h"
#include "configure.h"
#ifdef FLAC__HAS_ID3LIB
#include <id3.h>
#include "id3_tag.h"
static FLAC__bool local__get_id3v1_tag_as_canonical(const char *filename, FLAC_Plugin__CanonicalTag *tag);
#else
#include "charset.h"
#include "genres.h"
typedef struct id3v1tag_t {
char tag[3]; /* always "TAG": defines ID3v1 tag 128 bytes before EOF */
char title[30];
char artist[30];
char album[30];
char year[4];
union {
struct {
char comment[30];
} v1_0;
struct {
char comment[28];
char __zero;
unsigned char track;
} v1_1;
} u;
unsigned char genre;
} id3v1_struct;
typedef struct id3tag_t {
char title[64];
char artist[64];
char album[64];
char comment[256];
char genre[256];
char year[16];
char track[16];
} id3v2_struct;
static gboolean local__get_id3v1_tag_as_v2_(const char *filename, id3v2_struct *tag);
static void local__id3v1_to_id3v2(id3v1_struct *v1, id3v2_struct *v2);
static const char *local__get_id3_genre(unsigned char genre_code);
#endif /* FLAC__HAS_ID3LIB */
static gchar *local__extname(const char *filename);
static char *local__extname(const char *filename);
static char* local__getstr(char* str);
static int local__getnum(char* str);
static int local__vcentry_matches(const char *field_name, const FLAC__StreamMetadata_VorbisComment_Entry *entry);
static void local__vcentry_parse_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry, gchar **dest);
static void local__vcentry_parse_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry, char **dest);
/*
* Function flac_format_song_title (tag, filename)
@@ -89,28 +50,21 @@ static void local__vcentry_parse_value(const FLAC__StreamMetadata_VorbisComment_
* return it. The title must be subsequently freed using g_free().
*
*/
gchar *flac_format_song_title(gchar * filename)
char *flac_format_song_title(char *filename)
{
gchar *ret = NULL;
char *ret = NULL;
TitleInput *input = NULL;
gboolean rc;
#ifdef FLAC__HAS_ID3LIB
File_Tag tag;
#else
id3v2_struct tag;
#endif
int got_vorbis_comments = 0;
FLAC_Plugin__CanonicalTag tag, id3v1_tag, id3v2_tag;
#ifdef FLAC__HAS_ID3LIB
Initialize_File_Tag_Item (&tag);
#else
memset(&tag, 0, sizeof(tag));
#endif
FLAC_plugin__canonical_tag_init(&tag);
FLAC_plugin__canonical_tag_init(&id3v1_tag);
FLAC_plugin__canonical_tag_init(&id3v2_tag);
/* first, parse vorbis comments if they exist */
{
FLAC__Metadata_SimpleIterator *iterator = FLAC__metadata_simple_iterator_new();
if(0 != iterator) {
FLAC__bool got_vorbis_comments = false;
do {
if(FLAC__metadata_simple_iterator_get_block_type(iterator) == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
FLAC__StreamMetadata *block = FLAC__metadata_simple_iterator_get_block(iterator);
@@ -118,26 +72,23 @@ gchar *flac_format_song_title(gchar * filename)
unsigned i;
const FLAC__StreamMetadata_VorbisComment *vc = &block->data.vorbis_comment;
for(i = 0; i < vc->num_comments; i++) {
#if 0
@@@@@
if(local__vcentry_matches("artist", &vc->comments[i]))
local__vcentry_parse_value(&vc->comments[i], &tag.artist);
local__vcentry_parse_value(&vc->comments[i], &tag.composer);
else if(local__vcentry_matches("performer", &vc->comments[i]))
local__vcentry_parse_value(&vc->comments[i], &tag.artist);
local__vcentry_parse_value(&vc->comments[i], &tag.performer);
else if(local__vcentry_matches("album", &vc->comments[i]))
local__vcentry_parse_value(&vc->comments[i], &tag.album);
else if(local__vcentry_matches("title", &vc->comments[i]))
local__vcentry_parse_value(&vc->comments[i], &tag.title);
else if(local__vcentry_matches("tracknumber", &vc->comments[i]))
local__vcentry_parse_value(&vc->comments[i], &tag.track);
local__vcentry_parse_value(&vc->comments[i], &tag.track_number);
else if(local__vcentry_matches("genre", &vc->comments[i]))
local__vcentry_parse_value(&vc->comments[i], &tag.genre);
else if(local__vcentry_matches("description", &vc->comments[i]))
local__vcentry_parse_value(&vc->comments[i], &tag.comment);
#endif
}
FLAC__metadata_object_delete(block);
got_vorbis_comments = 1;
got_vorbis_comments = true;
}
}
} while (!got_vorbis_comments && FLAC__metadata_simple_iterator_next(iterator));
@@ -145,34 +96,43 @@ gchar *flac_format_song_title(gchar * filename)
}
}
if(!got_vorbis_comments) {
#ifdef FLAC__HAS_ID3LIB
rc = Id3tag_Read_File_Tag(filename, &tag);
#else
rc = local__get_id3v1_tag_as_v2_(filename, &tag);
#endif
}
(void)FLAC_plugin__id3v2_tag_get(filename, &id3v2_tag);
(void)local__get_id3v1_tag_as_canonical(filename, &id3v1_tag);
XMMS_NEW_TITLEINPUT(input);
if (got_vorbis_comments || rc)
{
input->performer = local__getstr(tag.artist);
input->album_name = local__getstr(tag.album);
input->track_name = local__getstr(tag.title);
input->track_number = local__getnum(tag.track);
input->year = local__getnum(tag.year);
input->genre = local__getstr(tag.genre);
input->comment = local__getstr(tag.comment);
/* merge tags, preferring, in order: vorbis comments, id3v2, id3v1 */
FLAC_plugin__canonical_tag_merge(&tag, &id3v2_tag);
FLAC_plugin__canonical_tag_merge(&tag, &id3v1_tag);
if(flac_cfg.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);
}
input->performer = local__getstr(tag.performer);
input->album_name = local__getstr(tag.album);
input->track_name = local__getstr(tag.title);
input->track_number = local__getnum(tag.track_number);
input->year = local__getnum(tag.year_performed);
input->genre = local__getstr(tag.genre);
input->comment = local__getstr(tag.comment);
input->file_name = g_basename(filename);
input->file_path = filename;
input->file_ext = local__extname(filename);
ret = xmms_get_titlestring(flac_cfg.tag_override ? flac_cfg.tag_format : xmms_get_gentitle_format(), input);
g_free(input);
if (!ret)
{
if (!ret) {
/*
* Format according to filename.
*/
@@ -181,117 +141,23 @@ gchar *flac_format_song_title(gchar * filename)
*(local__extname(ret) - 1) = '\0'; /* removes period */
}
#ifdef FLAC__HAS_ID3LIB
Free_File_Tag_Item (&tag);
#endif
FLAC_plugin__canonical_tag_clear(&tag);
FLAC_plugin__canonical_tag_clear(&id3v1_tag);
FLAC_plugin__canonical_tag_clear(&id3v2_tag);
return ret;
}
#ifndef FLAC__HAS_ID3LIB
/*
* Function get_idv2_tag_(filename, ID3v2tag)
*
* Get ID3v2 tag from file.
*
*/
gboolean local__get_id3v1_tag_as_v2_(const char *filename, id3v2_struct *id3v2tag)
FLAC__bool local__get_id3v1_tag_as_canonical(const char *filename, FLAC_Plugin__CanonicalTag *tag)
{
FILE *file;
id3v1_struct id3v1tag;
memset(id3v2tag, 0, sizeof(id3v2_struct));
if ((file = fopen(filename, "rb")) != 0)
{
if ((fseek(file, -1 * sizeof (id3v1tag), SEEK_END) == 0) &&
(fread(&id3v1tag, 1, sizeof (id3v1tag), file) == sizeof (id3v1tag)) &&
(strncmp(id3v1tag.tag, "TAG", 3) == 0))
{
local__id3v1_to_id3v2(&id3v1tag, id3v2tag);
if (flac_cfg.convert_char_set)
{
gchar *string;
string = convert_from_file_to_user(id3v2tag->title);
strcpy(id3v2tag->title, string);
g_free(string);
string = convert_from_file_to_user(id3v2tag->artist);
strcpy(id3v2tag->artist, string);
g_free(string);
string = convert_from_file_to_user(id3v2tag->album);
strcpy(id3v2tag->album, string);
g_free(string);
string = convert_from_file_to_user(id3v2tag->comment);
strcpy(id3v2tag->comment, string);
g_free(string);
string = convert_from_file_to_user(id3v2tag->genre);
strcpy(id3v2tag->genre, string);
g_free(string);
string = convert_from_file_to_user(id3v2tag->year);
strcpy(id3v2tag->year, string);
g_free(string);
string = convert_from_file_to_user(id3v2tag->track);
strcpy(id3v2tag->track, string);
g_free(string);
}
}
FLAC_Plugin__Id3v1_Tag id3v1_tag;
if(FLAC_plugin__id3v1_tag_get(filename, &id3v1_tag)) {
FLAC_plugin__canonical_tag_convert_from_id3v1(tag, &id3v1_tag);
return true;
}
else
{
return FALSE;
}
return TRUE;
return false;
}
/*
* Function local__id3v1_to_id3v2 (v1, v2)
*
* Convert ID3v1 tag `v1' to ID3v2 tag `v2'.
*
*/
void local__id3v1_to_id3v2(id3v1_struct *v1, id3v2_struct *v2)
{
memset(v2,0,sizeof(id3v2_struct));
strncpy(v2->title, v1->title, 30);
strncpy(v2->artist, v1->artist, 30);
strncpy(v2->album, v1->album, 30);
strncpy(v2->comment, v1->u.v1_0.comment, 30);
strncpy(v2->genre, local__get_id3_genre(v1->genre), sizeof (v2->genre));
strncpy(v2->year, v1->year, 4);
/* Check for v1.1 tags. */
if (v1->u.v1_1.__zero == 0)
sprintf(v2->track, "%d", v1->u.v1_1.track);
else
strcpy(v2->track, "0");
g_strstrip(v2->title);
g_strstrip(v2->artist);
g_strstrip(v2->album);
g_strstrip(v2->comment);
g_strstrip(v2->genre);
g_strstrip(v2->year);
g_strstrip(v2->track);
}
const char *local__get_id3_genre(unsigned char genre_code)
{
if (genre_code < GENRE_MAX)
return gettext(id3_genres[genre_code]);
return "";
}
#endif /* ifndef FLAC__HAS_ID3LIB */
/*
* Function local__extname (filename)
*
@@ -299,9 +165,9 @@ const char *local__get_id3_genre(unsigned char genre_code)
* filename has no extension.
*
*/
gchar *local__extname(const char *filename)
char *local__extname(const char *filename)
{
gchar *ext = strrchr(filename, '.');
char *ext = strrchr(filename, '.');
if (ext != NULL)
++ext;
@@ -330,7 +196,7 @@ int local__vcentry_matches(const char *field_name, const FLAC__StreamMetadata_Vo
return (0 != eq && (unsigned)(eq-entry->entry) == field_name_length && 0 == strncasecmp(field_name, entry->entry, field_name_length));
}
void local__vcentry_parse_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry, gchar **dest)
void local__vcentry_parse_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry, char **dest)
{
const FLAC__byte *eq = memchr(entry->entry, '=', entry->length);