comparison Plugins/Input/mpg123/id3_frame_content.c @ 228:08973a746a3e trunk

[svn] GCC2 fixes.
author nenolod
date Fri, 25 Nov 2005 23:14:41 -0800
parents 539a0fa7f030
children 18cb7405b5e9
comparison
equal deleted inserted replaced
227:539a0fa7f030 228:08973a746a3e
44 */ 44 */
45 char * 45 char *
46 id3_get_content(struct id3_frame *frame) 46 id3_get_content(struct id3_frame *frame)
47 { 47 {
48 gchar *text, *text_it; 48 gchar *text, *text_it;
49 guint8 encoding;
49 50
50 /* Type check */ 51 /* Type check */
51 if (frame->fr_desc->fd_id != ID3_TCON) 52 if (frame->fr_desc->fd_id != ID3_TCON)
52 return NULL; 53 return NULL;
53 54
54 /* Check if frame is compressed */ 55 /* Check if frame is compressed */
55 if (id3_decompress_frame(frame) == -1) 56 if (id3_decompress_frame(frame) == -1)
56 return NULL; 57 return NULL;
57 58
58 ID3_FRAME_DEFINE_CURSOR(frame); 59 ID3_FRAME_DEFINE_CURSOR(frame);
59
60 guint8 encoding;
61 ID3_FRAME_READ_OR_RETVAL(encoding, NULL); 60 ID3_FRAME_READ_OR_RETVAL(encoding, NULL);
62 61
63 text = text_it = id3_string_decode(encoding, cursor, length); 62 text = text_it = id3_string_decode(encoding, cursor, length);
64 63
65 if (text == NULL) 64 if (text == NULL)