Update of /cvsroot/openneo/openneo/apps
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7391
Modified Files:
wps-display.c
Log Message:
id3 info renamed to metadata info
Index: wps-display.c
===================================================================
RCS file: /cvsroot/openneo/openneo/apps/wps-display.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wps-display.c 12 Jun 2006 01:14:57 -0000 1.35
--- wps-display.c 10 Oct 2006 23:40:02 -0000 1.36
***************
*** 298,302 ****
* Returns the tag. NULL indicates the tag wasn't available.
*/
! static char* get_tag(struct mp3entry* id3, char* tag, int max_length, char* buf, int buf_size,unsigned int* flags)
{
*flags = 0;
--- 298,302 ----
* Returns the tag. NULL indicates the tag wasn't available.
*/
! static const unsigned char* get_tag(struct mp3entry* id3, char* tag, int max_length, char* buf, int buf_size,unsigned int* flags)
{
*flags = 0;
***************
*** 313,344 ****
switch (tag[1]) {
case 't': /* ID3 Title */
! return ID3_GET_TITLE(id3->id3);
case 'a': /* ID3 Artist */
! return ID3_GET_ARTIST(id3->id3);
case 'b': /* ID3 Band */
! return ID3_GET_BAND(id3->id3);
case 'c': /* ID3 Composer */
! return ID3_GET_COMPOSER(id3->id3);
case 'n': /* ID3 Track Number */
! return ID3_GET_TRACK(id3->id3);
case 'd': /* ID3 Album/Disc */
! return ID3_GET_ALBUM(id3->id3);
case 'y': /* year */
! return ID3_GET_YEAR(id3->id3);
case 'g': /* genre */
! return ID3_GET_GENRE(id3->id3);
!
! case 'v': /* id3 version */
! return id3_version(id3->id3.version);
!
case 'm': /* id3 Comment */
! return ID3_GET_COMMENT(id3->id3);
}
break;
--- 313,341 ----
switch (tag[1]) {
case 't': /* ID3 Title */
! return METADATA_GET_TITLE(id3->meta);
case 'a': /* ID3 Artist */
! return METADATA_GET_ARTIST(id3->meta);
case 'b': /* ID3 Band */
! return METADATA_GET_BAND(id3->meta);
case 'c': /* ID3 Composer */
! return METADATA_GET_COMPOSER(id3->meta);
case 'n': /* ID3 Track Number */
! return METADATA_GET_TRACK(id3->meta);
case 'd': /* ID3 Album/Disc */
! return METADATA_GET_ALBUM(id3->meta);
case 'y': /* year */
! return METADATA_GET_YEAR(id3->meta);
case 'g': /* genre */
! return METADATA_GET_GENRE(id3->meta);
!
case 'm': /* id3 Comment */
! return METADATA_GET_COMMENT(id3->meta);
}
break;
***************
*** 781,785 ****
/* No value, so skip to else part */
! if ((!value) || (!strlen(value)))
fmt = skip_conditional(fmt, true);
--- 778,782 ----
/* No value, so skip to else part */
! if( !value || !strlen(value) )
fmt = skip_conditional(fmt, true);
|
