~ft/aacdec

7d5bdda48ab6c229d6186beb9ec8b97f820e4bba — menno 19 years ago 10436df
Added new xmms plugin
A plugins/xmms/AUTHORS => plugins/xmms/AUTHORS +3 -0
@@ 0,0 1,3 @@
xmms-aac plugin for xmms-1.2.7

re-coded by ciberfred from scratch

D plugins/xmms/COPYING => plugins/xmms/COPYING +0 -340
@@ 1,340 0,0 @@
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program 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 General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.

A plugins/xmms/ChangeLog => plugins/xmms/ChangeLog +12 -0
@@ 0,0 1,12 @@
25 Aout 2002:
	* gtk-1.2.x info file with some 'static' useful ID3 info
	* title show in xmms correctly
	* version 0.1 ready to public :)

20 Aout 2002:
	* everything...
	* work with faad2lib-1.1, id3lib-3.8.0 (glibc-2.2.5, gcc-2.95.3)
	  i think the minimum required but need testing...
	* playlist working
	* handle id3tag
	

D plugins/xmms/Makefile => plugins/xmms/Makefile +0 -5
@@ 1,5 0,0 @@
libaac-XMMS.so:	aac-XMMS.c
	gcc -shared -o $@ aac-XMMS.c -I/usr/include/glib-1.2/ -I/usr/lib/glib/include -I/usr/include/gtk-1.2/ -lfaad2 -lid3 -lz

clean:
	rm -f libaac-XMMS.so aac-XMMS.o

A plugins/xmms/Makefile.am => plugins/xmms/Makefile.am +2 -0
@@ 0,0 1,2 @@
SUBDIRS = src


A plugins/xmms/NEWS => plugins/xmms/NEWS +7 -0
@@ 0,0 1,7 @@
15 aout 2002
------------

Recodage en entier du plugin aac
me contacter par mail a :

frederic.fondriest@laposte.net

M plugins/xmms/README => plugins/xmms/README +81 -26
@@ 1,39 1,94 @@
aac-XMMS
XMMS input plugin for AAC files.
Albert Fong <alfong@mail.utexas.edu>
February 7, 2002
       this is an AAC InputPlugin source written from scratch for Xmms 1.2.7
                          by ciberfred from France :)
				version 0.1

Dependencies
============
				-------------
this plugin is not finished yet wait and see...
				------------

aac-XMMS uses FAAD as the AAC audio decoder, and id3lib for ID3v2 tag 
functionality.
1 -- Introduction.
2 -- Warning
3 -- How to build the plugin

FAAD:	www.audiocoding.com
	Use the CVS branch.  If using the january 26 release, at least
	apply the patch from the forum (01-26-02 22:31), it'll fix the
	crashes at the end of some AAC files.
Hey, nice to see that i could realise a plugin for xmms .. :), so what about
this plugin. This is a plugin to play AAC files (.aac) encoded with FAAC or
the windows program psytel aacenc.exe

id3lib:	id3lib.sourceforge.net
	Version 3.8.0pre2.  No modifications necessary.
The plugin read aac files with and without ID3tag(version 2.x), AAC files
are MPEG2 or MPEG4 files that could be found in MPEG4 audio files (.mp4).
MPEG4 files with aac inside could be reads by RealPlayer or Quicktime.

Building
========
For any informations about this plugin contact me at :

Modify the supplied Makefile to match your build environment.  You may have
to update the include directories.
mail : frederic.fondriest@laposte.net
ICQ  : 17293220

./make
	-------------------------------------------------------------

Copy libaac-XMMS.so to ~/.xmms/Plugins or to your XMMS plugin directory.
			!!!!!!!!!! WARNING !!!!!!!!!!!!
if at the end of some song there is a segfault (xmms going out!),
this is probably you have an old aac song encoded with an old psytel
encoder (maybe a 1.x).
To avoide this error use psystrip.exe windows program on the file. This maybe
resolve this problem.

Notes
=====
this plugin was tested with the psytel encoder 2.15 (MPEG4 version for all
profile)

AAC files are recognized by an .aac extension.
tested on a linux LFS 3.3 with :
Glibc-2.2.5
gcc-2.95.3
gtk+-1.2.10
glib-1.2.10
xmms-1.2.7
id3lib-3.8.0
wine
faad2 1.1

Will not recognize files with unicode characters in the filename.
I don't test it for more than 2 channels file, i don't have such files...
if you wana test and give feedback could be great :)

Sometimes, seeking to the very last seconds of a file will cause a decode 
error: "Unable to find ADTS syncword".
	-------------------------------------------------------------

HOWTO Build the plugin.
-----------------------

check that xmms-config could be run from a terminal.

before, you should take the faad2 1.1 package from
www.audiocoding.com
go into the faad2 directory with a user account :
install the libsnd you found into the common/libsnd directoy
then run in the faad2 top directory :

	- sh bootstrap
	- ./configure
	- make (this build libfaad and libmp4v2)
	- make install (with the root account)

then now you should run a ldconfig or add a line
into your /etc/ld.so.conf (and run a ldconfig again)


so now you have the libfaad installed you could
install the id3lib, with the common configure && make && make install.
take the library from the net not from the common/id3lib directory

so now you have libffad and libid3 you could build the xmms plugin
run these command to build the xmms-acc plugin :

	- sh bootstrap
	- ./configure ID3_LIB=<path to the id3lib install>
		FAAD2_DIR=<path to the faad2 install>
	- make

then you should find the libaac.so file into the src directory.
copy this file into your ${HOME}/.xmms/Plugin/ or in the
common plugin directory of xmms...


NB: sorry i not a pro of automake or autoconf i prefere to build a Makefile
that a user could change to adapte to his computer. You should find the
original Makefile into the src directory. his name is Makefile.save :)

	-------------------------------------------------------------

A plugins/xmms/TODO => plugins/xmms/TODO +6 -0
@@ 0,0 1,6 @@
TODO:

	* handle AAC info such as MPEG-AAC type, header (ADTS/ADIF),...
	* seeking... but it will certainly an option because it need
	  a reading of whole file....
	* any suggestions ... send me somes messages about it :)

D plugins/xmms/aac-XMMS.c => plugins/xmms/aac-XMMS.c +0 -712
@@ 1,712 0,0 @@
/* aac-XMMS.c
 *
 * XMMS input plugin that decodes AAC files.
 *
 * Copyright (C) 2001 Albert Fong
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 * 
 * This program 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 General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 *
 */


/*
 * This plugin depends on XMMS 1.2.5+, faad2-26012002, id3lib-3.8.0pre2
 * zlib, and at least glib-1.2.
 *
 * XMMS:	www.xmms.org
 * FAAC/FAAD:	www.audiocoding.com
 * id3lib:	id3lib.sourceforge.net
 *
 * Planned updates:
 *
 * 	Configuration panel in XMMS.
 *
 * 	File info panel in XMMS.
 *
 * 	Allow the buffer size to be customized, or buffer the entire 
 * 	file before decoding.
 *
 * 	Choose to enable or disable seeking.  Currently, the plugin needs
 * 	to build a position table first before seeking is possible.  This
 * 	requires an initial pass through the file before decoding.  This
 * 	is not desirable if the file is streamed across the network or from
 * 	slow storage media.
 *
 * 	Choose to enable or disable play time calculation in the playlist.
 * 	Again, this requires an initial pass to calculate the play time.
 *
 * 	VBR calculation.
 *
 * 	Handle unicode ID3 tags properly.
 * 
 *  A more efficient method of handling streaming files, seeking, and play
 *  time calculation is desirable.
 */

/* Update:  February 7, 2002
 *
 * 	Updated to remove id3lib modifications, and general clean up for
 * 	release.
 */

/* Update:  January 26, 2002
 *
 *	Updated to work with January 26 source release for FAAC/FAAD, to
 *	use libfaad2. (www.audiocoding.com, faac.sourceforge.net)
 */

/* Set to 0 if you want to disable seeking.  Useful when streaming files
 * off of a network drive, so you don't have to download the entire file
 * to construct the seek_table before playing
 */
#define USE_SEEKING	1

#include <stdio.h>
#include <string.h>
#include <pthread.h>

#include "faad.h"
#include "xmms/plugin.h"
#include "xmms/titlestring.h"
#include "id3.h"
#include <glib.h>

#define BUFFER_SIZE	1024*64

static void aac_init(void);
static int  aac_is_our_file(char *filename);
static void aac_play_file(char *filename);
static void aac_stop(void);
static void aac_pause(short paused);
static void aac_seek(int time);
static int  aac_get_time(void);
static void aac_cleanup(void);
static void aac_get_song_info(char *filename, char **title, int *length);

static void *decode_loop(void *arg);
static gchar *construct_title(char *filename, ID3Tag *id3tag);

/* Constructs a table of file positions for each second of output */
static void get_AAC_info(FILE *infile, unsigned long *bitrate, unsigned long **seek_table, unsigned long *length);

gboolean playing = FALSE;
gboolean output_opened = FALSE;
gint seek_pos = -1;
pthread_t decode_thread;

InputPlugin aac_ip =
{
	NULL,				/* handle */
	NULL,				/* filename */
	NULL,				/* description */
	aac_init,
	NULL,				/* about box */
	NULL,				/* configure plugin */
	aac_is_our_file,
	NULL,				/* scan dir */
	aac_play_file,
	aac_stop,
	aac_pause,
#if USE_SEEKING
	aac_seek,
#else
	NULL,
#endif
	NULL,				/* set equalizer */
	aac_get_time,
	NULL,				/* get volume */
	NULL,				/* set volume */
	aac_cleanup,
	NULL,				/* obsolete */
	NULL,				/* send visualization data */
	NULL,				/* set player window info */
	NULL,				/* set song title text */
	aac_get_song_info,
	NULL,				/* file info box */
	NULL				/* pointer to OutputPlugin */
};

InputPlugin *get_iplugin_info(void)
{
	aac_ip.description = g_strdup_printf("MPEG-2 AAC Player");
	return &aac_ip;
}

static void aac_init(void)
{
}

static int aac_is_our_file(char *filename)
{
	/* extension check (.AAC) */
	gchar *ext = NULL;
	ext = strrchr(filename, '.');
	if (ext && !strcasecmp(ext, ".aac"))
		return 1;
	return 0;
}

/* Quick hack to avoid patching id3lib - will be removed whenever id3lib
 * gets a working C API
 */
int _ID3_IsTagHeader(const unsigned char data[ID3_TAGHEADERSIZE])
{
	size_t size = 0;
	if (data[0] == 0x49 && data[1] == 0x44 && data[2] == 0x33 &&
	    data[3] < 0xff && data[4] < 0xff && data[5] < 0x80)
	{
		size = (data[9] & 0x7f) |
		       ((data[8] & 0x7f) << 7) |
		       ((data[7] & 0x7f) << 14) |
		       ((data[6] & 0x7f) << 21);
		return size;
	}
	else
	{
		return -1;
	}
}

#define DECODE_ERROR() \
	do { \
		printf("decode error at file: %s line: %d\n", __FILE__, __LINE__); \
		if (output_opened) \
		{ \
			aac_ip.output->flush(0); \
			aac_ip.output->close_audio(); \
			output_opened = FALSE; \
		} \
		if (decoder) faacDecClose(decoder); \
		if (infile) fclose(infile); \
		if (id3tag) ID3Tag_Delete(id3tag); \
		g_free(seek_table); \
		g_free(id3buffer); \
		g_free(buffer); \
		g_free(sample_buffer); \
		playing = FALSE; \
		pthread_exit(NULL); \
	} while (0);

static void *aac_decode_loop(void *arg)
{
	ID3Tag *id3tag = NULL;
	FILE *infile = NULL;
	gchar *filename = arg;
	int tagsize = 0;

	unsigned long buffervalid = 0;
	unsigned long bufferconsumed = 0;

	unsigned long bytesdecoded;
	unsigned long samplesdecoded;

	unsigned long samplerate;
	unsigned long channels;

	unsigned long bitrate = -1;

	int result = 0;

	unsigned char id3header[ID3_TAGHEADERSIZE];
	unsigned char *id3buffer = NULL;
	unsigned char *buffer = NULL;
	short *sample_buffer = NULL;
	unsigned long *seek_table = NULL;
	unsigned long seek_table_length = 0;

	faacDecHandle decoder = NULL;
	faacDecConfigurationPtr config = NULL;
	faacDecFrameInfo finfo;

	buffer = g_malloc0(BUFFER_SIZE);

	infile = fopen(filename, "rb");
	if (!infile) DECODE_ERROR();
	if (fread(id3header, 1, ID3_TAGHEADERSIZE, infile) != ID3_TAGHEADERSIZE)
		DECODE_ERROR();
	if ((tagsize = _ID3_IsTagHeader(id3header)) != -1)
	{
		id3buffer = g_malloc0(tagsize);
		if (fread(id3buffer, 1, tagsize, infile) != tagsize)
			DECODE_ERROR();
		id3tag = ID3Tag_New();
		ID3Tag_Parse(id3tag, id3header, id3buffer);
	}
	else
		fseek(infile, 0, SEEK_SET);

#if USE_SEEKING
	get_AAC_info(infile, &bitrate, &seek_table, &seek_table_length);
#endif
	
	decoder = faacDecOpen();
	if (!decoder) DECODE_ERROR();
	
	config = faacDecGetCurrentConfiguration(decoder);
	if (!config) DECODE_ERROR();

	buffervalid = fread(buffer, 1, BUFFER_SIZE, infile);
	bufferconsumed = faacDecInit(decoder, buffer, &samplerate, &channels);

	output_opened = aac_ip.output->open_audio(FMT_S16_LE, samplerate, channels);
	if (!output_opened)
		DECODE_ERROR();

#if USE_SEEKING
	aac_ip.set_info(construct_title(filename, id3tag), (seek_table_length-1)*1000, bitrate, samplerate, channels);
#else
	aac_ip.set_info(construct_title(filename, id3tag), -1, bitrate, samplerate, channels);
#endif
	
	while (playing && buffervalid > 0)
	{
		/* handle seeking */
		if (seek_pos != -1)
		{
			if (seek_pos > seek_table_length) seek_pos = seek_table_length;
			if (seek_pos < 0) seek_pos = 0;

			if (fseek(infile, seek_table[seek_pos], SEEK_SET) == -1)
				DECODE_ERROR();
			bufferconsumed = 0;
			buffervalid = fread(buffer, 1, BUFFER_SIZE, infile);

			aac_ip.output->flush(seek_pos*1000);
			seek_pos = -1;
		}
		
		if (bufferconsumed > 0)
		{
			memmove(buffer, &buffer[bufferconsumed], buffervalid-bufferconsumed);
			buffervalid -= bufferconsumed;
			buffervalid += fread(&buffer[buffervalid], 1, BUFFER_SIZE-buffervalid, infile);
		}
		sample_buffer = faacDecDecode(decoder, &finfo, buffer);
		bytesdecoded = finfo.bytesconsumed;
		samplesdecoded = finfo.samples;
		result = finfo.error;

		if (sample_buffer == NULL)
		{
			buffervalid = 0;
			printf("aac-XMMS: %s\n", faacDecGetErrorMessage(result));
		}

		bufferconsumed = bytesdecoded;

		if (sample_buffer && (samplesdecoded > 0))
		{
			while (playing && aac_ip.output->buffer_free() < (samplesdecoded << 1))
			{
				if (seek_pos != -1)
					break;
				else
					xmms_usleep(10000);
			}

			if (seek_pos == -1)
			{
				aac_ip.add_vis_pcm(aac_ip.output->written_time(), FMT_S16_LE, channels, samplesdecoded << 1, sample_buffer);
				aac_ip.output->write_audio(sample_buffer, samplesdecoded << 1);
			}
		}
	}

	if (output_opened)
	{
		while (playing && aac_ip.output->buffer_playing()) {
			xmms_usleep(10000);
		}
		aac_ip.output->flush(0);
		aac_ip.output->close_audio();
		output_opened = FALSE;
	} 

	if (decoder) faacDecClose(decoder); 
	if (infile) fclose(infile); 
	if (id3tag) ID3Tag_Delete(id3tag);

	g_free(seek_table);
	g_free(id3buffer); 
	g_free(buffer); 

	playing = FALSE;
	seek_pos = -1;
	
	pthread_exit(NULL); 
}

static void aac_play_file(char *filename)
{
	playing = TRUE;
	pthread_create(&decode_thread, NULL, aac_decode_loop, g_strdup(filename));
}

static void aac_stop(void)
{
	playing = FALSE;
	pthread_join(decode_thread, NULL);
}

static void aac_pause(short paused)
{
	if (output_opened)
		aac_ip.output->pause(paused);
}

static void aac_seek(int time)
{
	seek_pos = time;
	while (playing && seek_pos != -1) xmms_usleep(10000);
}

static int aac_get_time(void)
{
	if (!playing)
		return -1;
	return aac_ip.output->output_time();
}

/*
 * Construct a title string based on the given ID3 tag, or from the filename
 * if the tag is unavailable.  This does not take into account different 
 * encodings other than ASCII.
 *
 */
static gchar *construct_title(char *filename, ID3Tag *id3tag)
{
	TitleInput *input = NULL;
	ID3Frame *id3frame = NULL;
	ID3Field *id3field = NULL;
	gchar *ext = NULL;
	gchar *title = NULL;
	gchar *tmp = NULL;

	XMMS_NEW_TITLEINPUT(input);

	ext = strrchr(filename, '.');
	if (ext) ext++;
	
	input->file_name = g_basename(filename);
	input->file_ext = ext;
	input->file_path = filename;

	if (id3tag)
	{
		/* performer */	
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_LEADARTIST);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				input->performer = g_malloc0((ID3Field_Size(id3field)+1));
				ID3Field_GetASCII(id3field, input->performer, ID3Field_Size(id3field));
				id3field = NULL;
			}
			id3frame = NULL;
		}
	
		/* album name */
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_ALBUM);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				input->album_name = g_malloc0(ID3Field_Size(id3field)+1);
				ID3Field_GetASCII(id3field, input->album_name, ID3Field_Size(id3field));
				id3field = NULL;
			}
			id3frame = NULL;
		}

		/* track name */
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_TITLE);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				input->track_name = g_malloc0((ID3Field_Size(id3field)+1));
				ID3Field_GetASCII(id3field, input->track_name, ID3Field_Size(id3field));
				id3field = NULL;
			}			
			id3frame = NULL;
		}

		/* track number */
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_TRACKNUM);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				/* The track number MAY be extended with a '/'
				 * followed by a numeric string, eg. "4/9".
				 * In this case, take only the first number
				 */
				tmp = g_malloc0(ID3Field_Size(id3field)+1);
				ID3Field_GetASCII(id3field, tmp, ID3Field_Size(id3field));
				input->track_number = atoi(tmp);
				g_free(tmp);
				id3field = NULL;
			}
			id3frame = NULL;
		}

		/* year */
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_YEAR);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				tmp = g_malloc0(ID3Field_Size(id3field)+1);
				ID3Field_GetASCII(id3field, tmp, ID3Field_Size(id3field));
				input->year = atoi(tmp);
				g_free(tmp);
				id3field = NULL;
			}
			id3frame = NULL;
		}

		/* date */
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_DATE);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				input->date = g_malloc0(ID3Field_Size(id3field)+1);
				ID3Field_GetASCII(id3field, input->date, ID3Field_Size(id3field));
				id3field = NULL;
			}
			id3frame = NULL;
		}

		/* genre */
		/* XXX Genre handling is known to be broken.
		 *     It does not take into account id3v1 genre listings
		 */
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_CONTENTTYPE);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				input->genre = g_malloc0(ID3Field_Size(id3field)+1);
				ID3Field_GetASCII(id3field, input->genre, ID3Field_Size(id3field));
				id3field = NULL;
			}
			id3frame = NULL;
		}

		/* comment */
		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_COMMENT);
		if (id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				input->comment = g_malloc0(ID3Field_Size(id3field)+1);
				ID3Field_GetASCII(id3field, input->comment, ID3Field_Size(id3field));
				id3field = NULL;
			}
			id3frame = NULL;
		}
	}

	title = xmms_get_titlestring(xmms_get_gentitle_format(), input);

	g_free(input->performer);
	g_free(input->album_name);
	g_free(input->track_name);
	g_free(input->date);
	g_free(input->genre);
	g_free(input->comment);
	g_free(input);

	return title;
}

static void aac_get_song_info(char *filename, char **title, int *length)
{
	ID3Tag *id3tag = NULL;
	ID3Frame *id3frame = NULL;
	ID3Field *id3field = NULL;
	unsigned char header[ID3_TAGHEADERSIZE];
	unsigned char *buffer = NULL;
	unsigned long *seek_table = NULL;
	unsigned long seconds, bitrate;
	FILE *infile = NULL;
	int buffersize;

	(*length) = -1;
	
	infile = fopen(filename, "rb");
	if (!infile)
		return;

	memset(header, 0, ID3_TAGHEADERSIZE);
	fread(header, 1, ID3_TAGHEADERSIZE, infile);

	/* check for a valid ID3 header */
	if ((buffersize = _ID3_IsTagHeader(header)) != -1)
	{
		buffer = g_malloc0(buffersize);
		if (fread(buffer, 1, buffersize, infile) != buffersize)
		{
			g_free(buffer);
			fclose(infile);
			return;
		}
		id3tag = ID3Tag_New();
		ID3Tag_Parse(id3tag, header, buffer);

		id3frame = ID3Tag_FindFrameWithID(id3tag, ID3FID_SONGLEN);
		if (!id3frame)
		{
			id3field = ID3Frame_GetField(id3frame, ID3FN_TEXT);
			if (id3field)
			{
				buffer = g_malloc0(ID3Field_Size(id3field)+1);
				ID3Field_GetASCII(id3field, buffer, ID3Field_Size(id3field));
				(*length) = atoi(buffer);
				g_free(buffer);
			}

		}
	
	}

	(*title) = construct_title(filename, id3tag);

#if USE_SEEKING
	get_AAC_info(infile, &bitrate, &seek_table, &seconds);
	(*length) = (seconds-1)*1000;
#endif

	if (id3tag) ID3Tag_Delete(id3tag);
	if (infile) fclose(infile);

	g_free(seek_table);
	g_free(buffer);
}

static void aac_cleanup(void)
{
	if (aac_ip.description)
		g_free(aac_ip.description);
}

#define ADTS_HEADER_SIZE 8
#define SEEK_TABLE_CHUNK 60

static int sample_rates[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000 };

/* Modeled after the FAAD winamp plugin */

static void get_AAC_info(FILE *infile, unsigned long *bitrate, unsigned long **seek_table, unsigned long *seek_table_length)
{
	unsigned long orig_pos, pos;
	unsigned char header[ADTS_HEADER_SIZE];
	unsigned int framecount, framelength, t_framelength = 0, framesinsec = 0;

	unsigned long *tmp_seek_table = NULL;
	unsigned long *tmp_realloc = NULL;
	unsigned long tmp_seek_table_length;
	unsigned long seconds = 0;

	float frames_per_sec;

	int id;
	int sample_rate_index;

	orig_pos = ftell(infile);

	(*bitrate) = -1;
	(*seek_table) = NULL;	
	(*seek_table_length) = -1;

	tmp_seek_table = g_malloc0(SEEK_TABLE_CHUNK * sizeof(unsigned long));
	tmp_seek_table_length = SEEK_TABLE_CHUNK;

	for (framecount = 0;; framecount++, framesinsec++)
	{
		pos = ftell(infile);
		if (fread(header, 1, ADTS_HEADER_SIZE, infile) != ADTS_HEADER_SIZE)
			break;

		/* check syncword */
		if (!((header[0] == 0xff) && ((header[1] & 0xf6) == 0xf0)))
			break;

		if (!framecount)
		{
			/* read the fixed ADTS header only once */
			id = header[1] & 0x08;
			sample_rate_index = (header[2] & 0x3c) >> 2;
			frames_per_sec = sample_rates[sample_rate_index] / 1024.0f;
		}

		if (id == 0)
		{
			/* MPEG-4 */
			framelength = ((unsigned int)header[4] << 5) | ((unsigned int)header[5] >> 3);
		}
		else
		{
			/* MPEG-2 */
			framelength = (((unsigned int)header[3] & 0x3) << 11) | ((unsigned int)header[4] << 3) | (header[5] >> 5);
		}
		t_framelength += framelength;

		if (framesinsec == 43)
		{
			framesinsec = 0;
		}

		if (framesinsec == 0)
		{
			if (seconds == tmp_seek_table_length)
			{
				tmp_seek_table = realloc(tmp_seek_table, (seconds + SEEK_TABLE_CHUNK)*sizeof(unsigned long));
				tmp_seek_table_length = seconds + SEEK_TABLE_CHUNK;
			}
			tmp_seek_table[seconds] = pos;
			seconds++;
		}

		if (fseek(infile, framelength - ADTS_HEADER_SIZE, SEEK_CUR) == -1)
			break;
	}

	if (seconds)
	{
		(*seek_table) = g_malloc0(seconds*sizeof(unsigned long));
		memcpy((*seek_table), tmp_seek_table, seconds*sizeof(unsigned long));
		(*seek_table_length) = seconds;

// Bitrate calculation here is unreliable, and variable, so setting it here
// doesn't help us any

//		(*bitrate) = (unsigned long)(((t_framelength / framecount)*(sample_rates[sample_rate_index]/1024.0))+0.5)*8;
	}

	g_free(tmp_seek_table);
	fseek(infile, orig_pos, SEEK_SET);
}


A plugins/xmms/bootstrap => plugins/xmms/bootstrap +15 -0
@@ 0,0 1,15 @@
#!/bin/bash

echo ""
echo "----running setup for xmms-aac plugin----"
echo "don't forget to install libfaad before !!"
echo "check http://www.audiocoding.com"
echo ""

aclocal -I .
libtoolize --automake
automake --add-missing
autoconf
echo "******"
echo "ready to run ./configure (check '--help' for options)"
echo "******"

A plugins/xmms/configure.in => plugins/xmms/configure.in +41 -0
@@ 0,0 1,41 @@
dnl
AC_INIT(src/libaac.c)
AM_INIT_AUTOMAKE(libaac, 0.0.1)

AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL

dnl AM_DISABLE_STATIC
dnl AM_PROG_LIBTOOL

AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([thread support not installed or not found]))
dnl AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([ GLIB >=1.2.2 not installed or not found]))
dnl AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([ GTK+ >=1.2.2 not installed or not found]),gthread)
AC_PATH_PROG(XMMS_PATH,xmms,no)
LIBS="$LIBS $GTK_LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
PTHREAD_LIBS="-lpthread"
AC_SUBST(PTHREAD_LIBS)
CPPFLAGS="$GTK_CFLAGS $CPPFLAGS"
AC_SUBST(CPPFLAGS)
if test "$FAAD2_DIR" = ""; then
 AC_MSG_ERROR([add FAAD2_DIR=<path to faad2 install dir> (ex:/usr/local/faad2)])
fi
if test "$ID3_DIR" = "";then
 AC_MSG_ERROR([ add ID3_DIR=<path to id3 install dir> (ex:/usr/local/id3lib)])
fi
AC_SUBST(FAAD2_DIR)
AC_SUBST(ID3_DIR)
AC_SUBST(CFLAGS)
AC_OUTPUT(Makefile src/Makefile)

echo "*****configuration xmms-aac plugin done****"
echo ""
echo "pthread flag :	$PTHREAD_LIBS"
echo "id3 dir :		$ID3_DIR"
echo "faad2 dir :	$FAAD2_DIR"
echo "xmms dir :	$XMMS_PATH"
echo ""
echo " !!!!!!!!!!!!!!!!! WARNING !!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "note that id3 and faad2 directoies MUST not be empty !!"

A plugins/xmms/src/Makefile.am => plugins/xmms/src/Makefile.am +7 -0
@@ 0,0 1,7 @@
CFLAGS = @CFLAGS@ -Wall
bin_PROGRAMS = libaac.so

INCLUDES = `xmms-config --cflags` -I@FAAD2_DIR@/include -I@ID3_DIR@/include
libaac_so_LDFLAGS = -shared -L@FAAD2_DIR@/lib -L@ID3_DIR@/lib `xmms-config --libs` -lpthread -lfaad -lz

libaac_so_SOURCES = libaac.c id3.cpp

A plugins/xmms/src/Makefile.save => plugins/xmms/src/Makefile.save +22 -0
@@ 0,0 1,22 @@

CC = gcc
CPP = g++
LDFLAGS = -lpthread -lfaad -L/usr/local/faad2/lib -lid3 -lz
CFLAGS = -O2 -Wall
INCLUDE = -I/usr/local/faad2/include `xmms-config --cflags`
OBJS = libaac.o id3.o dialog_gtk1.o

.SUFFIXES: .c .o

.c.o:
	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<

.cpp.o:
	$(CPP) -c $(CFLAGS) $(INCLUDE) -o $@ $<

all: $(OBJS)
	$(CPP) -shared -o libaac.so $(OBJS) `xmms-config --libs` $(INCLUDE) $(CFLAGS) $(LDFLAGS)
	strip --strip-debug libaac.so

install:
	mv libaac.so $(HOME)/.xmms/Plugins/

A plugins/xmms/src/dialog_gtk1.c => plugins/xmms/src/dialog_gtk1.c +396 -0
@@ 0,0 1,396 @@
/*
** Dialog info file 
** use gtk 1.2.x
** with the help of wGlade
*/

#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>

void updateWindowDatas(void);


GtkWidget *createDialogInfo(void);
char *title=0, *artist=0, *album=0, *year=0, *track=0, *genre=0, *comment=0,
	*composer=0, *url=0, *originalArtist=0, *encodedby=0;

GtkWidget* createDialogInfo(void)
{
  GtkWidget *window1;
  GtkWidget *fixed1;
  GtkWidget *button2;
  GtkWidget *frame2;
  GtkWidget *fixed3;
  GtkWidget *Track;
  GtkWidget *Artist;
  GtkWidget *Title;
  GtkWidget *Album;
  GtkWidget *Year;
  GtkWidget *Encoded;
  GtkWidget *entry1;
  GtkWidget *labelYear;
  GtkWidget *labelEncoded;
  GtkWidget *text1;
  GtkWidget *entry2;
  GtkWidget *labelAlbum;
  GtkWidget *entry3;
  GtkWidget *labelTrack;
  GtkWidget *labelComposer;
  GtkWidget *label15;
  GtkWidget *hseparator1;
  GtkWidget *labelArtist;
  GtkWidget *labelTitle;
  GtkWidget *label17;
  GtkWidget *entry4;
  GtkWidget *label18;
  GtkWidget *labelGenre;
  GtkWidget *frame1;
  GtkWidget *fixed2;
  GtkWidget *labelaacType;
  GtkWidget *label13;
  GtkTooltips *tooltips;

  tooltips = gtk_tooltips_new ();
  updateWindowDatas();
  window1 = gtk_window_new (GTK_WINDOW_DIALOG);
  gtk_object_set_data (GTK_OBJECT (window1), "window1", window1);
  gtk_window_set_title (GTK_WINDOW (window1), "Infos / AAC / ID3tag");
  gtk_window_set_modal (GTK_WINDOW (window1), TRUE);
  gtk_window_set_default_size (GTK_WINDOW (window1), 400, 350);

  fixed1 = gtk_fixed_new ();
  gtk_widget_ref (fixed1);
  gtk_object_set_data_full (GTK_OBJECT (window1), "fixed1", fixed1,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (fixed1);
  gtk_container_add (GTK_CONTAINER (window1), fixed1);

  button2 = gtk_button_new_with_label ("Close");
  gtk_widget_ref (button2);
  gtk_object_set_data_full (GTK_OBJECT (window1), "button2", button2,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_signal_connect_object(GTK_OBJECT(button2), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(window1));
  gtk_widget_show (button2);
  gtk_fixed_put (GTK_FIXED (fixed1), button2, 451, 39);
  gtk_widget_set_uposition (button2, 451, 39);
  gtk_widget_set_usize (button2, 49, 24);

  frame2 = gtk_frame_new ("ID3 Tag");
  gtk_widget_ref (frame2);
  gtk_object_set_data_full (GTK_OBJECT (window1), "frame2", frame2,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (frame2);
  gtk_fixed_put (GTK_FIXED (fixed1), frame2, 2, 99);
  gtk_widget_set_uposition (frame2, 2, 99);
  gtk_widget_set_usize (frame2, 504, 326);

  fixed3 = gtk_fixed_new ();
  gtk_widget_ref (fixed3);
  gtk_object_set_data_full (GTK_OBJECT (window1), "fixed3", fixed3,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (fixed3);
  gtk_container_add (GTK_CONTAINER (frame2), fixed3);

  Track = gtk_entry_new ();
  gtk_widget_ref (Track);
  gtk_object_set_data_full (GTK_OBJECT (window1), "Track", Track,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (Track);
  gtk_fixed_put (GTK_FIXED (fixed3), Track, 424, 0);
  gtk_widget_set_uposition (Track, 424, 0);
  gtk_widget_set_usize (Track, 60, 20);
  gtk_tooltips_set_tip (tooltips, Track, "number on the album", NULL);
  gtk_entry_set_editable (GTK_ENTRY (Track), FALSE);
  gtk_entry_set_text (GTK_ENTRY (Track), track);

  Artist = gtk_entry_new ();
  gtk_widget_ref (Artist);
  gtk_object_set_data_full (GTK_OBJECT (window1), "Artist", Artist,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (Artist);
  gtk_fixed_put (GTK_FIXED (fixed3), Artist, 112, 0);
  gtk_widget_set_uposition (Artist, 112, 0);
  gtk_widget_set_usize (Artist, 240, 20);
  gtk_tooltips_set_tip (tooltips, Artist, "artist or group singer", NULL);
  gtk_entry_set_editable (GTK_ENTRY (Artist), FALSE);
  gtk_entry_set_text (GTK_ENTRY (Artist), artist);

  Title = gtk_entry_new ();
  gtk_widget_ref (Title);
  gtk_object_set_data_full (GTK_OBJECT (window1), "Title", Title,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (Title);
  gtk_fixed_put (GTK_FIXED (fixed3), Title, 112, 32);
  gtk_widget_set_uposition (Title, 112, 32);
  gtk_widget_set_usize (Title, 370, 20);
  gtk_tooltips_set_tip (tooltips, Title, "title of the song", NULL);
  gtk_entry_set_editable (GTK_ENTRY (Title), FALSE);
  gtk_entry_set_text (GTK_ENTRY (Title), title);

  Album = gtk_entry_new ();
  gtk_widget_ref (Album);
  gtk_object_set_data_full (GTK_OBJECT (window1), "Album", Album,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (Album);
  gtk_fixed_put (GTK_FIXED (fixed3), Album, 112, 64);
  gtk_widget_set_uposition (Album, 112, 64);
  gtk_widget_set_usize (Album, 240, 20);
  gtk_tooltips_set_tip (tooltips, Album, "from album...", NULL);
  gtk_entry_set_editable (GTK_ENTRY (Album), FALSE);
  gtk_entry_set_text (GTK_ENTRY (Album), album);

  Year = gtk_entry_new_with_max_length (4);
  gtk_widget_ref (Year);
  gtk_object_set_data_full (GTK_OBJECT (window1), "Year", Year,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (Year);
  gtk_fixed_put (GTK_FIXED (fixed3), Year, 424, 64);
  gtk_widget_set_uposition (Year, 424, 64);
  gtk_widget_set_usize (Year, 60, 20);
  gtk_tooltips_set_tip (tooltips, Year, "sell in ...", NULL);
  gtk_entry_set_editable (GTK_ENTRY (Year), FALSE);
  gtk_entry_set_text (GTK_ENTRY (Year), year);

  Encoded = gtk_entry_new ();
  gtk_widget_ref (Encoded);
  gtk_object_set_data_full (GTK_OBJECT (window1), "Encoded", Encoded,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (Encoded);
  gtk_fixed_put (GTK_FIXED (fixed3), Encoded, 336, 272);
  gtk_widget_set_uposition (Encoded, 336, 272);
  gtk_widget_set_usize (Encoded, 158, 20);
  gtk_tooltips_set_tip (tooltips, Encoded, "the name of the encoder...", NULL);
  gtk_entry_set_editable (GTK_ENTRY (Encoded), FALSE);
  gtk_entry_set_text (GTK_ENTRY (Encoded), encodedby);

  entry1 = gtk_entry_new ();
  gtk_widget_ref (entry1);
  gtk_object_set_data_full (GTK_OBJECT (window1), "entry1", entry1,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (entry1);
  gtk_fixed_put (GTK_FIXED (fixed3), entry1, 328, 96);
  gtk_widget_set_uposition (entry1, 328, 96);
  gtk_widget_set_usize (entry1, 160, 20);
  gtk_tooltips_set_tip (tooltips, entry1, "what king of music...", NULL);
  gtk_entry_set_editable (GTK_ENTRY (entry1), FALSE);
  gtk_entry_set_text (GTK_ENTRY (entry1), genre);

  labelYear = gtk_label_new ("Year :");
  gtk_widget_ref (labelYear);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelYear", labelYear,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelYear);
  gtk_fixed_put (GTK_FIXED (fixed3), labelYear, 376, 64);
  gtk_widget_set_uposition (labelYear, 376, 64);
  gtk_widget_set_usize (labelYear, 41, 18);

  labelEncoded = gtk_label_new ("Encoded by :");
  gtk_widget_ref (labelEncoded);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelEncoded", labelEncoded,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelEncoded);
  gtk_fixed_put (GTK_FIXED (fixed3), labelEncoded, 248, 272);
  gtk_widget_set_uposition (labelEncoded, 248, 272);
  gtk_widget_set_usize (labelEncoded, 83, 18);

  text1 = gtk_text_new (NULL, NULL);
  gtk_widget_ref (text1);
  gtk_object_set_data_full (GTK_OBJECT (window1), "text1", text1,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (text1);
  gtk_fixed_put (GTK_FIXED (fixed3), text1, 112, 152);
  gtk_widget_set_uposition (text1, 112, 152);
  gtk_widget_set_usize (text1, 376, 72);

  entry2 = gtk_entry_new ();
  gtk_widget_ref (entry2);
  gtk_object_set_data_full (GTK_OBJECT (window1), "entry2", entry2,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (entry2);
  gtk_fixed_put (GTK_FIXED (fixed3), entry2, 248, 232);
  gtk_widget_set_uposition (entry2, 248, 232);
  gtk_widget_set_usize (entry2, 240, 20);
  gtk_tooltips_set_tip (tooltips, entry2, "Composer of the song", NULL);
  gtk_entry_set_editable (GTK_ENTRY (entry2), FALSE);
  gtk_entry_set_text (GTK_ENTRY (entry2), composer);

  labelAlbum = gtk_label_new ("Album :");
  gtk_widget_ref (labelAlbum);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelAlbum", labelAlbum,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelAlbum);
  gtk_fixed_put (GTK_FIXED (fixed3), labelAlbum, 48, 64);
  gtk_widget_set_uposition (labelAlbum, 48, 64);
  gtk_widget_set_usize (labelAlbum, 55, 18);
  gtk_label_set_justify (GTK_LABEL (labelAlbum), GTK_JUSTIFY_RIGHT);

  entry3 = gtk_entry_new ();
  gtk_widget_ref (entry3);
  gtk_object_set_data_full (GTK_OBJECT (window1), "entry3", entry3,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (entry3);
  gtk_fixed_put (GTK_FIXED (fixed3), entry3, 96, 272);
  gtk_widget_set_uposition (entry3, 96, 272);
  gtk_widget_set_usize (entry3, 145, 20);
  gtk_tooltips_set_tip (tooltips, entry3, "if a remix who's the original artist...", NULL);
  gtk_entry_set_editable (GTK_ENTRY (entry3), FALSE);
  gtk_entry_set_text (GTK_ENTRY (entry3), originalArtist);

  labelTrack = gtk_label_new ("Track :");
  gtk_widget_ref (labelTrack);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelTrack", labelTrack,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelTrack);
  gtk_fixed_put (GTK_FIXED (fixed3), labelTrack, 368, 0);
  gtk_widget_set_uposition (labelTrack, 368, 0);
  gtk_widget_set_usize (labelTrack, 47, 18);

  labelComposer = gtk_label_new ("Composer :");
  gtk_widget_ref (labelComposer);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelComposer", labelComposer,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelComposer);
  gtk_fixed_put (GTK_FIXED (fixed3), labelComposer, 160, 232);
  gtk_widget_set_uposition (labelComposer, 160, 232);
  gtk_widget_set_usize (labelComposer, 78, 18);

  label15 = gtk_label_new ("Comment :");
  gtk_widget_ref (label15);
  gtk_object_set_data_full (GTK_OBJECT (window1), "label15", label15,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (label15);
  gtk_fixed_put (GTK_FIXED (fixed3), label15, 32, 160);
  gtk_widget_set_uposition (label15, 32, 160);
  gtk_widget_set_usize (label15, 72, 18);

  hseparator1 = gtk_hseparator_new ();
  gtk_widget_ref (hseparator1);
  gtk_object_set_data_full (GTK_OBJECT (window1), "hseparator1", hseparator1,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (hseparator1);
  gtk_fixed_put (GTK_FIXED (fixed3), hseparator1, 144, 120);
  gtk_widget_set_uposition (hseparator1, 144, 120);
  gtk_widget_set_usize (hseparator1, 278, 16);

  labelArtist = gtk_label_new ("Artist / Group :");
  gtk_widget_ref (labelArtist);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelArtist", labelArtist,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelArtist);
  gtk_fixed_put (GTK_FIXED (fixed3), labelArtist, 0, 0);
  gtk_widget_set_uposition (labelArtist, 0, 0);
  gtk_widget_set_usize (labelArtist, 106, 18);
  gtk_label_set_justify (GTK_LABEL (labelArtist), GTK_JUSTIFY_RIGHT);

  labelTitle = gtk_label_new ("Title :");
  gtk_widget_ref (labelTitle);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelTitle", labelTitle,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelTitle);
  gtk_fixed_put (GTK_FIXED (fixed3), labelTitle, 62, 36);
  gtk_widget_set_uposition (labelTitle, 62, 36);
  gtk_widget_set_usize (labelTitle, 39, 18);

  label17 = gtk_label_new ("Original Artist :");
  gtk_widget_ref (label17);
  gtk_object_set_data_full (GTK_OBJECT (window1), "label17", label17,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (label17);
  gtk_fixed_put (GTK_FIXED (fixed3), label17, 0, 272);
  gtk_widget_set_uposition (label17, 0, 272);
  gtk_widget_set_usize (label17, 95, 18);

  entry4 = gtk_entry_new ();
  gtk_widget_ref (entry4);
  gtk_object_set_data_full (GTK_OBJECT (window1), "entry4", entry4,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (entry4);
  gtk_fixed_put (GTK_FIXED (fixed3), entry4, 96, 96);
  gtk_widget_set_uposition (entry4, 96, 96);
  gtk_widget_set_usize (entry4, 158, 20);
  gtk_tooltips_set_tip (tooltips, entry4, "Artist Web site", NULL);
  gtk_entry_set_text (GTK_ENTRY (entry4), url);

  label18 = gtk_label_new ("Web site :");
  gtk_widget_ref (label18);
  gtk_object_set_data_full (GTK_OBJECT (window1), "label18", label18,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (label18);
  gtk_fixed_put (GTK_FIXED (fixed3), label18, 24, 96);
  gtk_widget_set_uposition (label18, 24, 96);
  gtk_widget_set_usize (label18, 67, 18);

  labelGenre = gtk_label_new ("Genre :");
  gtk_widget_ref (labelGenre);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelGenre", labelGenre,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelGenre);
  gtk_fixed_put (GTK_FIXED (fixed3), labelGenre, 272, 96);
  gtk_widget_set_uposition (labelGenre, 272, 96);
  gtk_widget_set_usize (labelGenre, 46, 18);

  frame1 = gtk_frame_new ("Infos");
  gtk_widget_ref (frame1);
  gtk_object_set_data_full (GTK_OBJECT (window1), "frame1", frame1,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (frame1);
  gtk_fixed_put (GTK_FIXED (fixed1), frame1, 5, 2);
  gtk_widget_set_uposition (frame1, 5, 2);
  gtk_widget_set_usize (frame1, 436, 96);

  fixed2 = gtk_fixed_new ();
  gtk_widget_ref (fixed2);
  gtk_object_set_data_full (GTK_OBJECT (window1), "fixed2", fixed2,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (fixed2);
  gtk_container_add (GTK_CONTAINER (frame1), fixed2);

  labelaacType = gtk_label_new ("MPEG Type :");
  gtk_widget_ref (labelaacType);
  gtk_object_set_data_full (GTK_OBJECT (window1), "labelaacType", labelaacType,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (labelaacType);
  gtk_fixed_put (GTK_FIXED (fixed2), labelaacType, 32, 16);
  gtk_widget_set_uposition (labelaacType, 32, 16);
  gtk_widget_set_usize (labelaacType, 85, 18);

  label13 = gtk_label_new ("Frame Type :");
  gtk_widget_ref (label13);
  gtk_object_set_data_full (GTK_OBJECT (window1), "label13", label13,
                            (GtkDestroyNotify) gtk_widget_unref);
  gtk_widget_show (label13);
  gtk_fixed_put (GTK_FIXED (fixed2), label13, 32, 40);
  gtk_widget_set_uposition (label13, 32, 40);
  gtk_widget_set_usize (label13, 85, 18);

  gtk_object_set_data (GTK_OBJECT (window1), "tooltips", tooltips);

  return window1;
}

// to don't have Gtk errors...
void updateWindowDatas(void)
{
 if(!title)
	title="";
 if(!artist)
	artist="";
 if(!album)
	album="";
 if(!year)
	year="";
 if(!track)
	track="";
 if(!genre)
	genre="";
 if(!comment)
	comment="";
 if(!composer)
	composer="";
 if(!url)
	url="";
 if(!originalArtist)
	originalArtist="";
 if(!encodedby)
	encodedby="";
}

A plugins/xmms/src/id3.cpp => plugins/xmms/src/id3.cpp +149 -0
@@ 0,0 1,149 @@
/*
** function to read id3tag from aac files
*/

#include <id3/tag.h>
#include <id3/utils.h>
#include <id3/misc_support.h>
#include <id3/readers.h>
#include <stdio.h>

// this is to show the cpp functions to the C interface...
#ifdef __cplusplus
extern "C" {
#endif

void readID3tag(char*);
void clearWindowDatas(void);
extern char *title, *artist, *album, *year, *track, *genre, *comment,
	*composer, *url, *originalArtist, *encodedby;


#ifdef __cplusplus
}
#endif


void readID3tag(char *filename)
{
  ID3_Tag tag;
   tag.Link(filename, ID3TT_ALL);
   ID3_Tag::Iterator	*iter = tag.CreateIterator();
   ID3_Frame		*frame = NULL;

   while((frame = iter->GetNext()) != NULL){
	ID3_FrameID FrameID = frame->GetID();
	switch (FrameID)
	{
	case ID3FID_TITLE:
		{
		title = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_LEADARTIST:
		{
		artist = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_ALBUM:
		{
		album = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_YEAR:
		{
		year = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_TRACKNUM:
		{
		track = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_CONTENTTYPE:
		{
		genre = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_COMMENT:
		{
		comment = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_COMPOSER:
		{
		composer = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_WWWARTIST:
		{
		url = ID3_GetString(frame, ID3FN_URL);
		break;
		}
	case ID3FID_ORIGARTIST:
		{
		originalArtist = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	case ID3FID_ENCODEDBY:
		{
		encodedby = ID3_GetString(frame, ID3FN_TEXT);
		break;
		}
	default:
		break;
	}
   }
   delete iter;
   return;
}

void clearWindowDatas(void)
{
 if(title)
  if(strcmp(title,"")!=0){
     delete [] title;
 }
 if(artist)
  if(strcmp(artist,"")!=0){
        delete [] artist;
 }
 if(album)
  if(strcmp(album,"")!=0){
        delete [] album;
 }
 if(year)
  if(strcmp(year,"")!=0){
        delete [] year;
 }
 if(track)
  if(strcmp(track,"")!=0){
        delete [] track;
 }
 if(genre)
  if(strcmp(genre,"")!=0){
        delete [] genre;
 }
 if(comment)
  if(strcmp(comment,"")!=0){
        delete [] comment;
 }
 if(composer)
  if(strcmp(composer,"")!=0){
        delete [] composer;
 }
 if(url)
  if(strcmp(url,"")!=0){
        delete [] url;
 }
 if(originalArtist)
  if(strcmp(originalArtist,"")!=0){
        delete [] originalArtist;
 }
 if(encodedby)
  if(strcmp(encodedby,"")!=0){
        delete [] encodedby;
 }
 title=artist=album=year=track=genre=comment=composer=url=originalArtist=
        encodedby=0;
}

A plugins/xmms/src/libaac.c => plugins/xmms/src/libaac.c +311 -0
@@ 0,0 1,311 @@
/*
**			  AAC plugin for XMMS 1.2.7
**				by ciberfred
**		------------------------------------------------
** The version of the plugin match the version of XMMS
** for identifie different version use the date :)
**
**			version 1.2.7 (23 august 2002)
**
**
**	       need faad2 package from http://www.audiocoding.com
**
*/

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <pthread.h>
#include <glib.h>
#include <gtk/gtk.h>

#include "faad.h"
#include "xmms/plugin.h"
#include "xmms/util.h"
#include "xmms/configfile.h"
#include "xmms/titlestring.h"

#define AAC_DESCRIPTION	"MPEG2/4 AAC player - 1.2.7"
#define AAC_VERSION	"AAC player - 23 Agust 2002"
#define AAC_ABOUT	"Writen from scratch by ciberfred from France"
#define BUFFER_SIZE	FAAD_MIN_STREAMSIZE*64

static void aac_init(void);
static void aac_play(char*);
static void aac_stop(void);
static void aac_pause(short);
static int  aac_getTime(void);
static void aac_seek(int);
static void aac_cleanup(void);
static void aac_about(void);
static void *aac_decode(void*);

static void aac_getSongInfo(char*);
static int  aac_isFile(char*);

extern void readID3tag(char*);
extern GtkWidget *createDialogInfo(void);
static GtkWidget *infoBoxWindow = NULL;
extern char *title, *artist, *album, *track, *genre;
extern void clearWindowDatas(void);
/******************************************************************************/
/*
** struct need by xmms for Library Interface
*/

InputPlugin aac_ip =
{
	0,		// handle
	0,		// filename
	AAC_DESCRIPTION,// description
	aac_init,	// init_func
	aac_about,	// aboutbox
	0,		// configuration
	aac_isFile,	// ???
	0,		// scan dir
	aac_play,	// when play button
	aac_stop,	// when stop
	aac_pause,	// when pause
	aac_seek,	// when seek
	0,		// set equalizer
	aac_getTime,	// ???
	0,		// get volume
	0,		// set volume
	aac_cleanup,	// the cleanup function :)
	0,		// obsolete (???)
	0,		// send visualisation data
	0,		// set player window info
	0,		// set song title text
	0,	// get song title text to show on Playlist
	aac_getSongInfo,// file info box
	0		// pointer to outputPlugin
};
static gboolean 	bPlaying = FALSE;
static gboolean	bOutputOpen = FALSE;
static pthread_t	decodeThread;
static gint		seek_pos = -1; // the track position
static pthread_mutex_t	mutex = PTHREAD_MUTEX_INITIALIZER;

/******************************************************************************/

InputPlugin	*get_iplugin_info(void)
{
	return (&aac_ip);
}

static void aac_init(void)
{
	memset(&decodeThread, 0, sizeof(pthread_t));
}

static void aac_cleanup(void)
{
}

static void aac_play(char *filename)
{
	printf("play\n");
	bPlaying = TRUE;
	pthread_create(&decodeThread, 0, aac_decode, g_strdup(filename));
	return;
}

static void aac_stop(void)
{
	printf("stop\n");
	if (bPlaying){
		bPlaying = FALSE;
		pthread_join(decodeThread, NULL);
		memset(&decodeThread, 0, sizeof(pthread_t));
		aac_ip.output->close_audio();
		clearWindowDatas();
	}
}

static void aac_pause(short paused)
{
	printf("pause\n");
	if(bOutputOpen){
		aac_ip.output->pause(paused);
	}
}

static int aac_getTime(void)
{
	if (!bPlaying){
		return (-1);
	}
	else{
		return (aac_ip.output->output_time());
	}
}


static void aac_seek(int time)
{
	printf("seek\n");
}

static void aac_getSongInfo(char *filename)
{
	infoBoxWindow = createDialogInfo();
	gtk_widget_show(infoBoxWindow);
}

static void *aac_decode(void *args)
{
	char 			*filename = args;
	char			*xmmstitle=NULL;
	FILE 			*file = NULL;
	faacDecHandle		decoder = 0;
	unsigned char		*buffer = 0;
	unsigned long		bufferconsumed = 0;
	unsigned long		samplerate = 0;
	char			channels;
	unsigned long		buffervalid = 0;
	TitleInput		*input;
	char 			*temp = g_strdup(filename);
	char			*ext  = strrchr(temp, '.');

	printf("decoding...\n");
	pthread_mutex_lock(&mutex);
	clearWindowDatas();
	if ((file = fopen(filename, "rb")) == 0){
		printf("can't find file %s\n", filename);
		pthread_mutex_unlock(&mutex);
		pthread_exit(NULL);
	}
	if ((decoder = faacDecOpen()) == NULL){
		printf("Open Decoder Error\n");
		fclose(file);
		pthread_mutex_unlock(&mutex);
		pthread_exit(NULL);
	}
	if ((buffer = g_malloc(BUFFER_SIZE)) == NULL)
		printf("error g_malloc\n");
	buffervalid = fread(buffer, 1, BUFFER_SIZE, file);
// check for ID3 tag
		XMMS_NEW_TITLEINPUT(input);
		input->file_name = g_basename(temp);
		input->file_ext = ext ? ext+1 : NULL;
		input->file_path = temp;
	if (!strncmp(buffer, "ID3", 3)){
		int size = 0;

		printf("Song with a ID3Tagv2\n");
		readID3tag(filename);
		if(title)
		input->track_name = g_strdup(title);
		if(artist)
		input->performer = g_strdup(artist);
		if(genre)
		input->genre = g_strdup(genre);
		if(track)
		input->track_number = atoi(track);
		fseek(file, 0, SEEK_SET);
/*
** hum .. horrible hack taken from the winamp plugin to jump
** the tag, is there any id3 function to do this ???? hum... seems not :(
*/
		size = (buffer[6]<<21) | (buffer[7]<<14) | (buffer[8]<<7) | buffer[9];
		size+=10;
		fread(buffer, 1, size, file);
		buffervalid = fread(buffer, 1, BUFFER_SIZE, file);
	}
	xmmstitle = xmms_get_titlestring(xmms_get_gentitle_format(), input);
	if(xmmstitle == NULL)
		xmmstitle = g_strdup(input->file_name);
	g_free(temp);
	g_free(input->performer);
	g_free(input->album_name);
	g_free(input->track_name);
	g_free(input->genre);
	g_free(input);
	bufferconsumed = faacDecInit(decoder, buffer, &samplerate, &channels);
//	printf("song with %d channels at %d Hz\n", channels, samplerate);
	if((bOutputOpen = aac_ip.output->open_audio(FMT_S16_NE, samplerate, channels)) == FALSE){
		printf("Output Error\n");
		g_free(buffer);
		buffer=0;
		faacDecClose(decoder);
		fclose(file);
		aac_ip.output->close_audio();
		pthread_mutex_unlock(&mutex);
		pthread_exit(NULL);
	}
	aac_ip.set_info(xmmstitle, -1, -1, samplerate, channels);
	aac_ip.output->flush(0);

	while(bPlaying && buffervalid > 0){
		faacDecFrameInfo	finfo;
		unsigned long		samplesdecoded;
		char			*sample_buffer = NULL;

		if(bufferconsumed > 0){
		memmove(buffer, &buffer[bufferconsumed], buffervalid-bufferconsumed);
			buffervalid -= bufferconsumed;
			buffervalid += fread(&buffer[buffervalid], 1, BUFFER_SIZE-buffervalid, file);
			bufferconsumed = 0;
		}
		sample_buffer = faacDecDecode(decoder, &finfo, buffer);
		if(finfo.error){
			buffervalid = 0;
			printf("FAAD2 Error %s\n", faacDecGetErrorMessage(finfo.error));
			printf("---Use Psystrip.exe on the file to avoid the ADTS error---\n");
		}
		bufferconsumed += finfo.bytesconsumed;
		samplesdecoded = finfo.samples;
		if((samplesdecoded<=0) && !sample_buffer){
			printf("error\n");
		}
		while(bPlaying && aac_ip.output->buffer_free() < (samplesdecoded<<1)){
			xmms_usleep(10000);
		}
		aac_ip.add_vis_pcm(aac_ip.output->written_time(), FMT_S16_LE, channels, samplesdecoded<<1, sample_buffer);
		aac_ip.output->write_audio(sample_buffer, samplesdecoded<<1);
	}
	while(bPlaying && aac_ip.output->buffer_playing()){
		xmms_usleep(10000);
	}
//	aac_ip.output->flush(0);
	aac_ip.output->buffer_free();
	aac_ip.output->close_audio();
	bPlaying = FALSE;
	bOutputOpen = FALSE;
	g_free(buffer);
	faacDecClose(decoder);
	g_free(xmmstitle);
	fclose(file);
	printf("...ended\n");
	seek_pos = -1;
	pthread_mutex_unlock(&mutex);
	pthread_exit(NULL);
}

static int aac_isFile(char *filename)
{
	char *extention = strrchr(filename, '.');
	if (extention && !strcasecmp(extention, ".aac")){
		return (1);
	}
	return(0);
}

static void aac_about(void)
{
	GtkWidget *dialog, *button, *label, *label2;

	dialog = gtk_dialog_new();
	gtk_window_set_title(GTK_WINDOW(dialog), "About FAAD2 plugin");
	label = gtk_label_new(AAC_ABOUT);
	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, TRUE, TRUE, 0);
	gtk_widget_show(label);
	label2 = gtk_label_new(AAC_VERSION);
	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label2, TRUE, TRUE, 0);
	gtk_widget_show(label2);
	button = gtk_button_new_with_label("close");
	gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(dialog));
	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->action_area), button, FALSE, FALSE, 0);
	gtk_widget_show(button);
	gtk_widget_show(dialog);
}