aboutsummaryrefslogtreecommitdiff
path: root/libmpio/src
diff options
context:
space:
mode:
Diffstat (limited to 'libmpio/src')
-rw-r--r--libmpio/src/id3.c298
-rw-r--r--libmpio/src/id3.h44
-rw-r--r--libmpio/src/mpio.c13
3 files changed, 1 insertions, 354 deletions
diff --git a/libmpio/src/id3.c b/libmpio/src/id3.c
deleted file mode 100644
index 88f86c4..0000000
--- a/libmpio/src/id3.c
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * $Id: id3.c,v 1.5 2006/01/21 18:33:20 germeier Exp $
- *
- * libmpio - a library for accessing Digit@lways MPIO players
- * Copyright (C) 2003 Markus Germeier
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc.,g 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <iconv.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "id3.h"
-#include "debug.h"
-#include "mplib.h"
-#include "mpio.h"
-
-#ifdef MPLIB
-/* local declarations */
-void mpio_id3_get_content(id3_tag *, id3_tag *, int, CHAR[INFO_LINE]);
-void mpio_id3_copy_tag(CHAR *, CHAR *, int *);
-BYTE mpio_id3_get(mpio_t *);
-BYTE mpio_id3_set(mpio_t *, BYTE);
-
-void
-mpio_id3_get_content(id3_tag *tag, id3_tag *tag2, int field,
- CHAR out[INFO_LINE])
-{
- id3_content *content;
- id3_text_content *text_content;
-
- content = mp_get_content(tag, field);
- if (!content)
- content = mp_get_content(tag2, field);
- if (content)
- {
- text_content = mp_parse_artist(content);
- debugn(2, "Found (%d): %s\n", field, text_content->text);
- strncpy(out, text_content->text, INFO_LINE);
- } else {
- strcpy(out,"");
- }
-
-}
-
-void
-mpio_id3_copy_tag(CHAR *src, CHAR *dest, int *offset)
-{
- int i=0;
- int last=0;
-
- /* find last non-space character, so we can strip */
- /* trailing spaces */
- while(src[i])
- if (src[i++]!=0x20)
- last=i;
-
- i=0;
- while((*offset<(INFO_LINE-1)) && (src[i]) && (i<last))
- dest[(*offset)++]=src[i++];
-}
-
-#endif /* MPLIB */
-
-BYTE
-mpio_id3_set(mpio_t *m, BYTE value)
-{
-#ifdef MPLIB
- m->id3 = value;
- return m->id3;
-#else
- return 0;
-#endif /* MPLIB */
-}
-
-/* query ID3 rewriting support */
-BYTE
-mpio_id3_get(mpio_t *m)
-{
-#ifdef MPLIB
- return m->id3;
-#else
- return 0;
-#endif /* MPLIB */
-}
-
-/* ID3 rewriting: do the work */
-/* context, src filename, uniq filename template */
-int
-mpio_id3_do(mpio_t *m, CHAR *src, CHAR *tmp)
-{
-#ifdef MPLIB
- int fd, in;
- BYTE buf[BLOCK_SIZE];
- int r, w;
- int i, j, t;
- id3_tag *tag, *tag2, *new_tag;
- id3_tag_list *tag_list;
- id3_tag_list new_tag_list;
- id3_content new_content;
- id3v2_tag *v2_tag;
- CHAR data_artist[INFO_LINE];
- CHAR data_title[INFO_LINE];
- CHAR data_album[INFO_LINE];
- CHAR data_year[INFO_LINE];
- CHAR data_genre[INFO_LINE];
- CHAR data_comment[INFO_LINE];
- CHAR data_track[INFO_LINE];
-
- CHAR mpio_tag[INFO_LINE];
- char *mpio_tag_unicode;
-
- iconv_t ic;
- size_t fin, fout;
- char *fback, *back;
-
- if (!m->id3)
- return 0;
-
- snprintf(tmp, INFO_LINE, "/tmp/MPIO-XXXXXXXXXXXXXXX");
-
- fd = mkstemp(tmp);
- if (fd==-1) return 0;
- sprintf(m->id3_temp, tmp, INFO_LINE);
-
- in = open(src, O_RDONLY);
- if (in==-1) return 0;
-
- do {
- r=read(in, buf, BLOCK_SIZE);
- if (r>0)
- w=write(fd, buf, r);
- } while (r>0);
-
- close (in);
-
- tag_list = mp_get_tag_list_from_fd(fd);
- if (!tag_list)
- {
- debugn(2, "no tag list found!\n");
- return 0;
- }
-
- tag = tag_list->tag;
- tag2 = NULL;
- if (tag_list->next)
- tag2 = tag_list->next->tag;
-
- /* read tags from file */
- mpio_id3_get_content(tag, tag2, MP_ARTIST, data_artist);
- mpio_id3_get_content(tag, tag2, MP_TITLE, data_title);
- mpio_id3_get_content(tag, tag2, MP_ALBUM, data_album);
- mpio_id3_get_content(tag, tag2, MP_GENRE, data_genre);
- mpio_id3_get_content(tag, tag2, MP_COMMENT, data_comment);
- mpio_id3_get_content(tag, tag2, MP_YEAR, data_year);
- mpio_id3_get_content(tag, tag2, MP_TRACK, data_track);
-
- /* build new tag */
- mpio_tag[0]=0x00;
- i=j=t=0;
-
- while ((t<(INFO_LINE-1) && m->id3_format[i]!=0))
- {
- if (m->id3_format[i] == '%')
- {
- i++;
- switch(m->id3_format[i])
- {
- case 'p':
- mpio_id3_copy_tag(data_artist, mpio_tag, &t);
- break;
- case 't':
- mpio_id3_copy_tag(data_title, mpio_tag, &t);
- break;
- case 'a':
- mpio_id3_copy_tag(data_album, mpio_tag, &t);
- break;
- case 'g':
- mpio_id3_copy_tag(data_genre, mpio_tag, &t);
- break;
- case 'c':
- mpio_id3_copy_tag(data_comment, mpio_tag, &t);
- break;
- case 'y':
- mpio_id3_copy_tag(data_year, mpio_tag, &t);
- break;
- case 'n':
- mpio_id3_copy_tag(data_track, mpio_tag, &t);
- break;
- default:
- mpio_tag[t] = m->id3_format[i];
- }
- } else {
- mpio_tag[t] = m->id3_format[i];
- t++;
- }
-
- i++;
- }
- mpio_tag[t]=0x00;
-
- debugn(2, "new_tag: %s\n", mpio_tag);
-
- /* convert tag to UNICODELITTLE */
- fin = strlen(mpio_tag) + 1;
- fout = fin*2 + 2;
- ic = iconv_open("UNICODELITTLE", "ASCII");
- fback = mpio_tag;
- mpio_tag_unicode = (char *)malloc(2*INFO_LINE+3);
- back = (char *)mpio_tag_unicode;
- *back=0x01;
- back++;
- *back=0xff;
- back++;
- *back=0xfe;
- back++;
-
- debugn(2,"iconv before %s %d %d\n", fback, fin, fout);
- iconv(ic, (char **)&fback, &fin, (char **)&back, &fout);
- debugn(2,"iconv after %s %d %d\n", fback, fin, fout);
- iconv_close(ic);
- hexdumpn(2, mpio_tag, strlen(mpio_tag));
- hexdumpn(2, (char *)mpio_tag_unicode, (2*strlen(mpio_tag))+3);
-
- /* build new ID3 v2 tag with only TXXX field */
- new_content.length=(2*strlen(mpio_tag))+3;
- new_content.data = (char *)malloc(new_content.length);
- new_content.compressed=0;
- new_content.encrypted=0;
- memcpy(new_content.data, mpio_tag_unicode, new_content.length);
-
- new_tag = mp_alloc_tag_with_version (2);
- mp_set_custom_content(new_tag, "TXXX", &new_content);
-
- v2_tag = (id3v2_tag *)new_tag->tag;
- v2_tag->header->unsyncronization=0;
- v2_tag->header->is_experimental=0;
-
- new_tag_list.tag = new_tag;
- new_tag_list.next = NULL;
- new_tag_list.first = NULL;
-
- /* delete ID3 v2 tag from file */
- mp_del_tags_by_ver_from_fd(fd, 2);
- close (fd);
-
- /* write new ID3 v2 tag to file */
- mp_write_to_file(&new_tag_list, tmp);
-
- free(mpio_tag_unicode);
-
- return 1;
-#else
- return 0;
-#endif /* MPLIB */
-}
-
-int
-mpio_id3_end(mpio_t *m)
-{
-#ifdef MPLIB
- if (m->id3_temp[0])
- unlink(m->id3_temp);
- m->id3_temp[0] = 0x00;
- return 1;
-#else
- return 0;
-#endif /* MPLIB */
-}
-
-void
-mpio_id3_format_set(mpio_t *m, CHAR *format)
-{
- strncpy(m->id3_format, format, INFO_LINE);
-}
-
-/* get format string for rewriting*/
-void
-mpio_id3_format_get(mpio_t *m, CHAR *format)
-{
- strncpy(format, m->id3_format, INFO_LINE);
-}
diff --git a/libmpio/src/id3.h b/libmpio/src/id3.h
deleted file mode 100644
index 9ed1080..0000000
--- a/libmpio/src/id3.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * $Id: id3.h,v 1.3 2006/01/21 18:33:20 germeier Exp $
- *
- * libmpio - a library for accessing Digit@lways MPIO players
- * Copyright (C) 2003 Markus Germeier
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#ifndef _MPIO_ID3_H_
-#define _MPIO_ID3_H_
-
-#include "defs.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* ID3 rewriting: do the work */
-/* context, src filename, uniq filename template */
-int mpio_id3_do(mpio_t *, CHAR *, CHAR *);
-
-/* ID3: clean up temp file */
-int mpio_id3_end(mpio_t *);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* _MPIO_ID3_H_ */
diff --git a/libmpio/src/mpio.c b/libmpio/src/mpio.c
index b17fbd4..101d608 100644
--- a/libmpio/src/mpio.c
+++ b/libmpio/src/mpio.c
@@ -40,7 +40,6 @@
#include "mpio.h"
#include "smartmedia.h"
#include "fat.h"
-#include "id3.h"
void mpio_bail_out(void);
void mpio_init_internal(mpio_t *);
@@ -118,7 +117,7 @@ static const int mpio_error_num = sizeof mpio_errors / sizeof(mpio_error_t);
static int _mpio_errno = 0;
-#define MPIO_ERR_RETURN(err) { mpio_id3_end(m); _mpio_errno = err; return -1 ; }
+#define MPIO_ERR_RETURN(err) { _mpio_errno = err; return -1 ; }
#define MPIO_CHECK_FILENAME(filename) \
if (!mpio_check_filename(filename)) { \
@@ -468,11 +467,6 @@ mpio_init(mpio_callback_init_t progress_callback)
/* set default charset for filename conversion */
new_mpio->charset=strdup(MPIO_CHARSET);
- /* disable ID3 rewriting support */
- new_mpio->id3=0;
- strncpy(new_mpio->id3_format, MPIO_ID3_FORMAT, INFO_LINE);
- new_mpio->id3_temp[0]=0x00;
-
return new_mpio;
}
@@ -761,7 +755,6 @@ mpio_file_put_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t i_filename,
struct stat file_stat;
struct tm tt;
time_t curr;
- int id3;
int block_size;
BYTE *p = NULL;
@@ -786,8 +779,6 @@ mpio_file_put_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t i_filename,
{
fsize=filesize=memory_size;
} else {
- id3 = mpio_id3_do(m, i_filename, use_filename);
- if (!id3)
strncpy(use_filename, i_filename, INFO_LINE);
if (stat((const char *)use_filename, &file_stat)!=0) {
debug("could not find file: %s\n", use_filename);
@@ -979,8 +970,6 @@ mpio_file_put_real(mpio_t *m, mpio_mem_t mem, mpio_filename_t i_filename,
fsize, start, 0x20);
}
- mpio_id3_end(m);
-
return fsize-filesize;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 12:53:47 +0000