# HG changeset patch # User nenolod # Date 1130306018 25200 # Node ID 8aee6a5bcc7078de57e6e917dfba9f48612f89fd # Parent b1dcf238b2bab278820fcd560d6b5342a09b52f0 [svn] Libmikmod. diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/Makefile.am --- a/Input/Makefile.am Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/Makefile.am Tue Oct 25 22:53:38 2005 -0700 @@ -1,2 +1,2 @@ -ALL_PLUGINS = mpg123 aac vorbis tonegen cdaudio wav +ALL_PLUGINS = mpg123 aac mikmod vorbis tonegen cdaudio wav SUBDIRS = $(INPUT_PLUGINS) diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/Makefile.in --- a/Input/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -139,6 +139,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -167,6 +169,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -262,7 +268,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -ALL_PLUGINS = mpg123 aac vorbis tonegen cdaudio wav +ALL_PLUGINS = mpg123 aac mikmod vorbis tonegen cdaudio wav SUBDIRS = $(INPUT_PLUGINS) all: all-recursive diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/aac/Makefile.in --- a/Input/aac/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/aac/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -139,6 +139,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -167,6 +169,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/aac/libfaad2/Makefile.in --- a/Input/aac/libfaad2/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/aac/libfaad2/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -154,6 +154,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -182,6 +184,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/aac/libmp4v2/Makefile.in --- a/Input/aac/libmp4v2/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/aac/libmp4v2/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -182,6 +182,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -210,6 +212,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/aac/src/Makefile.in --- a/Input/aac/src/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/aac/src/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -156,6 +156,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -184,6 +186,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/cdaudio/Makefile.in --- a/Input/cdaudio/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/cdaudio/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -161,6 +161,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -189,6 +191,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mikmod/COPYING --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/mikmod/COPYING Tue Oct 25 22:53:38 2005 -0700 @@ -0,0 +1,481 @@ + GNU LIBRARY GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the library GPL. It is + numbered 2 because it goes with version 2 of the ordinary GPL.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Library General Public License, applies to some +specially designated Free Software Foundation software, and to any +other libraries whose authors decide to use it. You can use it for +your libraries, 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 library, or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link a program with the library, you must provide +complete object files to the recipients so that they can relink them +with the library, after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + Our method of protecting your rights has two steps: (1) copyright +the library, and (2) offer you this license which gives you legal +permission to copy, distribute and/or modify the library. + + Also, for each distributor's protection, we want to make certain +that everyone understands that there is no warranty for this free +library. If the library is modified by someone else and passed on, we +want its recipients to know that what they have is not the original +version, 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 companies distributing free +software will individually obtain patent licenses, thus in effect +transforming the program into proprietary software. To prevent this, +we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + + Most GNU software, including some libraries, is covered by the ordinary +GNU General Public License, which was designed for utility programs. This +license, the GNU Library General Public License, applies to certain +designated libraries. This license is quite different from the ordinary +one; be sure to read it in full, and don't assume that anything in it is +the same as in the ordinary license. + + The reason we have a separate public license for some libraries is that +they blur the distinction we usually make between modifying or adding to a +program and simply using it. Linking a program with a library, without +changing the library, is in some sense simply using the library, and is +analogous to running a utility program or application program. However, in +a textual and legal sense, the linked executable is a combined work, a +derivative of the original library, and the ordinary General Public License +treats it as such. + + Because of this blurred distinction, using the ordinary General +Public License for libraries did not effectively promote software +sharing, because most developers did not use the libraries. We +concluded that weaker conditions might promote sharing better. + + However, unrestricted linking of non-free programs would deprive the +users of those programs of all benefit from the free status of the +libraries themselves. This Library General Public License is intended to +permit developers of non-free programs to use free libraries, while +preserving your freedom as a user of such programs to change the free +libraries that are incorporated in them. (We have not seen how to achieve +this as regards changes in header files, but we have achieved it as regards +changes in the actual functions of the Library.) The hope is that this +will lead to faster development of free libraries. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, while the latter only +works together with the library. + + Note that it is possible for a library to be covered by the ordinary +General Public License rather than by this special one. + + GNU LIBRARY GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library which +contains a notice placed by the copyright holder or other authorized +party saying it may be distributed under the terms of this Library +General Public License (also called "this License"). Each licensee is +addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also compile or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + c) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + d) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Library 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. 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. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mikmod/Makefile.am --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/mikmod/Makefile.am Tue Oct 25 22:53:38 2005 -0700 @@ -0,0 +1,15 @@ +if HAVE_MIKMOD + +lib_LTLIBRARIES = libmikmod.la + +endif + +libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) + +INCLUDES = @GTK_CFLAGS@ @LIBMIKMOD_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir) +libmikmod_la_LDFLAGS = @PLUGIN_LDFLAGS@ +libmikmod_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ \ +@LIBMIKMOD_LIBS@ @LIBMIKMOD_LDADD@ + +libmikmod_la_SOURCES = drv_xmms.c mikmod-plugin.h plugin.c mikmod.xpm + diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mikmod/Makefile.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/mikmod/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -0,0 +1,571 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +subdir = Input/mikmod +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in COPYING +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intdiv0.m4 \ + $(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \ + $(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/lcmessage.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/stdint_h.m4 \ + $(top_srcdir)/m4/uintmax_t.m4 $(top_srcdir)/m4/ulonglong.m4 \ + $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libmikmod_la_DEPENDENCIES = +am_libmikmod_la_OBJECTS = drv_xmms.lo plugin.lo +libmikmod_la_OBJECTS = $(am_libmikmod_la_OBJECTS) +@HAVE_MIKMOD_TRUE@am_libmikmod_la_rpath = -rpath $(libdir) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(libmikmod_la_SOURCES) +DIST_SOURCES = $(libmikmod_la_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALLOCA = @ALLOCA@ +ALSA_CFLAGS = @ALSA_CFLAGS@ +ALSA_LIBS = @ALSA_LIBS@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +ARCH_DEFINES = @ARCH_DEFINES@ +ARCH_X86_FALSE = @ARCH_X86_FALSE@ +ARCH_X86_TRUE = @ARCH_X86_TRUE@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BEEP_DEFINES = @BEEP_DEFINES@ +BEEP_PATH = @BEEP_PATH@ +BMP_RCPATH = @BMP_RCPATH@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCAS = @CCAS@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EFFECT_PLUGINS = @EFFECT_PLUGINS@ +EFFECT_PLUGIN_DIR = @EFFECT_PLUGIN_DIR@ +EGREP = @EGREP@ +ENABLE_AAC_FALSE = @ENABLE_AAC_FALSE@ +ENABLE_AAC_TRUE = @ENABLE_AAC_TRUE@ +ENABLE_MPG123_FALSE = @ENABLE_MPG123_FALSE@ +ENABLE_MPG123_TRUE = @ENABLE_MPG123_TRUE@ +ESD_CFLAGS = @ESD_CFLAGS@ +ESD_LIBS = @ESD_LIBS@ +EXEEXT = @EXEEXT@ +GCONF_CFLAGS = @GCONF_CFLAGS@ +GCONF_LIBS = @GCONF_LIBS@ +GENCAT = @GENCAT@ +GENERAL_PLUGINS = @GENERAL_PLUGINS@ +GENERAL_PLUGIN_DIR = @GENERAL_PLUGIN_DIR@ +GLIBC21 = @GLIBC21@ +GMSGFMT = @GMSGFMT@ +GNOMEVFS_CFLAGS = @GNOMEVFS_CFLAGS@ +GNOMEVFS_LIBS = @GNOMEVFS_LIBS@ +GTK_CFLAGS = @GTK_CFLAGS@ +GTK_LIBS = @GTK_LIBS@ +HAVE_ALSA_FALSE = @HAVE_ALSA_FALSE@ +HAVE_ALSA_TRUE = @HAVE_ALSA_TRUE@ +HAVE_CDROM_FALSE = @HAVE_CDROM_FALSE@ +HAVE_CDROM_TRUE = @HAVE_CDROM_TRUE@ +HAVE_ESD_FALSE = @HAVE_ESD_FALSE@ +HAVE_ESD_TRUE = @HAVE_ESD_TRUE@ +HAVE_GCONF_FALSE = @HAVE_GCONF_FALSE@ +HAVE_GCONF_TRUE = @HAVE_GCONF_TRUE@ +HAVE_GNOME_VFS_FALSE = @HAVE_GNOME_VFS_FALSE@ +HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ +HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ +HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ +HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ +HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ +HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ +HAVE_OSS_TRUE = @HAVE_OSS_TRUE@ +HAVE_SOLARIS_FALSE = @HAVE_SOLARIS_FALSE@ +HAVE_SOLARIS_TRUE = @HAVE_SOLARIS_TRUE@ +HAVE_SUN_FALSE = @HAVE_SUN_FALSE@ +HAVE_SUN_TRUE = @HAVE_SUN_TRUE@ +ID3LIBS = @ID3LIBS@ +INPUT_PLUGINS = @INPUT_PLUGINS@ +INPUT_PLUGIN_DIR = @INPUT_PLUGIN_DIR@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLBISON = @INTLBISON@ +INTLLIBS = @INTLLIBS@ +INTLOBJS = @INTLOBJS@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LDFLAGS = @LDFLAGS@ +LIBBEEP_MAJOR_VERSION = @LIBBEEP_MAJOR_VERSION@ +LIBBEEP_MICRO_VERSION = @LIBBEEP_MICRO_VERSION@ +LIBBEEP_MINOR_VERSION = @LIBBEEP_MINOR_VERSION@ +LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ +LIBGLADE_LIBS = @LIBGLADE_LIBS@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +OGG_VORBIS_CFLAGS = @OGG_VORBIS_CFLAGS@ +OGG_VORBIS_LIBS = @OGG_VORBIS_LIBS@ +OUTPUT_PLUGINS = @OUTPUT_PLUGINS@ +OUTPUT_PLUGIN_DIR = @OUTPUT_PLUGIN_DIR@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PC_REQUIRES = @PC_REQUIRES@ +PKG_CONFIG = @PKG_CONFIG@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +POSUB = @POSUB@ +RANLIB = @RANLIB@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ +USE_NLS = @USE_NLS@ +USE_SIMD_FALSE = @USE_SIMD_FALSE@ +USE_SIMD_TRUE = @USE_SIMD_TRUE@ +USE_X86ASM_FALSE = @USE_X86ASM_FALSE@ +USE_X86ASM_TRUE = @USE_X86ASM_TRUE@ +VERSION = @VERSION@ +VISUALIZATION_PLUGINS = @VISUALIZATION_PLUGINS@ +VISUALIZATION_PLUGIN_DIR = @VISUALIZATION_PLUGIN_DIR@ +XGETTEXT = @XGETTEXT@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +beepdir = @beepdir@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = $(plugindir)/$(INPUT_PLUGIN_DIR) +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +plugindir = @plugindir@ +pluginsubs = @pluginsubs@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +@HAVE_MIKMOD_TRUE@lib_LTLIBRARIES = libmikmod.la +INCLUDES = @GTK_CFLAGS@ @LIBMIKMOD_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir) +libmikmod_la_LDFLAGS = @PLUGIN_LDFLAGS@ +libmikmod_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ \ +@LIBMIKMOD_LIBS@ @LIBMIKMOD_LDADD@ + +libmikmod_la_SOURCES = drv_xmms.c mikmod-plugin.h plugin.c mikmod.xpm +all: all-am + +.SUFFIXES: +.SUFFIXES: .c .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Input/mikmod/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu Input/mikmod/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libmikmod.la: $(libmikmod_la_OBJECTS) $(libmikmod_la_DEPENDENCIES) + $(LINK) $(am_libmikmod_la_rpath) $(libmikmod_la_LDFLAGS) $(libmikmod_la_OBJECTS) $(libmikmod_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_xmms.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugin.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) +installdirs: + for dir in "$(DESTDIR)$(libdir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: install-libLTLIBRARIES + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-info-am \ + uninstall-libLTLIBRARIES + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mikmod/drv_xmms.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/mikmod/drv_xmms.c Tue Oct 25 22:53:38 2005 -0700 @@ -0,0 +1,155 @@ + +/* MikMod sound library + (c) 1998 Miodrag Vallat and others - see file AUTHORS for complete list + + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Library 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 Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + Modified 2/1/99 for xmms by J. Nick Koston (BlueDraco) + */ + +/*============================================================================== + + $Id: drv_xmms.c,v 1.4 2002/04/27 18:47:08 havard Exp $ + + Output data to xmms + +==============================================================================*/ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef HAVE_UNISTD_H +#include +#endif +#include +#include "libaudacious/util.h" + +#include "mikmod-plugin.h" + +static int buffer_size; + +static SBYTE *audiobuffer = NULL; +extern MIKMODConfig mikmod_cfg; +static short audio_open = FALSE; +gboolean mikmod_xmms_audio_error = FALSE; +extern gboolean mikmod_going; + +static BOOL xmms_IsThere(void) +{ + return 1; +} + +static BOOL xmms_Init(void) +{ + AFormat fmt; + int nch; + + buffer_size = 512; + if (!mikmod_cfg.force8bit) + buffer_size *= 2; + if (!mikmod_cfg.force_mono) + buffer_size *= 2; + if (!(audiobuffer = (SBYTE *) g_malloc0(buffer_size))) + return 1; + + fmt = (md_mode & DMODE_16BITS) ? FMT_S16_NE : FMT_U8; + nch = (md_mode & DMODE_STEREO) ? 2 : 1; + + if (audio_open) + mikmod_ip.output->close_audio(); + + if (!mikmod_ip.output->open_audio(fmt, md_mixfreq, nch)) + { + mikmod_xmms_audio_error = TRUE; + return 1; + } + audio_open = TRUE; + + return VC_Init(); +} + +static void xmms_Exit(void) +{ + VC_Exit(); + if (audiobuffer) + { + g_free(audiobuffer); + audiobuffer = NULL; + } + if (audio_open) + { + mikmod_ip.output->close_audio(); + audio_open = FALSE; + } + +} + +static void xmms_Update(void) +{ + gint length; + + length = VC_WriteBytes((SBYTE *) audiobuffer, buffer_size); + mikmod_ip.add_vis_pcm(mikmod_ip.output->written_time(), mikmod_cfg.force8bit ? FMT_U8 : FMT_S16_NE, mikmod_cfg.force_mono ? 1 : 2, length, audiobuffer); + + while(mikmod_ip.output->buffer_free() < length && mikmod_going) + xmms_usleep(10000); + if(mikmod_going) + mikmod_ip.output->write_audio(audiobuffer, length); + +} + +static BOOL xmms_Reset(void) +{ + VC_Exit(); + return VC_Init(); +} + +MDRIVER drv_xmms = +{ + NULL, + "xmms", + "xmms output driver v1.0", + 0, 255, +#if (LIBMIKMOD_VERSION > 0x030106) + "xmms", + NULL, +#endif + xmms_IsThere, + VC_SampleLoad, + VC_SampleUnload, + VC_SampleSpace, + VC_SampleLength, + xmms_Init, + xmms_Exit, + xmms_Reset, + VC_SetNumVoices, + VC_PlayStart, + VC_PlayStop, + xmms_Update, + NULL, + VC_VoiceSetVolume, + VC_VoiceGetVolume, + VC_VoiceSetFrequency, + VC_VoiceGetFrequency, + VC_VoiceSetPanning, + VC_VoiceGetPanning, + VC_VoicePlay, + VC_VoiceStop, + VC_VoiceStopped, + VC_VoiceGetPosition, + VC_VoiceRealVolume + +}; diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mikmod/mikmod-plugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/mikmod/mikmod-plugin.h Tue Oct 25 22:53:38 2005 -0700 @@ -0,0 +1,37 @@ +#include "config.h" + +#include +#include +#include +#include +#include +#include +#include "audacious/plugin.h" +#include + +extern InputPlugin mikmod_ip; + +enum { + SAMPLE_FREQ_44 = 0, + SAMPLE_FREQ_22, + SAMPLE_FREQ_11, +}; + +typedef struct +{ + gint mixing_freq; + gint volumefadeout; + gint surround; + gint force8bit; + gint hidden_patterns; + gint force_mono; + gint interpolation; + gint def_pansep; +} +MIKMODConfig; + +extern MIKMODConfig mikmod_cfg; + +extern MDRIVER drv_xmms; + + diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mikmod/mikmod.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/mikmod/mikmod.xpm Tue Oct 25 22:53:38 2005 -0700 @@ -0,0 +1,1470 @@ +/* XPM */ +static char * mikmod_xpm[] = { +"100 33 1434 2", +" c None", +". c #8282FC", +"+ c #8181FB", +"@ c #8080FA", +"# c #7F7FF9", +"$ c #8381FB", +"% c #6778F0", +"& c #7E7DF6", +"* c #7F7EFA", +"= c #8381FD", +"- c #8282FB", +"; c #8182FB", +"> c #6877F3", +", c #7E7DF8", +"' c #7F7DF7", +") c #8281FB", +"! c #8482FC", +"~ c #4369E5", +"{ c #275DDC", +"] c #265CDA", +"^ c #265DDB", +"/ c #3760D9", +"( c #7270DF", +"_ c #7E7CF5", +": c #8182FC", +"< c #7C7FF8", +"[ c #5D71EC", +"} c #7B7BF3", +"| c #807FFA", +"1 c #7A80F7", +"2 c #6172EF", +"3 c #7C7BF3", +"4 c #807FF9", +"5 c #767DF8", +"6 c #285EDF", +"7 c #255DDE", +"8 c #4163D8", +"9 c #7273E5", +"0 c #7D7DF7", +"a c #8381FA", +"b c #3F69E5", +"c c #2C5CD5", +"d c #656AD3", +"e c #7C7AF2", +"f c #4C6DEA", +"g c #1F59D5", +"h c #6261C1", +"i c #7474E6", +"j c #8280FC", +"k c #8280FB", +"l c #4367E6", +"m c #0953DC", +"n c #0853DA", +"o c #0D49BA", +"p c #3C3A74", +"q c #7271E2", +"r c #8280FA", +"s c #1659D9", +"t c #375DD1", +"u c #6A6DD6", +"v c #6D7AF5", +"w c #1F5BDE", +"x c #3D59C2", +"y c #5F61C0", +"z c #7A7AF3", +"A c #727AF5", +"B c #0A53DA", +"C c #0952DB", +"D c #183D90", +"E c #45458A", +"F c #7777EE", +"G c #5770EC", +"H c #0F5BDD", +"I c #1A58CF", +"J c #5560C2", +"K c #7976EC", +"L c #8180FB", +"M c #7B80F9", +"N c #3767E5", +"O c #0F5ADA", +"P c #1C4AA9", +"Q c #37366C", +"R c #6F6FDC", +"S c #817FFB", +"T c #5B72ED", +"U c #0F5ADC", +"V c #0B46AD", +"W c #26254F", +"X c #6E6FD9", +"Y c #817FF9", +"Z c #8281F9", +"` c #2E63E1", +" . c #105BDA", +".. c #2356C8", +"+. c #5F64C9", +"@. c #7B7AF1", +"#. c #8183FB", +"$. c #5E74F0", +"%. c #155DDC", +"&. c #1059DF", +"*. c #24336B", +"=. c #494A92", +"-. c #7B7BF4", +";. c #737BF5", +">. c #105ADC", +",. c #1159DD", +"'. c #0B2D6A", +"). c #3A3970", +"!. c #7776EA", +"~. c #6D78F3", +"{. c #105DDC", +"]. c #115CDB", +"^. c #155BD5", +"/. c #425ABE", +"(. c #7470E1", +"_. c #8383FC", +":. c #6D7BF4", +"<. c #2262DE", +"[. c #0F5CDC", +"}. c #122E6C", +"|. c #323468", +"1. c #7373E4", +"2. c #8080FB", +"3. c #6F78F4", +"4. c #125BDA", +"5. c #0D48AC", +"6. c #27244C", +"7. c #6D6DD8", +"8. c #456CE7", +"9. c #115CDC", +"0. c #115CDA", +"a. c #185AD2", +"b. c #4E5EBE", +"c. c #7776EB", +"d. c #8180FA", +"e. c #7F81FB", +"f. c #466CE5", +"g. c #105DDE", +"h. c #1158DA", +"i. c #13182E", +"j. c #5152A3", +"k. c #7D7CF5", +"l. c #747CF5", +"m. c #125CDA", +"n. c #115CDD", +"o. c #0F2659", +"p. c #403F7F", +"q. c #7978EE", +"r. c #7C7EF7", +"s. c #1C63DC", +"t. c #1663DB", +"u. c #1763DA", +"v. c #1762DB", +"w. c #2F5DC2", +"x. c #676AD1", +"y. c #7C7CF6", +"z. c #8281FC", +"A. c #5A76EE", +"B. c #1A64DC", +"C. c #1762DD", +"D. c #1662DC", +"E. c #1564DB", +"F. c #0F1F45", +"G. c #414180", +"H. c #7979EE", +"I. c #8181FC", +"J. c #7B7DF7", +"K. c #1C65DA", +"L. c #124DAA", +"M. c #27234C", +"N. c #6D6ED8", +"O. c #8082FB", +"P. c #5C73EA", +"Q. c #1662DB", +"R. c #1662D8", +"S. c #3D5CC0", +"T. c #6F6EDE", +"U. c #7D7EF8", +"V. c #767EF7", +"W. c #2F6ADF", +"X. c #1364DB", +"Y. c #1354B8", +"Z. c #1A1631", +"`. c #605FBD", +" + c #757DF5", +".+ c #1464DB", +"++ c #132148", +"@+ c #46468C", +"#+ c #7B7AF2", +"$+ c #8180F9", +"%+ c #2B68E1", +"&+ c #1667DD", +"*+ c #1766DD", +"=+ c #1766DC", +"-+ c #2460CD", +";+ c #5B62C6", +">+ c #7A78F0", +",+ c #7F80FA", +"'+ c #4671E8", +")+ c #1664D6", +"!+ c #11152B", +"~+ c #51509E", +"{+ c #7C7CF4", +"]+ c #2E6ADF", +"^+ c #144FAB", +"/+ c #25234B", +"(+ c #6E7AF2", +"_+ c #1764DA", +":+ c #1865DD", +"<+ c #2D5FC7", +"[+ c #6467CE", +"}+ c #7C7AF3", +"|+ c #677AF2", +"1+ c #2269DF", +"2+ c #1865DC", +"3+ c #114493", +"4+ c #212143", +"5+ c #6C6AD3", +"6+ c #757DF7", +"7+ c #1864DC", +"8+ c #111C39", +"9+ c #4F4F9A", +"0+ c #4072E6", +"a+ c #1C6CDF", +"b+ c #1B6CDE", +"c+ c #1B6BDE", +"d+ c #2268D7", +"e+ c #4C5EC0", +"f+ c #7374E5", +"g+ c #7480F7", +"h+ c #3370E1", +"i+ c #1C6BDE", +"j+ c #185DC4", +"k+ c #16152A", +"l+ c #5E5DBA", +"m+ c #4473E6", +"n+ c #1654AF", +"o+ c #26234C", +"p+ c #7B7FF9", +"q+ c #236BDE", +"r+ c #1D6CE0", +"s+ c #2465D0", +"t+ c #5661C4", +"u+ c #7677EB", +"v+ c #827FFA", +"w+ c #5178EC", +"x+ c #1D6CDF", +"y+ c #1C6CE0", +"z+ c #12366F", +"A+ c #2E2F5F", +"B+ c #7372E3", +"C+ c #757EF7", +"D+ c #1D6BDE", +"E+ c #1C69DE", +"F+ c #131830", +"G+ c #5654A9", +"H+ c #7E7DF7", +"I+ c #5677EB", +"J+ c #2071E3", +"K+ c #2171E4", +"L+ c #1F71E0", +"M+ c #206FE1", +"N+ c #3D62C1", +"O+ c #6A6CD9", +"P+ c #7D7CF6", +"Q+ c #667DF3", +"R+ c #2872E4", +"S+ c #1E71E1", +"T+ c #174F9D", +"U+ c #211F3B", +"V+ c #6969CF", +"W+ c #7F7EF9", +"X+ c #5877EC", +"Y+ c #1859B2", +"Z+ c #3472E3", +"`+ c #1F71E3", +" @ c #246FDC", +".@ c #4560C0", +"+@ c #7270E3", +"@@ c #7A80FA", +"#@ c #4177E7", +"$@ c #2170E3", +"%@ c #2171E3", +"&@ c #2070E2", +"*@ c #0F274E", +"=@ c #3E3D78", +"-@ c #7877ED", +";@ c #757FF8", +">@ c #2170E2", +",@ c #1F6AD9", +"'@ c #15172C", +")@ c #5E5BB5", +"!@ c #6B7BF2", +"~@ c #2173E2", +"{@ c #2373E3", +"]@ c #2373E2", +"^@ c #2372E3", +"/@ c #2F67CE", +"(@ c #6066CA", +"_@ c #797BF1", +":@ c #5579ED", +"<@ c #2473E3", +"[@ c #173D7A", +"}@ c #2D2B56", +"|@ c #7270E1", +"1@ c #6B7BF0", +"2@ c #2373E5", +"3@ c #2373E4", +"4@ c #1A5BB2", +"5@ c #27234D", +"6@ c #4676E9", +"7@ c #2173E4", +"8@ c #2172E3", +"9@ c #3964C3", +"0@ c #696AD3", +"a@ c #7E7BF5", +"b@ c #707EF4", +"c@ c #3275E5", +"d@ c #2273E3", +"e@ c #2273E1", +"f@ c #101831", +"g@ c #4D4C97", +"h@ c #8382FB", +"i@ c #757FF7", +"j@ c #2372E4", +"k@ c #2165C8", +"l@ c #191A35", +"m@ c #6462C3", +"n@ c #787EF4", +"o@ c #2B79E3", +"p@ c #297AE4", +"q@ c #287AE5", +"r@ c #2879E4", +"s@ c #287AE4", +"t@ c #297AE5", +"u@ c #287BE4", +"v@ c #2D72D8", +"w@ c #5066C7", +"x@ c #3F7AE6", +"y@ c #2879E6", +"z@ c #287AE6", +"A@ c #2879E2", +"B@ c #142B53", +"C@ c #383D7A", +"D@ c #6976EA", +"E@ c #6D7DF2", +"F@ c #6E7DF3", +"G@ c #6E7EF4", +"H@ c #797AF2", +"I@ c #2A7AE3", +"J@ c #1F61B3", +"K@ c #27234A", +"L@ c #7280F6", +"M@ c #6D7EF3", +"N@ c #787CF5", +"O@ c #597BED", +"P@ c #277AE5", +"Q@ c #2979E5", +"R@ c #2676DD", +"S@ c #277BE3", +"T@ c #267BE5", +"U@ c #2F6ED1", +"V@ c #4C6ED5", +"W@ c #2B7CE5", +"X@ c #277CE5", +"Y@ c #287AE7", +"Z@ c #2978E1", +"`@ c #2878E1", +" # c #2370CE", +".# c #13172F", +"+# c #505DBA", +"@# c #6C7BF0", +"## c #727EF4", +"$# c #7F7EF8", +"%# c #7180F5", +"&# c #6F7EF4", +"*# c #2261B5", +"=# c #1F1F3E", +"-# c #6867CE", +";# c #8381FC", +"># c #7E80F9", +",# c #377BE7", +"'# c #287DE5", +")# c #287DE3", +"!# c #2061B0", +"~# c #1A4985", +"{# c #2A7BE1", +"]# c #277EE4", +"^# c #2A7CE4", +"/# c #277DE5", +"(# c #2A7BE3", +"_# c #205CAB", +":# c #1C4A8A", +"<# c #297CE3", +"[# c #101B36", +"}# c #394F9A", +"|# c #2A7CE3", +"1# c #297DE5", +"2# c #2A7BDF", +"3# c #5253A8", +"4# c #3375DB", +"5# c #287EE3", +"6# c #1F62B3", +"7# c #272449", +"8# c #797FF7", +"9# c #2B7BE2", +"0# c #2D6ECF", +"a# c #5255AB", +"b# c #5C71D9", +"c# c #287DE4", +"d# c #153B6D", +"e# c #225DAB", +"f# c #277CE4", +"g# c #277DE3", +"h# c #2A7BE4", +"i# c #297CE4", +"j# c #2675D7", +"k# c #122D55", +"l# c #266EC5", +"m# c #205DA6", +"n# c #1C2D55", +"o# c #297BE5", +"p# c #297DE3", +"q# c #327BE4", +"r# c #437BE5", +"s# c #5B7AE8", +"t# c #6D7AEE", +"u# c #797BF3", +"v# c #7C80F9", +"w# c #5A7AEA", +"x# c #2C7CE2", +"y# c #2E7CE2", +"z# c #5268CA", +"A# c #7270E0", +"B# c #7D7EF7", +"C# c #757FF6", +"D# c #297CE5", +"E# c #215AA4", +"F# c #25254B", +"G# c #6D6EDA", +"H# c #4581E8", +"I# c #2E84E5", +"J# c #2C83E5", +"K# c #2364AC", +"L# c #1B1A35", +"M# c #3D5BAF", +"N# c #2F7EE0", +"O# c #2D83E6", +"P# c #2D83E5", +"Q# c #2C83E4", +"R# c #2E83E5", +"S# c #2D82E1", +"T# c #1D4A82", +"U# c #111426", +"V# c #2C559B", +"W# c #2D79D5", +"X# c #121427", +"Y# c #4B59AD", +"Z# c #2E84E4", +"`# c #2B84E4", +" $ c #2771C5", +".$ c #222144", +"+$ c #3870C9", +"@$ c #2D83E4", +"#$ c #2366B4", +"$$ c #27244A", +"%$ c #817FF8", +"&$ c #5483EF", +"*$ c #2C84E4", +"=$ c #2B78CE", +"-$ c #14203E", +";$ c #38376E", +">$ c #656FD7", +",$ c #2F84E5", +"'$ c #2E84E6", +")$ c #153766", +"!$ c #303262", +"~$ c #3D69C3", +"{$ c #2C83E3", +"]$ c #2D84E5", +"^$ c #276EC2", +"/$ c #111E38", +"($ c #212144", +"_$ c #2F7AD5", +":$ c #1D4984", +"<$ c #252F5D", +"[$ c #2E83E4", +"}$ c #2F83E3", +"|$ c #3282E2", +"1$ c #427FE5", +"2$ c #577CEA", +"3$ c #677BEC", +"4$ c #787BF5", +"5$ c #7582F7", +"6$ c #6B77E8", +"7$ c #5568CA", +"8$ c #337EDC", +"9$ c #2C7FDA", +"0$ c #4356A3", +"a$ c #7270E2", +"b$ c #807FF8", +"c$ c #7581F6", +"d$ c #205495", +"e$ c #2B2A57", +"f$ c #7070E0", +"g$ c #5682ED", +"h$ c #3085E6", +"i$ c #2F86E6", +"j$ c #2665AD", +"k$ c #262447", +"l$ c #6666CA", +"m$ c #5868CC", +"n$ c #347DDA", +"o$ c #3086E7", +"p$ c #2E86E6", +"q$ c #2D7FDB", +"r$ c #173158", +"s$ c #15182E", +"t$ c #434487", +"u$ c #4A76DB", +"v$ c #2E86E7", +"w$ c #2767AF", +"x$ c #1B1B35", +"y$ c #5E63C4", +"z$ c #3086E5", +"A$ c #225FA7", +"B$ c #252242", +"C$ c #476ECC", +"D$ c #2E86E4", +"E$ c #2669B5", +"F$ c #7D7FF7", +"G$ c #3785E8", +"H$ c #2E80DF", +"I$ c #112745", +"J$ c #232344", +"K$ c #5F5EBC", +"L$ c #3A85E7", +"M$ c #3086E2", +"N$ c #173964", +"O$ c #414285", +"P$ c #6E6EDC", +"Q$ c #516BCB", +"R$ c #3182DE", +"S$ c #2F86E7", +"T$ c #2E85E5", +"U$ c #225EA3", +"V$ c #101528", +"W$ c #2C2D5C", +"X$ c #5F5DBC", +"Y$ c #3783E3", +"Z$ c #19355B", +"`$ c #32386F", +" % c #3184E2", +".% c #1E4E87", +"+% c #1C3E72", +"@% c #21447B", +"#% c #21457C", +"$% c #21467F", +"%% c #244882", +"&% c #284B85", +"*% c #2B4F8E", +"=% c #3558A0", +"-% c #4462BA", +";% c #606DD5", +">% c #7577ED", +",% c #7E7CF7", +"'% c #7680F6", +")% c #5D75DF", +"!% c #6967CE", +"~% c #5F69CC", +"{% c #377AD9", +"]% c #2E7DD8", +"^% c #4855A3", +"/% c #7473E7", +"(% c #8080F9", +"_% c #214C84", +":% c #323368", +"<% c #7575E8", +"[% c #6781F1", +"}% c #338BE5", +"|% c #286BAA", +"1% c #25254A", +"2% c #6F6EDC", +"3% c #797AF4", +"4% c #656BD2", +"5% c #3D7CD7", +"6% c #328BE7", +"7% c #338CE7", +"8% c #2D78C7", +"9% c #13213C", +"0% c #1F203F", +"a% c #51509F", +"b% c #5983EC", +"c% c #348BE6", +"d% c #21528B", +"e% c #27274F", +"f% c #6B6ED9", +"g% c #3A8AE7", +"h% c #348BE5", +"i% c #205185", +"j% c #292B54", +"k% c #5B73D8", +"l% c #328CE5", +"m% c #296DAF", +"n% c #26254B", +"o% c #6D6ED9", +"p% c #6581EF", +"q% c #358CE6", +"r% c #348BE4", +"s% c #1A3C68", +"t% c #1C1A35", +"u% c #5554A5", +"v% c #7B78F1", +"w% c #4B85EA", +"x% c #338CE5", +"y% c #358BE5", +"z% c #183A68", +"A% c #434587", +"B% c #7A79F0", +"C% c #5C6ACF", +"D% c #3882DC", +"E% c #348BE7", +"F% c #358BE6", +"G% c #3389E5", +"H% c #1D487B", +"I% c #131325", +"J% c #3B3974", +"K% c #6866CC", +"L% c #3D8AE8", +"M% c #358BE7", +"N% c #11213F", +"O% c #474689", +"P% c #3B87E6", +"Q% c #172D4E", +"R% c #2F305F", +"S% c #5254A4", +"T% c #5658AC", +"U% c #5658AD", +"V% c #5558AC", +"W% c #5759AE", +"X% c #5759B0", +"Y% c #5A5BB4", +"Z% c #6161C1", +"`% c #646AD0", +" & c #6A74E0", +".& c #7A78F1", +"+& c #767EF5", +"@& c #5177D7", +"#& c #6262C1", +"$& c #7978F0", +"%& c #6A6CD8", +"&& c #4279D5", +"*& c #357FD2", +"=& c #4E59AC", +"-& c #8281FA", +";& c #7980F6", +">& c #338CE6", +",& c #23477A", +"'& c #3B3B75", +")& c #7774EC", +"!& c #7680F5", +"~& c #3891E9", +"{& c #3891EA", +"]& c #2A6EAE", +"^& c #706FDD", +"/& c #7E7CF6", +"(& c #6E6EDE", +"_& c #4475CE", +":& c #3790E8", +"<& c #2966AA", +"[& c #111629", +"}& c #2B2C58", +"|& c #5C5DB8", +"1& c #7979F0", +"2& c #8081F9", +"3& c #5C88EF", +"4& c #3791EA", +"5& c #1D3B63", +"6& c #353569", +"7& c #7674E7", +"8& c #438CEB", +"9& c #3991EA", +"0& c #3791E9", +"a& c #1D406A", +"b& c #36376A", +"c& c #6E77E5", +"d& c #2B6FB1", +"e& c #25254C", +"f& c #6E6ED8", +"g& c #468EEB", +"h& c #3990EA", +"i& c #23548F", +"j& c #151329", +"k& c #4A4A93", +"l& c #7776EC", +"m& c #5C85EF", +"n& c #3691EA", +"o& c #398FE8", +"p& c #1A3D65", +"q& c #817FFC", +"r& c #7B7AF4", +"s& c #666CD2", +"t& c #3E7DD4", +"u& c #3487DB", +"v& c #183156", +"w& c #1A1935", +"x& c #46488C", +"y& c #716FE0", +"z& c #7F7DF9", +"A& c #8081FA", +"B& c #418FEB", +"C& c #368BE1", +"D& c #101328", +"E& c #5755A7", +"F& c #488AEB", +"G& c #1A3355", +"H& c #494991", +"I& c #807EF8", +"J& c #7F7DF8", +"K& c #7F7FF8", +"L& c #6C81F3", +"M& c #6C76E4", +"N& c #7271E1", +"O& c #757FF5", +"P& c #467DD7", +"Q& c #5454A8", +"R& c #7171E1", +"S& c #4975D0", +"T& c #3A7ED2", +"U& c #575BB1", +"V& c #7878EF", +"W& c #7981F7", +"X& c #3991EB", +"Y& c #23416B", +"Z& c #424284", +"`& c #7B79F2", +" * c #3E93EC", +".* c #3993EB", +"+* c #2C70B2", +"@* c #26254C", +"#* c #716FDE", +"$* c #7573E5", +"%* c #5165BD", +"&* c #2B2D57", +"** c #3A3974", +"=* c #6867CD", +"-* c #5D8AF0", +";* c #3994EC", +">* c #152541", +",* c #454586", +"'* c #7A79F1", +")* c #4F8CEE", +"!* c #3A93EB", +"~* c #3993EC", +"{* c #3A93ED", +"]* c #193050", +"^* c #4191EA", +"/* c #2D72B3", +"(* c #25264E", +"_* c #5F73D5", +":* c #3B93EC", +"<* c #3071B7", +"[* c #141426", +"}* c #3D3E7F", +"|* c #6A83F2", +"1* c #3894EB", +"2* c #3B92EA", +"3* c #1B3E62", +"4* c #7E7EF7", +"5* c #706FDE", +"6* c #4A519D", +"7* c #313262", +"8* c #5455A9", +"9* c #7675E8", +"0* c #4390EC", +"a* c #2E77BE", +"b* c #1B1731", +"c* c #6061C2", +"d* c #538BEF", +"e* c #3A93EC", +"f* c #1C3458", +"g* c #4C4992", +"h* c #7B7AF3", +"i* c #8382FC", +"j* c #6289F3", +"k* c #616CD0", +"l* c #6968D1", +"m* c #767DF4", +"n* c #4085DB", +"o* c #47478D", +"p* c #7471E5", +"q* c #817FFA", +"r* c #5473CC", +"s* c #3E7AC9", +"t* c #5E5FBD", +"u* c #7A79EF", +"v* c #7881F7", +"w* c #3B92ED", +"x* c #263C6A", +"y* c #49498F", +"z* c #4C92EB", +"A* c #3D9AE8", +"B* c #2F75B1", +"C* c #262449", +"D* c #6B6BD6", +"E* c #7E7EF8", +"F* c #8183FD", +"G* c #5F8CEF", +"H* c #3B95E5", +"I* c #12152B", +"J* c #5253A3", +"K* c #5A8CEC", +"L* c #3D9AE7", +"M* c #3D99E9", +"N* c #3D98E8", +"O* c #131F38", +"P* c #4D4C98", +"Q* c #7A79F2", +"R* c #4F90EB", +"S* c #3176B0", +"T* c #24264A", +"U* c #4B82D5", +"V* c #3C89D5", +"W* c #1E2544", +"X* c #333568", +"Y* c #6C6BD7", +"Z* c #7880F5", +"`* c #3C99E8", +" = c #3F9AE9", +".= c #1C4061", +"+= c #7777ED", +"@= c #7271DF", +"#= c #7F81FA", +"$= c #4596EA", +"%= c #3C9AE9", +"&= c #286095", +"*= c #252448", +"== c #6C6DD6", +"-= c #6089F1", +";= c #3A9AEA", +">= c #1E375A", +",= c #4B4992", +"'= c #5790ED", +")= c #5661B8", +"!= c #787DF2", +"~= c #3F94E2", +"{= c #3B3C77", +"]= c #6C6AD5", +"^= c #7A78EF", +"/= c #5E70D3", +"(= c #4677C7", +"_= c #6566CA", +":= c #757EF1", +"<= c #3F98EA", +"[= c #28345C", +"}= c #4F509E", +"|= c #5D8FEE", +"1= c #449EEA", +"2= c #3379B4", +"3= c #262549", +"4= c #8183FC", +"5= c #618EF0", +"6= c #3983C7", +"7= c #17192F", +"8= c #5F5FBD", +"9= c #698AF0", +"0= c #439EEA", +"a= c #429EEB", +"b= c #4499E4", +"c= c #111328", +"d= c #5856AD", +"e= c #5E8DEE", +"f= c #357AB3", +"g= c #282E54", +"h= c #4596E2", +"i= c #374882", +"j= c #312F5E", +"k= c #6564C9", +"l= c #7D7DF5", +"m= c #469BEB", +"n= c #469EEB", +"o= c #204264", +"p= c #807FFB", +"q= c #499BEC", +"r= c #24476F", +"s= c #323166", +"t= c #7373E5", +"u= c #6D86F2", +"v= c #419FEC", +"w= c #213A5E", +"x= c #5299F0", +"y= c #48549C", +"z= c #5C5BB4", +"A= c #7980F4", +"B= c #429FEB", +"C= c #313C6E", +"D= c #6361C4", +"E= c #807EFA", +"F= c #7C7BF4", +"G= c #6A71DA", +"H= c #5671C7", +"I= c #6773DA", +"J= c #439EE9", +"K= c #2A2E58", +"L= c #5757AE", +"M= c #698BF0", +"N= c #45A4E9", +"O= c #367CB3", +"P= c #6391F0", +"Q= c #306B9C", +"R= c #212246", +"S= c #6B6BD2", +"T= c #7188F4", +"U= c #44A5EA", +"V= c #44A4EC", +"W= c #3C8AC4", +"X= c #181931", +"Y= c #6261C0", +"Z= c #6B8AF1", +"`= c #46A4EA", +" - c #347DB4", +".- c #2F5581", +"+- c #4D6AB9", +"@- c #3D3C76", +"#- c #5E5CB6", +"$- c #7C7BF2", +"%- c #827FFB", +"&- c #5299EC", +"*- c #47A3E9", +"=- c #204466", +"-- c #424587", +";- c #4B9FEB", +">- c #45A5EA", +",- c #192F4A", +"'- c #424280", +")- c #7485F5", +"!- c #43A4EB", +"~- c #274169", +"{- c #4B4A93", +"]- c #48A3EB", +"^- c #3E4684", +"/- c #5957AF", +"(- c #44A5EB", +"_- c #2F4675", +":- c #5655AB", +"<- c #7D7DF8", +"[- c #7175E5", +"}- c #6575DD", +"|- c #469DE4", +"1- c #2F2E5B", +"2- c #5E5EBD", +"3- c #7586F4", +"4- c #48A7EC", +"5- c #3780B5", +"6- c #27254B", +"7- c #6492F1", +"8- c #48A7EB", +"9- c #265178", +"0- c #7373E3", +"a- c #7884F7", +"b- c #49A8EB", +"c- c #3574AB", +"d- c #212241", +"e- c #6C6AD4", +"f- c #7884F6", +"g- c #3B86BC", +"h- c #2F4C7A", +"i- c #48478E", +"j- c #5C5DB6", +"k- c #7977EE", +"l- c #8380FC", +"m- c #5F95F0", +"n- c #4AA6EC", +"o- c #254871", +"p- c #424486", +"q- c #4EA1EB", +"r- c #48A5E8", +"s- c #141D33", +"t- c #4F4F9D", +"u- c #7C81F7", +"v- c #48A6ED", +"w- c #28436B", +"x- c #4C4A92", +"y- c #7B87F9", +"z- c #49A7EB", +"A- c #303D6C", +"B- c #5957AE", +"C- c #7880F4", +"D- c #47A7EB", +"E- c #335888", +"F- c #767EF2", +"G- c #4898DD", +"H- c #333264", +"I- c #6665C9", +"J- c #7B82F8", +"K- c #50A9ED", +"L- c #3B84B8", +"M- c #27254A", +"N- c #716FDD", +"O- c #6594F1", +"P- c #4EADED", +"Q- c #203955", +"R- c #3E3E7B", +"S- c #7877F0", +"T- c #7A82F8", +"U- c #50AAEB", +"V- c #4CADEC", +"W- c #31618D", +"X- c #292A56", +"Y- c #7170E0", +"Z- c #7E7FF9", +"`- c #50A8EC", +" ; c #3E8EC6", +".; c #22294A", +"+; c #817FFD", +"@; c #6D8EF1", +"#; c #4EABEC", +"$; c #274B6F", +"%; c #7978F1", +"&; c #55A5EE", +"*; c #4298D4", +"=; c #171830", +"-; c #5D5DB8", +";; c #51A9EE", +">; c #2F4974", +",; c #7090F4", +"'; c #4FADEC", +"); c #293760", +"!; c #5654AA", +"~; c #4DACED", +"{; c #366D9D", +"]; c #7B83F7", +"^; c #4C96DC", +"/; c #373A71", +"(; c #696AD2", +"_; c #7F80F9", +":; c #58A9F2", +"<; c #4089BE", +"[; c #29274B", +"}; c #6698F3", +"|; c #52B1F0", +"1; c #19233D", +"2; c #4D4C99", +"3; c #7E80FA", +"4; c #57A9F1", +"5; c #53B0F0", +"6; c #264D71", +"7; c #35376B", +"8; c #7675EA", +"9; c #5BA6F1", +"0; c #438CBF", +"a; c #346491", +"b; c #5B60B9", +"c; c #7A7AF2", +"d; c #7488F5", +"e; c #53B2F2", +"f; c #294F73", +"g; c #434586", +"h; c #57ABF3", +"i; c #3E7FB4", +"j; c #212343", +"k; c #6A68D0", +"l; c #59A8F3", +"m; c #344F7F", +"n; c #4B4A94", +"o; c #8083FC", +"p; c #689AF5", +"q; c #52B2F2", +"r; c #253254", +"s; c #5654A7", +"t; c #7781F5", +"u; c #50B3F4", +"v; c #4186BB", +"w; c #333061", +"x; c #7A86F8", +"y; c #5191D7", +"z; c #3F4080", +"A; c #5FA0F2", +"B; c #448DC7", +"C; c #29284F", +"D; c #6799F5", +"E; c #4FA6E4", +"F; c #1F2042", +"G; c #8081FB", +"H; c #5BA7F3", +"I; c #52B4F4", +"J; c #213856", +"K; c #414181", +"L; c #619EF3", +"M; c #448FC6", +"N; c #2B4369", +"O; c #5497DE", +"P; c #6365C7", +"Q; c #7D81FA", +"R; c #52B3F3", +"S; c #30547E", +"T; c #444587", +"U; c #58ACF4", +"V; c #39699B", +"W; c #2E305C", +"X; c #7370E0", +"Y; c #5FA3F5", +"Z; c #3A568D", +"`; c #4D4D99", +" > c #7B7CF4", +".> c #5FA5F3", +"+> c #54B5F3", +"@> c #212D4D", +"#> c #5655A7", +"$> c #51B5F4", +"%> c #4EA4DC", +"&> c #6D6CD8", +"*> c #7B85F7", +"=> c #568ED7", +"-> c #48488E", +";> c #8082FC", +">> c #6C98F5", +",> c #4995CA", +"'> c #2C2B56", +")> c #6A9CF8", +"!> c #4D93C8", +"~> c #27294D", +"{> c #6767CC", +"]> c #66A4F6", +"^> c #58BDF3", +"/> c #1C263E", +"(> c #4D4D97", +"_> c #8181FA", +":> c #6E95F6", +"<> c #4898CD", +"[> c #2C2955", +"}> c #55A3E1", +"|> c #508ECC", +"1> c #6163C2", +"2> c #7C7AF5", +"3> c #5FB0F5", +"4> c #375A87", +"5> c #5EB3F4", +"6> c #375684", +"7> c #3D3D79", +"8> c #7874ED", +"9> c #6B9FF6", +"0> c #44609C", +"a> c #5151A1", +"b> c #5DB5F5", +"c> c #59BCF5", +"d> c #1F2B46", +"e> c #7883F3", +"f> c #58BCF4", +"g> c #59B8F2", +"h> c #1F2849", +"i> c #6464C8", +"j> c #7D86F7", +"k> c #5B8CDA", +"l> c #7390F6", +"m> c #4C9BD1", +"n> c #31305F", +"o> c #8183FA", +"p> c #6E9DF5", +"q> c #477EB5", +"r> c #343465", +"s> c #7170DF", +"t> c #6C9DF4", +"u> c #56B7EF", +"v> c #181D37", +"w> c #5958AF", +"x> c #778DF8", +"y> c #4DA0D5", +"z> c #32305F", +"A> c #5E7ED2", +"B> c #4C82BF", +"C> c #6463C3", +"D> c #7D7DF6", +"E> c #66A4F5", +"F> c #3B6393", +"G> c #46468A", +"H> c #5FB4F5", +"I> c #384274", +"J> c #4B4B96", +"K> c #7C7AF4", +"L> c #6E99F7", +"M> c #4D68AC", +"N> c #5354A4", +"O> c #7D88FA", +"P> c #59BDF6", +"Q> c #58BEF5", +"R> c #1D2B47", +"S> c #7A82F7", +"T> c #5ABDF4", +"U> c #56BEF4", +"V> c #273A5A", +"W> c #5A58AF", +"X> c #7D87F8", +"Y> c #6186DB", +"Z> c #5657AB", +"`> c #7878EE", +" , c #7C85F7", +"., c #54A3DB", +"+, c #3A3770", +"@, c #6DA2F6", +"#, c #4D6EAE", +"$, c #424181", +"%, c #7297F7", +"&, c #55ABDF", +"*, c #232347", +"=, c #6363C4", +"-, c #7C84F8", +";, c #54A4DC", +">, c #3B3872", +",, c #696DD5", +"', c #61B6F5", +"), c #5DC1F4", +"!, c #4B7AB6", +"~, c #729AF8", +"{, c #446FA6", +"], c #4B4991", +"^, c #60B3F4", +"/, c #3C3D77", +"(, c #5C5BB6", +"_, c #7E7DF9", +":, c #7491F6", +"<, c #5472BC", +"[, c #5858B1", +"}, c #7893F8", +"|, c #5DC4F3", +"1, c #5DC4F4", +"2, c #1D2B46", +"3, c #7A83F5", +"4, c #5DC2F3", +"5, c #5CC3F5", +"6, c #2F5474", +"7, c #7C87F9", +"8, c #6783DD", +"9, c #5E5EBC", +"0, c #60A2E4", +"a, c #464384", +"b, c #70A1F7", +"c, c #5061A9", +"d, c #52529F", +"e, c #7891F7", +"f, c #559BCE", +"g, c #302F60", +"h, c #6B6BD4", +"i, c #7E81F9", +"j, c #62A2E7", +"k, c #474387", +"l, c #716EDE", +"m, c #7198F5", +"n, c #5FC6F2", +"o, c #60C3F2", +"p, c #4D70AF", +"q, c #6A6BD4", +"r, c #7890F8", +"s, c #547BBC", +"t, c #524F9E", +"u, c #63A6EC", +"v, c #47458A", +"w, c #6667CD", +"x, c #7F7FFB", +"y, c #7B8AF5", +"z, c #5E7CD0", +"A, c #73A1F7", +"B, c #60C5F3", +"C, c #60C6F1", +"D, c #7A84F6", +"E, c #60C5F4", +"F, c #60C4F5", +"G, c #3B6F95", +"H, c #404080", +"I, c #7978EF", +"J, c #7B88F9", +"K, c #6C7EDF", +"L, c #6565CA", +"M, c #8180FC", +"N, c #6B9EEA", +"O, c #52509F", +"P, c #7070DF", +"Q, c #749EF9", +"R, c #585DB0", +"S, c #6060BF", +"T, c #7C87F7", +"U, c #5C95CE", +"V, c #7271E3", +"W, c #6C9AEA", +"X, c #5454A6", +"Y, c #7172E0", +"Z, c #7B7EF6", +"`, c #68C6F5", +" ' c #66CFF8", +".' c #66CBF3", +"+' c #4F6AAD", +"@' c #6E6FDC", +"#' c #7D84F9", +"$' c #5E86CC", +"%' c #5758AF", +"&' c #6A99E6", +"*' c #5453A4", +"=' c #7071DF", +"-' c #7E83F6", +";' c #6884DB", +">' c #6565C6", +",' c #7C8AF9", +"'' c #769FF9", +")' c #6BC3F8", +"!' c #66D0F5", +"~' c #67CFF8", +"{' c #60BEE6", +"]' c #5389BD", +"^' c #6D82E4", +"/' c #807EF9", +"(' c #7E89F9", +"_' c #707CE4", +":' c #8282FD", +"<' c #7391F2", +"[' c #7272E3", +"}' c #7694F7", +"|' c #6264C8", +"1' c #6E6CDA", +"2' c #7E80F8", +"3' c #668ADA", +"4' c #5355A6", +"5' c #7676EB", +"6' c #748EEF", +"7' c #6261C4", +"8' c #7473E6", +"9' c #71A4F6", +"0' c #67D3F9", +"a' c #68D3F9", +"b' c #65C8F1", +"c' c #4D65A7", +"d' c #7371E2", +"e' c #6C88E0", +"f' c #6263C4", +"g' c #718AEA", +"h' c #6261C2", +"i' c #817EF9", +"j' c #7182E7", +"k' c #6D6BD7", +"l' c #7E7BF7", +"m' c #7D8CF9", +"n' c #74A5FA", +"o' c #6DBEF6", +"p' c #6BD1F9", +"q' c #69D3F9", +"r' c #68D2F6", +"s' c #1E2C47", +"t' c #5654A8", +"u' c #7B85F5", +"v' c #6AD3F9", +"w' c #6AD2F9", +"x' c #68C3F6", +"y' c #6CA7EE", +"z' c #748AF0", +"A' c #7D7AF1", +"B' c #7D85FA", +"C' c #757AEA", +"D' c #7372E5", +"E' c #6F6EDB", +"F' c #7B87F8", +"G' c #6D6EDC", +"H' c #7675EB", +"I' c #7F81F9", +"J' c #727EE7", +"K' c #7A85F5", +"L' c #7877EF", +"M' c #7D81F8", +"N' c #6BC4F6", +"O' c #63C1E9", +"P' c #5FC0E6", +"Q' c #5CB1D8", +"R' c #4F5CA7", +"S' c #7676E9", +"T' c #767EEE", +"U' c #6F6FDE", +"V' c #7980F2", +"W' c #6F6FDD", +"X' c #7686F4", +"Y' c #6F99EF", +"Z' c #6EB8F6", +"`' c #68C3F4", +" ) c #66C3EE", +".) c #61C2EA", +"+) c #5FC1E6", +"@) c #5FC0E5", +"#) c #5EBFE5", +"$) c #61C0E5", +"%) c #202B47", +"&) c #5755AC", +"*) c #7985F6", +"=) c #6BC8F6", +"-) c #64C1EB", +";) c #62BFE7", +">) c #62BEE5", +",) c #5EC0E5", +"') c #60C1E7", +")) c #62B6E7", +"!) c #689BE8", +"~) c #7582EF", +"{) c #7B78F3", +"]) c #7D7BF5", +"^) c #7D7CF7", +"/) c #424382", +"() c #303163", +"_) c #303263", +":) c #414487", +"<) c #7E7CF8", +"[) c #7F7CFA", +"}) c #6565C7", +"|) c #4D4F9B", +"1) c #3C3E7A", +"2) c #35366B", +"3) c #313263", +"4) c #303162", +"5) c #2E305F", +"6) c #39396F", +"7) c #6664C9", +"8) c #7D79F7", +"9) c #3F4181", +"0) c #2F3162", +"a) c #323367", +"b) c #383972", +"c) c #47468D", +"d) c #5A5DB7", +"e) c #7071E1", +"f) c #7C7CF7", +"g) c #7D7EF9", +"h) c #7775ED", +"i) c #7574E9", +"j) c #7C7AF6", +"k) c #7876EE", +"l) c #7574E7", +"m) c #7775EA", +"n) c #7473E8", +"o) c #7674E9", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + @ @ # + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + ", +"$ % & * = + + - - - - - - - - - - - - - - - - - ; > , ' ) ! ~ { ] ] ^ / ( _ : - - - - < [ } | ) - - - - - - - - - - - - - - - - - - = 1 2 3 4 . - - - - - - - - - - - - - - - - - - - - - - 5 6 7 8 9 0 ", +"a b c d e + ; . . . . . . . . . . . . . + + . + f g h i j k l m n n n o p q @ . . . . r s t u _ + ) + . . . . . . . . . . . . . : ) v w x y z . . . . . . . . . . . . . . . . . . . . . . . A B C D E F ", +"+ G H I J K L + + + + + + + + + + + + + + + M N O P Q R S + T U U U U V W X Y + + + + Z ` ...+.@.) + + + + + + + + + + + + + + #.$.%.&.*.=.-.. + + + + + + + + + + + + + + + + + + + + + + ;.>.,.'.).!.", +". ~.{.].^./.(.0 . + + + + + + + + + + . _.:.<.].[.}.|.1.2.+ 3.4.].].].5.6.7.Y + + + + ; 8.9.0.a.b.c.d.) + + + + + + + + + + #.e.f.g.].h.i.j.k.. + + + + + + + + + + + + + + + + + + + + + + l.m.n.o.p.q.", +". r.s.t.u.v.w.x.y.+ - + + + + + + z.+ $ A.B.C.D.E.F.G.H.I.+ J.K.D.D.D.L.M.N.Y + + + + O.P.Q.D.D.R.S.T.U.+ + + + + + + + I.; V.W.X.v.D.Y.Z.`.4 . + + + + + + + + + + + + + + + + + + + + + + +Q..+++@+#+", +". $+%+&+*+*+=+-+;+>+d.) . . . . . : ,+'+=+*+*+*+)+!+~+{++ . 2.]+*+*+*+^+/+7.Y . . . . + (+_+*+*+*+:+<+[+}+@ . . . . . ) k |+1+2+*+*+*+3+4+5+4 . . . . . . . . . . . . . . . . . . . . . . . 6+7+:+8+9+{+", +". k 0+a+a+a+b+c+d+e+f+| ) + . . ) g+h+i+a+a+a+a+j+k+l+, + . r m+a+a+a+n+o+7.Y . . . . . p+q+a+a+a+a+r+s+t+u+v+) . I.+ L w+x+i+x+a+a+y+z+A+B+L . . . . . . . . . . . . . . . . . . . . . . . C+D+E+F+G+H+", +". + I+J+K+K+K+K+L+M+N+O+P++ + . Q+R+S+K+K+K+K+K+T+U+V+W+I.. - X+K+K+K+Y+M.7.Y . . . . . d.Z+J+K+K+K+K+`+ @.@+@' . ; @@#@$@K+K+K+K+%@&@*@=@-@) . . . . . . . . . . . . . . . . . . . . . . . ;@>@,@'@)@W+", +"I.; !@~@{@{@{@{@{@]@^@/@(@_@4 :@<@{@{@{@{@{@{@{@[@}@|@@ + . . 1@2@3@{@4@5@7.Y I.+ + . . $ 6@7@{@{@{@{@{@]@8@9@0@a@b@c@3@d@{@{@{@{@d@e@f@g@}+h@. . . I.I.I.I.I.I.I.I.I.I.I.I.. . . . I.I.I.I.i@j@k@l@m@# ", +"+ z.n@o@p@q@r@s@s@t@q@u@v@w@x@s@q@y@z@q@A@q@t@t@B@C@D@E@F@G@G@H@I@s@q@J@K@N.Y ; L@F@G@M@N@O@P@q@Q@R@p@q@q@S@T@U@V@W@X@q@q@Y@Z@`@q@t@ #.#+#@###0 $#L z.I.I.. + + + + + + %#&###0 # : + . + + i@t@*#=#-## ", +"+ ;#>#,#'#)#!#~#{#)#)#)#]#^#]#)#)#/#(#_#:#)#<#(#[#}#|#1#1#1#2#3#4#5#)#6#7#7.4 8#9#<#1#0#a#b#c#)#(#d#e#f#g#)#)#)#h#i#)#)#)#j#k#l#)#X@m#n#o#1#p#q#r#s#t#u#U.@ @ . + + + v#w#x#y#z#A#B#+ + + + C#D#E#F#G#@ ", +"+ . d.H#I#J#K#L#M#N#O#P#Q#J#Q#J#R#S#T#U#V#J#J#W#X#Y#Z#`#Q#Q# $.$+$@$J##$$$7.%$&$*$@$=$-$;$>$,$J#'$)$!$~${$]$P#J#@$@$]$P#^$/$($_$J#@$:$<$Q#[$*$]$}$@$I#|$1$2$3$4$, ,+k 5$6$7$8$9$0$a$b$. + + c$I#d$e$f$d.", +"+ . . g$h$i$j$k$l$m$n$o$p$i$i$i$q$r$s$t$u$i$v$w$x$y$z$p$i$i$A$B$C$D$i$E$$$N.F$G$i$H$I$J$K$3 L$i$M$N$O$P$Q$R$S$i$i$i$T$U$V$W$X$Y$i$T$Z$`$ %D$.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%^%/%(%. + c$i$_%:%<%) ", +"- - - [%}%}%|%1%2%3%4%5%6%}%7%8%9%0%a%/%b%}%c%d%e%f%g%h%}%}%i%j%k%l%}%m%n%o%p%q%r%s%t%u%v%@ w%x%y%z%A%B%q.C%D%E%F%G%H%I%J%K%} L%}%M%N%O%P%x%Q%R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&$&%&&&*&=&c.-&- ;&>&,&'&)&- ", +". . . !&~&{&]&n%^&@ /&(&_&:&<&[&}&|&1&2&3&{&4&5&6&7&8&9&0&4&a&b&c&~&{&d&e&f&g&h&i&j&k&l&@ : m&n&o&p&A%B%q&r&s&t&u&v&w&x&y&z&A&B&{&C&D&E&F&{&G&H&$&H+I&' ' J&$#K&L&M&N&O&P&Q&l&k.R&S&T&U&V&d.W&X&Y&Z&`&; ", +". . . K& *.*+*@*#*2.+ W+$*%*&***=*-.+ ; -*.*;*>*,*'*)*!*~*{*]*G.1&^*.*/*(*_*:*<*[*}*q | . . |*1*2*3*A%B%;#+ 4*5*6*7*8*9*4 + A&0*.*a*b*c*d*e*f*g*h*i*. + . . . . j*k*l*m*n*o*p*q*4 <%r*s*t*u*v*w*x*y*h*; ", +". . . d.z*A*B*C*5*2.+ . d.1&D*R&E*+ . F*G*A*H*I*J*k.K*L*M*N*O*P*Q*R*A*S*T*U*V*W*X*Y*E*+ . . Z*`* =.=A%B%z.+ ) 4 +=@=`&+ . + #=$=%=&=*===-=;=>=,=-.) . + + . . . '=)=h !=~={=]=q*) L ^=/=(=_=:=<=[=}=/&. ", +"+ + + A&|=1=2=3=^&2.+ + . d.| L . . + 4=5=1=6=7=8=E*9=0=a=b=c=d=& e=1=f=g=h=i=j=k=l=+ + + + b$m=n=o=A%B%z.+ + + L p=z.) + + A&q=a=r=s=t=u=v=w=,=-.+ + + + + z.) x=y=z=A=B=C=D=E=+ ) L F=G=H=I=J=K=L=' ) ", +"+ + + : M=N=O=1%^&2.+ + + + + + + + + O.P=N=Q=R=S=@ T=U=V=W=X=Y=J&Z=`= -.-+-@-#-$--&+ + + + %-&-*-=---B%;#+ + + + + + + + + A&;->-,-'-^=)-!-~-{--.+ + + + + . ; ]-^-/-Z*(-_-:-<-+ + + + & [-}-|-1-2-$#- ", +"+ + + . 3-4-5-6-#*@ + + + + + + + + + #.7-8-9-j=0-k a-b-b-c-d-e-4 f-8-g-h-i-j-k-) ) + + + + l-m-n-o-p-.&;#+ + + + + + + + + A&q-r-s-t-F=u-v-w-x--.- + + + + ; y-z-A-B-C-D-E-k&#++ + + + + E*F-G-H-I-4 . ", +"+ + + . J-K-L-M-N-@ + + + + + + + + + ; O-P-Q-R-S-l-T-U-V-W-X-Y-@ Z-`- ;.;U%-@+;+ + + + + + I.@;#;$;p-%;z.+ + + + + + + + + r &;*;=;-;H+4 ;;>;,=-.+ + + + + O.,;';);!;Z*~;{;R-l&+ + + + . . ];^;/;(;# . ", +". . . . _;:;<;[;N-2.. . . . . . . . . . };|;1;2;y.; 3;4;5;6;7;8;+ d.9;0;a;b;c;j . . . . . . I.d;e;f;g;$&;#. . . . . . . . . @ h;i;j;k;# S l;m;n;-.. . . . . o;p;q;r;s;t;u;v;w;B+@ + . . . . x;y;z;R 2.. ", +". . . + S A;B;C;#*2.. . . . . . . . . . D;E;F;Y%0 ; G;H;I;J;K;B%. z.L;M;N;O;P;h*L ) . . . . ) Q;R;S;T;$&;#. . . . . . . . . @ U;V;W;X;+ l-Y;Z;`; >- . . . . ; .>+>@>#>t;$>%>3=&># . . . . . *>=>->B++ + ", +". . . . ;>>>,>'>N-2.. . . . . . . . . ) )>!>~>{># . + ]>^>/>(>-.. _>:><>[>}>|>1>2>) . . . . I.@ 3>4>T;$&;#. . . . . . . . . 2.5>6>7>8>) z.9>0>a> >I.. . . . ;>b>c>d>#>e>f>g>h>i># . . . . . j>k>9+!.+ + ", +". . . . ;#l>m>n>N-2.. . . . . . . . . o>p>q>r>s>+ . . t>u>v>w>J&. ;#x>y>z>A>^>B>C>D>. . . . . + E>F>G>'*;#. . . . . . . . . (%H>I>J>K>; $ L>M>N>-.. . . . . O>P>Q>R>s;S>T>U>V>W>E*+ . . . . X>Y>Z>`>+ . ", +"I.I.I.I.) ,.,+,^&2.I.I.I.I.I.I.I.I.I.- @,#,$,!.. + + %,&,*,=,E=I.+ -,;,>,,,',),!,!%<-: . I.+ . ~,{,],'*z.I.I.I.I.I.I.I.I.I.d.^,/,(,_,+ O.:,<,[, >. I.I.I.I.},|,1,2,s;3,4,5,6,P*h*) I.I.I.I.7,8,9,r&+ . ", +"+ + + + z.| 0,a,#*2.+ + + + + + + + + i*b,c,d,z + + + e,f,g,h,Y + - i,j,k,l,m,n,o,p,q,H+. + + + r,s,t,Q*z.+ + + + + + + + + d.u,v,w,x,+ : y,z,9,-.- + + + + A,B,C,2,#>D,E,F,G,H,I,-&+ + + + J,K,L,-.+ + ", +"+ + + + ) M,N,O,P,@ + + + + + + + + + . Q,R,S,P++ + + T,U,H,V,+ + . + W,X,Y,Z,`, '.'+'@'$#. + + #'$'%''*;#+ + + + + + + + + d.&'*'='+ + : -';'>'P+_>- $ ,''')' '!'R>#>D,~' '{']'^'@./'I.I.+ ('_'==, . . ", +"+ + + + z.:'<'`.['d.+ + + + + + + + + z.}'|'1'$#+ + + 2'3'4'5'. + . + 6'7'8'z&9'0'a'b'c'd'# ) + 4 e'f'`&z.+ + + + + + + + + (%g'h'F + + ; i'j'k'l'm'n'o'p'q'q'q'r's't'u'v'a'q'a'w'x'y'z'A'I&B'C'D'W++ + ", +"+ + + + . . u'E'-@d.+ + + + + + + + + ) F'G'H'/'+ + + I'J'w,h*+ + + + K's>L'$+M'N'O'P'Q'R'S'd.+ $+T'U'k.+ + + + + + + + + + ; V'W'F=+ + . ) X'Y'Z'`' ).)+)+)@)#)$)%)&)*)=)-);)>)#),)+)')))!)~)V&@.p=+ + ", +". . . . . . E={)F=_>. . . . . . . . . - # }+P+) . . . ) ])V&E*+ . . . | F=^); b$^&/)()_):)N.$#. . <)2>W+. . . . . . . . . . z./&-.4 + . . I.[)<%})|)1)2)3)4)4)4)5)6)7)8)R 9)0)0)4)4)_)a)b)c)d)e)f)+ . . ", +". . . . . . ) /'@ . . . . . . . . . . + z.q*d.+ . . . . @ q*) . . . . + @ @ . . g)h)i)/%<%j)_>. . ) /'. + . . . . . . . . . . + + + . . . . M,<)k)9*8'l)i l)l)l)i 9*} + /&m)n)l)l)l)l)i)n)o)l&3 # . . . "}; diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mikmod/plugin.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Input/mikmod/plugin.c Tue Oct 25 22:53:38 2005 -0700 @@ -0,0 +1,701 @@ + +/* + libmikmod for xmms + + Modified mikmod lib 2/1/99 for xmms by J. Nick Koston (BlueDraco) + + Current Version 0.9.9 + + Changes: (1) 2/1/99 Inital Build / Release + (2) 2/2/99 Psychotron fixed a small problem w/interfacing + (3) 2/2/99 Shows Channels in spectrum analyzer + (4) 2/2/99 Fixed the infinate loop problem, and the absured channel + value problem, removed the mikmod_going stuff + (5) 2/2/99 Added back in mikmod_going (it is needed) + (6) 2/2/99 Repaired SEGV on playlist goes to next song, bad + printf when the mod cannot be loaded and xmms is in repeat mode. + Also made the absured channel display code work + (7) 2/5/99 Removed some old useless stuff + (8) 2/5/99 Added about -- (doesn't work .. not in xmms yet) + (9) 2/8/99 Added configure -- (about and configure work now w/a2) + + */ + +#include "glib/gi18n.h" +#include "mikmod-plugin.h" +#include "libaudacious/configfile.h" +#include "libaudacious/util.h" +#include "libaudacious/titlestring.h" +#include + +#include "mikmod.xpm" + +static void init(void); +static int is_our_file(char *filename); +extern InputPlugin mikmod_ip; +static void play_file(char *filename); +static int get_time(void); +static void stop(void); +static void *play_loop(void *arg); +static void mod_pause(short p); +static void seek(int time); +static void aboutbox(void); +static void get_song_info(char *filename, char **title, int *length); +static void configure(); +static void config_ok(GtkWidget * widget, gpointer data); + +static pthread_t decode_thread; + +MIKMODConfig mikmod_cfg; +extern gboolean mikmod_xmms_audio_error; + +/* current module */ +static MODULE *mf = NULL; + +/* module parameters */ +static gboolean cfg_extspd = 1; /* Extended Speed enable */ +static gboolean cfg_panning = 1; /* DMP panning enable (8xx effects) */ +static gboolean cfg_wrap = 0; /* auto song-wrapping disable */ +static gboolean cfg_loop = 0; /* allow module to loop */ +gboolean mikmod_going = 1; + +static GtkWidget *Res_16, *Res_8, *Chan_ST, *Chan_MO; + +static GtkWidget *Sample_44, *Sample_22, *Sample_11, *Curious_Check, *Surrond_Check, *Fadeout_Check, *Interp_Check; + +static GtkObject *pansep_adj; + +static GtkWidget *mikmod_conf_window = NULL, *about_window = NULL; + +static void *play_loop(void *arg); +static void config_ok(GtkWidget * widget, gpointer data); + + +static void aboutbox() +{ + GtkWidget *dialog_vbox1; + GtkWidget *hbox1; + GtkWidget *label1; + GtkWidget *dialog_action_area1; + GtkWidget *about_exit; + GtkWidget *pixmapwid; + GdkPixmap *pixmap; + GdkBitmap *mask; + + if (!about_window) + { + about_window = gtk_dialog_new(); + gtk_object_set_data(GTK_OBJECT(about_window), "about_window", about_window); + gtk_window_set_title(GTK_WINDOW(about_window), _("About mikmod plugin")); + gtk_window_set_policy(GTK_WINDOW(about_window), FALSE, FALSE, FALSE); + gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_MOUSE); + gtk_signal_connect(GTK_OBJECT(about_window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &about_window); + gtk_container_border_width(GTK_CONTAINER(about_window), 10); + + dialog_vbox1 = GTK_DIALOG(about_window)->vbox; + gtk_object_set_data(GTK_OBJECT(about_window), "dialog_vbox1", dialog_vbox1); + gtk_widget_show(dialog_vbox1); + gtk_container_border_width(GTK_CONTAINER(dialog_vbox1), 5); + + hbox1 = gtk_hbox_new(FALSE, 0); + gtk_object_set_data(GTK_OBJECT(about_window), "hbox1", hbox1); + gtk_widget_show(hbox1); + gtk_box_pack_start(GTK_BOX(dialog_vbox1), hbox1, TRUE, TRUE, 0); + gtk_container_border_width(GTK_CONTAINER(hbox1), 5); + gtk_widget_realize(about_window); + + pixmap = gdk_pixmap_create_from_xpm_d(about_window->window, &mask, NULL, mikmod_xpm); + pixmapwid = gtk_pixmap_new(pixmap, mask); + + gtk_widget_show(pixmapwid); + gtk_box_pack_start(GTK_BOX(hbox1), pixmapwid, TRUE, TRUE, 0); + + label1 = gtk_label_new(_("Mikmod Plugin\nhttp://www.multimania.com/miodrag/mikmod/\nPorted to xmms by J. Nick Koston")); + gtk_object_set_data(GTK_OBJECT(about_window), "label1", label1); + gtk_widget_show(label1); + gtk_box_pack_start(GTK_BOX(hbox1), label1, TRUE, TRUE, 0); + + dialog_action_area1 = GTK_DIALOG(about_window)->action_area; + gtk_object_set_data(GTK_OBJECT(about_window), "dialog_action_area1", dialog_action_area1); + gtk_widget_show(dialog_action_area1); + gtk_container_border_width(GTK_CONTAINER(dialog_action_area1), 10); + + about_exit = gtk_button_new_with_label(_("Ok")); + gtk_signal_connect_object(GTK_OBJECT(about_exit), "clicked", + GTK_SIGNAL_FUNC + (gtk_widget_destroy), + GTK_OBJECT(about_window)); + + gtk_object_set_data(GTK_OBJECT(about_window), "about_exit", about_exit); + gtk_widget_show(about_exit); + gtk_box_pack_start(GTK_BOX(dialog_action_area1), about_exit, TRUE, TRUE, 0); + + gtk_widget_show(about_window); + } + else + { + gdk_window_raise(about_window->window); + } + +} + +static void stop(void) +{ + if (mikmod_going) + { + mikmod_going = 0; + pthread_join(decode_thread, NULL); + } +} + +static void seek(int time) +{ + /* + We need to seek in pattrens somehow + can't seek by time only by X pattrens on way or the other + + Player_NextPosition (); + Player_PrevPosition (); + + */ + return; +} + +static void mod_pause(short p) +{ + mikmod_ip.output->pause(p); +} + +static int get_time(void) +{ + if (mikmod_xmms_audio_error) + return -2; + if (!mikmod_going) + return -1; + if(!Player_Active() && !mikmod_ip.output->buffer_playing()) + return -1; + return mikmod_ip.output->output_time(); +} + +InputPlugin *get_iplugin_info(void) +{ + mikmod_ip.description = g_strdup_printf(_("MikMod Player %s"), VERSION); + return &mikmod_ip; +} + +static void init(void) +{ + + ConfigFile *cfg; + + md_device = 0; /* standard device: autodetect */ + md_reverb = 0; /* Reverb (max 15) */ + + mikmod_cfg.mixing_freq = SAMPLE_FREQ_44; + mikmod_cfg.volumefadeout = 0; + mikmod_cfg.surround = 0; + mikmod_cfg.force8bit = 0; + mikmod_cfg.hidden_patterns = 0; + mikmod_cfg.force_mono = 0; + mikmod_cfg.interpolation = TRUE; + mikmod_cfg.def_pansep = 64; + + if ((cfg = xmms_cfg_open_default_file()) != NULL) + { + xmms_cfg_read_int(cfg, "MIKMOD", "mixing_freq", &mikmod_cfg.mixing_freq); + xmms_cfg_read_int(cfg, "MIKMOD", "volumefadeout", &mikmod_cfg.volumefadeout); + xmms_cfg_read_int(cfg, "MIKMOD", "surround", &mikmod_cfg.surround); + xmms_cfg_read_int(cfg, "MIKMOD", "force8bit", &mikmod_cfg.force8bit); + xmms_cfg_read_int(cfg, "MIKMOD", "hidden_patterns", &mikmod_cfg.hidden_patterns); + xmms_cfg_read_int(cfg, "MIKMOD", "force_mono", &mikmod_cfg.force_mono); + xmms_cfg_read_int(cfg, "MIKMOD", "interpolation", &mikmod_cfg.interpolation); + + xmms_cfg_read_int(cfg, "MIKMOD", "default_panning", &mikmod_cfg.def_pansep); + xmms_cfg_free(cfg); + } + MikMod_RegisterAllLoaders(); + MikMod_RegisterDriver(&drv_xmms); +} + +static int is_our_file(char *filename) +{ + char *ext, *tmp; + + tmp = strrchr(filename, '/'); + ext = strrchr(filename, '.'); + + if (ext) + { + if (!strcasecmp(ext, ".669")) + return 1; + if (!strcasecmp(ext, ".amf")) + return 1; + if (!strcasecmp(ext, ".dsm")) + return 1; + if (!strcasecmp(ext, ".far")) + return 1; + if (!strcasecmp(ext, ".it")) + return 1; + if (!strcasecmp(ext, ".m15")) + return 1; + if (!strcasecmp(ext, ".med")) + return 1; + if (!strcasecmp(ext, ".mod")) + return 1; + if (!strcasecmp(ext, ".mtm")) + return 1; + if (!strcasecmp(ext, ".s3m")) + return 1; + if (!strcasecmp(ext, ".stm")) + return 1; + if (!strcasecmp(ext, ".ult")) + return 1; + if (!strcasecmp(ext, ".xm")) + return 1; + if (!strcasecmp(ext, ".imf")) + return 1; + if (!strcasecmp(ext, ".gdm")) + return 1; + if (!strcasecmp(ext, ".stx")) + return 1; + } + + if (tmp) + { + if(!strncasecmp("/mod.", tmp, 5)) + return 1; + } + + return 0; +} + +static gchar *get_title(gchar *filename) +{ + TitleInput *input; + gchar *temp, *ext, *title; + + if((temp = Player_LoadTitle(filename)) != NULL) + title = g_strdup(temp); + else + { + XMMS_NEW_TITLEINPUT(input); + + temp = g_strdup(filename); + ext = strrchr(temp, '.'); + if (ext) + *ext = '\0'; + input->file_name = g_basename(temp); + input->file_ext = ext ? ext+1 : NULL; + input->file_path = temp; + + title = xmms_get_titlestring(xmms_get_gentitle_format(), + input); + if ( title == NULL ) + title = g_strdup(input->file_name); + + g_free(temp); + g_free(input); + } + + return title; +} + +static void get_song_info(char *filename, char **title, int *length) +{ + (*title) = get_title(filename); + (*length) = -1; +} + +static void play_file(char *filename) +{ + int cfg_maxchn = 128; + int uservolume = 128; + int channelcnt = 1; + int format = FMT_U8; + FILE *f; + + if(!(f = fopen(filename,"rb"))) + { + mikmod_going = 0; + return; + } + fclose(f); + + mikmod_xmms_audio_error = FALSE; + mikmod_going = 1; + + switch (mikmod_cfg.mixing_freq) + { + case SAMPLE_FREQ_22: + md_mixfreq = 22050; /* 1:2 mixing freq */ + break; + case SAMPLE_FREQ_11: + md_mixfreq = 11025; /* 1:4 mixing freq */ + break; + default: + md_mixfreq = 44100; /* standard mixing freq */ + break; + } + + md_mode = DMODE_SOFT_MUSIC; + if ((mikmod_cfg.surround == 1)) + { + md_mode |= DMODE_SURROUND; + } + if ((mikmod_cfg.force8bit == 0)) + { + format = FMT_S16_NE; + md_mode |= DMODE_16BITS; + } + if ((mikmod_cfg.force_mono == 0)) + { + channelcnt = DMODE_STEREO; + md_mode |= DMODE_STEREO; + } + if ((mikmod_cfg.interpolation == 1)) + { + md_mode |= DMODE_INTERP; + } + md_pansep = mikmod_cfg.def_pansep; + +#if (LIBMIKMOD_VERSION > 0x30106) + MikMod_Init(""); +#else + MikMod_Init(); +#endif + if (!(mf = Player_Load(filename, cfg_maxchn, mikmod_cfg.hidden_patterns))) + { + mikmod_ip.set_info_text(_("Couldn't load mod")); + mikmod_going = 0; + return; + } + mf->extspd = cfg_extspd; + mf->panflag = cfg_panning; + mf->wrap = cfg_wrap; + mf->loop = cfg_loop; + mf->fadeout = mikmod_cfg.volumefadeout; + + Player_Start(mf); + + if (mf->volume > uservolume) + Player_SetVolume(uservolume); + +/* mods are in pattrens .. you need to be able to seek + back the forth from pattrens */ + + mikmod_ip.set_info(mf->songname, -1, ((mf->bpm * 1000)), md_mixfreq, channelcnt); + pthread_create(&decode_thread, NULL, play_loop, NULL); + return; + +} + +static void *play_loop(void *arg) +{ + while (mikmod_going) + { + if (Player_Active()) + drv_xmms.Update(); + else + { + xmms_usleep(10000); + } + + } + Player_Stop(); /* stop playing */ + Player_Free(mf); /* and free the module */ + + mikmod_going = 0; + MikMod_Exit(); + pthread_exit(NULL); +} + +static void configure() +{ + GtkWidget *notebook1, *vbox, *vbox1, *hbox1, *Resolution_Frame, *vbox4; + GSList *resolution_group = NULL, *vbox5_group = NULL; + GtkWidget *Channels_Frame, *vbox5, *Downsample_Frame, *vbox3; + GSList *sample_group = NULL; + GtkWidget *vbox6, *Quality_Label, *Options_Label; + GtkWidget *pansep_label, *pansep_hscale; + GtkWidget *bbox, *ok, *cancel; + + if (!mikmod_conf_window) + { + mikmod_conf_window = gtk_window_new(GTK_WINDOW_DIALOG); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "mikmod_conf_window", mikmod_conf_window); + gtk_window_set_title(GTK_WINDOW(mikmod_conf_window), _("MikMod Configuration")); + gtk_window_set_policy(GTK_WINDOW(mikmod_conf_window), FALSE, FALSE, FALSE); + gtk_window_set_position(GTK_WINDOW(mikmod_conf_window), GTK_WIN_POS_MOUSE); + gtk_signal_connect(GTK_OBJECT(mikmod_conf_window), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &mikmod_conf_window); + gtk_container_border_width(GTK_CONTAINER(mikmod_conf_window), 10); + + vbox = gtk_vbox_new(FALSE, 10); + gtk_container_add(GTK_CONTAINER(mikmod_conf_window), vbox); + + notebook1 = gtk_notebook_new(); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "notebook1", notebook1); + gtk_widget_show(notebook1); + gtk_box_pack_start(GTK_BOX(vbox), notebook1, TRUE, TRUE, 0); + gtk_container_border_width(GTK_CONTAINER(notebook1), 3); + + vbox1 = gtk_vbox_new(FALSE, 0); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "vbox1", vbox1); + gtk_widget_show(vbox1); + + hbox1 = gtk_hbox_new(FALSE, 0); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "hbox1", hbox1); + gtk_widget_show(hbox1); + gtk_box_pack_start(GTK_BOX(vbox1), hbox1, TRUE, TRUE, 0); + + Resolution_Frame = gtk_frame_new(_("Resolution:")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Resolution_Frame", Resolution_Frame); + gtk_widget_show(Resolution_Frame); + gtk_box_pack_start(GTK_BOX(hbox1), Resolution_Frame, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(Resolution_Frame), 5); + + vbox4 = gtk_vbox_new(FALSE, 0); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "vbox4", vbox4); + gtk_widget_show(vbox4); + gtk_container_add(GTK_CONTAINER(Resolution_Frame), vbox4); + + Res_16 = gtk_radio_button_new_with_label(resolution_group, _("16 bit")); + resolution_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Res_16)); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Res_16", Res_16); + gtk_widget_show(Res_16); + gtk_box_pack_start(GTK_BOX(vbox4), Res_16, TRUE, TRUE, 0); + if (mikmod_cfg.force8bit == 0) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Res_16), TRUE); + + Res_8 = gtk_radio_button_new_with_label(resolution_group, _("8 bit")); + resolution_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Res_8)); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Res_8", Res_8); + gtk_widget_show(Res_8); + gtk_box_pack_start(GTK_BOX(vbox4), Res_8, TRUE, TRUE, 0); + if (mikmod_cfg.force8bit == 1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Res_8), TRUE); + + Channels_Frame = gtk_frame_new(_("Channels:")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Channels_Frame", Channels_Frame); + gtk_widget_show(Channels_Frame); + gtk_box_pack_start(GTK_BOX(hbox1), Channels_Frame, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(Channels_Frame), 5); + + vbox5 = gtk_vbox_new(FALSE, 0); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "vbox5", vbox5); + gtk_widget_show(vbox5); + gtk_container_add(GTK_CONTAINER(Channels_Frame), vbox5); + + Chan_ST = gtk_radio_button_new_with_label(vbox5_group, _("Stereo")); + vbox5_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Chan_ST)); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Chan_ST", Chan_ST); + gtk_widget_show(Chan_ST); + gtk_box_pack_start(GTK_BOX(vbox5), Chan_ST, TRUE, TRUE, 0); + if (mikmod_cfg.force_mono == 0) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Chan_ST), TRUE); + + Chan_MO = gtk_radio_button_new_with_label(vbox5_group, _("Mono")); + vbox5_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Chan_MO)); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Chan_MO", Chan_MO); + gtk_widget_show(Chan_MO); + gtk_box_pack_start(GTK_BOX(vbox5), Chan_MO, TRUE, TRUE, 0); + if (mikmod_cfg.force_mono == 1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Chan_MO), TRUE); + + Downsample_Frame = gtk_frame_new(_("Downsample:")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Downsample_Frame", Downsample_Frame); + gtk_widget_show(Downsample_Frame); + gtk_box_pack_start(GTK_BOX(vbox1), Downsample_Frame, TRUE, TRUE, 0); + gtk_container_set_border_width(GTK_CONTAINER(Downsample_Frame), 5); + + vbox3 = gtk_vbox_new(FALSE, 0); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "vbox3", vbox3); + gtk_widget_show(vbox3); + gtk_container_add(GTK_CONTAINER(Downsample_Frame), vbox3); + + Sample_44 = gtk_radio_button_new_with_label(sample_group, _("1:1 (44 kHz)")); + sample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Sample_44)); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Sample_44", Sample_44); + gtk_widget_show(Sample_44); + gtk_box_pack_start(GTK_BOX(vbox3), Sample_44, TRUE, TRUE, 0); + + if (mikmod_cfg.mixing_freq == SAMPLE_FREQ_44) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Sample_44), TRUE); + + Sample_22 = gtk_radio_button_new_with_label(sample_group, _("1:2 (22 kHz)")); + sample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Sample_22)); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Sample_22", Sample_22); + gtk_widget_show(Sample_22); + gtk_box_pack_start(GTK_BOX(vbox3), Sample_22, TRUE, TRUE, 0); + if (mikmod_cfg.mixing_freq == SAMPLE_FREQ_22) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Sample_22), TRUE); + + Sample_11 = gtk_radio_button_new_with_label(sample_group, _("1:4 (11 kHz)")); + sample_group = gtk_radio_button_group(GTK_RADIO_BUTTON(Sample_11)); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Sample_11", Sample_11); + gtk_widget_show(Sample_11); + gtk_box_pack_start(GTK_BOX(vbox3), Sample_11, TRUE, TRUE, 0); + if (mikmod_cfg.mixing_freq == SAMPLE_FREQ_11) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Sample_11), TRUE); + + vbox6 = gtk_vbox_new(FALSE, 0); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "vbox6", vbox6); + gtk_widget_show(vbox6); + + Curious_Check = gtk_check_button_new_with_label(_("Look for hidden patterns in modules ")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Curious_Check", Curious_Check); + gtk_widget_show(Curious_Check); + gtk_box_pack_start(GTK_BOX(vbox6), Curious_Check, TRUE, TRUE, 0); + if (mikmod_cfg.hidden_patterns == 1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Curious_Check), TRUE); + + Surrond_Check = gtk_check_button_new_with_label(_("Use surround mixing")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Surround_Check", Surrond_Check); + gtk_widget_show(Surrond_Check); + gtk_box_pack_start(GTK_BOX(vbox6), Surrond_Check, TRUE, TRUE, 0); + if (mikmod_cfg.surround == 1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Surrond_Check), TRUE); + + Fadeout_Check = gtk_check_button_new_with_label(_("Force volume fade at the end of the module")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Fadeout_Check", Fadeout_Check); + gtk_widget_show(Fadeout_Check); + gtk_box_pack_start(GTK_BOX(vbox6), Fadeout_Check, TRUE, TRUE, 0); + if (mikmod_cfg.volumefadeout == 1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Fadeout_Check), TRUE); + + Interp_Check = gtk_check_button_new_with_label(_("Use interpolation")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Interp_Check", Interp_Check); + gtk_widget_show(Interp_Check); + gtk_box_pack_start(GTK_BOX(vbox6), Interp_Check, TRUE, TRUE, 0); + if (mikmod_cfg.interpolation == 1) + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(Interp_Check), TRUE); + + pansep_label = gtk_label_new(_("Default panning separation")); + gtk_widget_show(pansep_label); + gtk_box_pack_start(GTK_BOX(vbox6), pansep_label, TRUE, TRUE, 0); + + pansep_adj = gtk_adjustment_new(mikmod_cfg.def_pansep, 0.0, 129.0, 1.0, 8.0, 1.0); + pansep_hscale = gtk_hscale_new(GTK_ADJUSTMENT(pansep_adj)); + gtk_scale_set_digits(GTK_SCALE(pansep_hscale), 0); + gtk_scale_set_draw_value(GTK_SCALE(pansep_hscale), TRUE); + gtk_scale_set_value_pos(GTK_SCALE(pansep_hscale), GTK_POS_BOTTOM); + gtk_widget_show(pansep_hscale); + gtk_box_pack_start(GTK_BOX(vbox6), pansep_hscale, TRUE, TRUE, 0); + + Quality_Label = gtk_label_new(_("Quality")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Quality_Label", Quality_Label); + gtk_widget_show(Quality_Label); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook1), vbox1, Quality_Label); + + Options_Label = gtk_label_new(_("Options")); + gtk_object_set_data(GTK_OBJECT(mikmod_conf_window), "Options_Label", Options_Label); + gtk_widget_show(Options_Label); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook1), vbox6, Options_Label); + + bbox = gtk_hbutton_box_new(); + gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END); + gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5); + gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); + + ok = gtk_button_new_with_label(_("Ok")); + gtk_signal_connect(GTK_OBJECT(ok), "clicked", GTK_SIGNAL_FUNC(config_ok), NULL); + GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT); + gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0); + gtk_widget_show(ok); + gtk_widget_grab_default(ok); + + cancel = gtk_button_new_with_label(_("Cancel")); + gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), GTK_OBJECT(mikmod_conf_window)); + GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT); + gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0); + gtk_widget_show(cancel); + + gtk_widget_show(bbox); + + gtk_widget_show(vbox); + gtk_widget_show(mikmod_conf_window); + } + else + { + gdk_window_raise(mikmod_conf_window->window); + } + +} + +static void config_ok(GtkWidget * widget, gpointer data) +{ + ConfigFile *cfg; + gchar *filename; + + if (GTK_TOGGLE_BUTTON(Res_8)->active) + mikmod_cfg.force8bit = 1; + else + mikmod_cfg.force8bit = 0; + + if (GTK_TOGGLE_BUTTON(Chan_MO)->active) + mikmod_cfg.force_mono = 1; + else + mikmod_cfg.force_mono = 0; + + if (GTK_TOGGLE_BUTTON(Sample_22)->active) + mikmod_cfg.mixing_freq = SAMPLE_FREQ_22; + else if (GTK_TOGGLE_BUTTON(Sample_11)->active) + mikmod_cfg.mixing_freq = SAMPLE_FREQ_11; + else + mikmod_cfg.mixing_freq = SAMPLE_FREQ_44; + + + mikmod_cfg.hidden_patterns = GTK_TOGGLE_BUTTON(Curious_Check)->active; + mikmod_cfg.surround = GTK_TOGGLE_BUTTON(Surrond_Check)->active; + mikmod_cfg.volumefadeout = GTK_TOGGLE_BUTTON(Fadeout_Check)->active; + mikmod_cfg.interpolation = GTK_TOGGLE_BUTTON(Interp_Check)->active; + + mikmod_cfg.def_pansep = (guchar)GTK_ADJUSTMENT(pansep_adj)->value; + md_pansep = mikmod_cfg.def_pansep; + + filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL); + cfg = xmms_cfg_open_file(filename); + if (!cfg) + cfg = xmms_cfg_new(); + + xmms_cfg_write_int(cfg, "MIKMOD", "mixing_freq", mikmod_cfg.mixing_freq); + xmms_cfg_write_int(cfg, "MIKMOD", "volumefadeout", mikmod_cfg.volumefadeout); + xmms_cfg_write_int(cfg, "MIKMOD", "surround", mikmod_cfg.surround); + xmms_cfg_write_int(cfg, "MIKMOD", "force8bit", mikmod_cfg.force8bit); + xmms_cfg_write_int(cfg, "MIKMOD", "hidden_patterns", mikmod_cfg.hidden_patterns); + xmms_cfg_write_int(cfg, "MIKMOD", "force_mono", mikmod_cfg.force_mono); + xmms_cfg_write_int(cfg, "MIKMOD", "interpolation", mikmod_cfg.interpolation); + xmms_cfg_write_int(cfg, "MIKMOD", "panning_separation", mikmod_cfg.def_pansep); + + xmms_cfg_write_file(cfg, filename); + xmms_cfg_free(cfg); + g_free(filename); + gtk_widget_destroy(mikmod_conf_window); +} + +InputPlugin mikmod_ip = +{ + NULL, + NULL, + NULL, /* Description */ + init, + aboutbox, + configure, + is_our_file, + NULL, + play_file, + stop, + mod_pause, + seek, + NULL, + get_time, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + get_song_info, + NULL, /* file_info_box */ + NULL +}; diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/mpg123/Makefile.in --- a/Input/mpg123/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/mpg123/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -193,6 +193,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -221,6 +223,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/tonegen/Makefile.in --- a/Input/tonegen/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/tonegen/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -156,6 +156,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -184,6 +186,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/vorbis/Makefile.in --- a/Input/vorbis/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/vorbis/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -160,6 +160,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -188,6 +190,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Input/wav/Makefile.in --- a/Input/wav/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Input/wav/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -156,6 +156,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -184,6 +186,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Makefile.in --- a/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -172,6 +172,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -200,6 +202,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Output/Makefile.in --- a/Output/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Output/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -139,6 +139,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -167,6 +169,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Output/OSS/Makefile.in --- a/Output/OSS/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Output/OSS/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -162,6 +162,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -190,6 +192,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Output/alsa/Makefile.in --- a/Output/alsa/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Output/alsa/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -161,6 +161,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -189,6 +191,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Output/esd/Makefile.in --- a/Output/esd/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Output/esd/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -163,6 +163,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -191,6 +193,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Visualization/Makefile.in --- a/Visualization/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Visualization/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -139,6 +139,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -167,6 +169,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 Visualization/blur_scope/Makefile.in --- a/Visualization/blur_scope/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/Visualization/blur_scope/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -164,6 +164,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -192,6 +194,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 acinclude.m4 --- a/acinclude.m4 Tue Oct 25 22:09:36 2005 -0700 +++ b/acinclude.m4 Tue Oct 25 22:53:38 2005 -0700 @@ -6,3 +6,223 @@ AC_SUBST(PC_REQUIRES) ] ) + +##--## libmikmod.m4 + +# Configure paths for libmikmod +# +# Derived from libmikmod.m4 (Owen Taylor 97-11-3) +# + +dnl AM_PATH_LIBMIKMOD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and +dnl LIBMIKMOD_LDADD +dnl +AC_DEFUN(AM_PATH_LIBMIKMOD, +[dnl +dnl Get the cflags and libraries from the libmikmod-config script +dnl +AC_ARG_WITH(libmikmod-prefix,[ --with-libmikmod-prefix=PFX Prefix where libmikmod is installed (optional)], + libmikmod_config_prefix="$withval", libmikmod_config_prefix="") +AC_ARG_WITH(libmikmod-exec-prefix,[ --with-libmikmod-exec-prefix=PFX Exec prefix where libmikmod is installed (optional)], + libmikmod_config_exec_prefix="$withval", libmikmod_config_exec_prefix="") +AC_ARG_ENABLE(libmikmodtest, [ --disable-libmikmodtest Do not try to compile and run a test libmikmod program], + , enable_libmikmodtest=yes) + + if test x$libmikmod_config_exec_prefix != x ; then + libmikmod_config_args="$libmikmod_config_args --exec-prefix=$libmikmod_config_exec_prefix" + if test x${LIBMIKMOD_CONFIG+set} != xset ; then + LIBMIKMOD_CONFIG=$libmikmod_config_exec_prefix/bin/libmikmod-config + fi + fi + if test x$libmikmod_config_prefix != x ; then + libmikmod_config_args="$libmikmod_config_args --prefix=$libmikmod_config_prefix" + if test x${LIBMIKMOD_CONFIG+set} != xset ; then + LIBMIKMOD_CONFIG=$libmikmod_config_prefix/bin/libmikmod-config + fi + fi + + AC_PATH_PROG(LIBMIKMOD_CONFIG, libmikmod-config, no) + min_libmikmod_version=ifelse([$1], ,3.1.5,$1) + AC_MSG_CHECKING(for libmikmod - version >= $min_libmikmod_version) + no_libmikmod="" + if test "$LIBMIKMOD_CONFIG" = "no" ; then + no_libmikmod=yes + else + LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflags` + LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs` + LIBMIKMOD_LDADD=`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd` + libmikmod_config_major_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\1/'` + libmikmod_config_minor_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\2/'` + libmikmod_config_micro_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\).*/\3/'` + if test "x$enable_libmikmodtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD" + LIBS="$LIBMIKMOD_LIBS $LIBS" +dnl +dnl Now check if the installed libmikmod is sufficiently new. (Also sanity +dnl checks the results of libmikmod-config to some extent +dnl + rm -f conf.mikmodtest + AC_TRY_RUN([ +#include +#include +#include + +char* my_strdup (char *str) +{ + char *new_str; + + if (str) { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } else + new_str = NULL; + + return new_str; +} + +int main() +{ + int major,minor,micro; + int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version; + char *tmp_version; + + system ("touch conf.mikmodtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_libmikmod_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_libmikmod_version"); + exit(1); + } + + libmikmod_major_version=(MikMod_GetVersion()>>16)&255; + libmikmod_minor_version=(MikMod_GetVersion()>> 8)&255; + libmikmod_micro_version=(MikMod_GetVersion() )&255; + + if ((libmikmod_major_version != $libmikmod_config_major_version) || + (libmikmod_minor_version != $libmikmod_config_minor_version) || + (libmikmod_micro_version != $libmikmod_config_micro_version)) + { + printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but libmikmod (%d.%d.%d)\n", + $libmikmod_config_major_version, $libmikmod_config_minor_version, $libmikmod_config_micro_version, + libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version); + printf ("*** was found! If libmikmod-config was correct, then it is best\n"); + printf ("*** to remove the old version of libmikmod. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If libmikmod-config was wrong, set the environment variable LIBMIKMOD_CONFIG\n"); + printf("*** to point to the correct copy of libmikmod-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((libmikmod_major_version != LIBMIKMOD_VERSION_MAJOR) || + (libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) || + (libmikmod_micro_version != LIBMIKMOD_REVISION)) + { + printf("*** libmikmod header files (version %d.%d.%d) do not match\n", + LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION); + printf("*** library (version %d.%d.%d)\n", + libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version); + } + else + { + if ((libmikmod_major_version > major) || + ((libmikmod_major_version == major) && (libmikmod_minor_version > minor)) || + ((libmikmod_major_version == major) && (libmikmod_minor_version == minor) && (libmikmod_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\n", + libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version); + printf("*** You need a version of libmikmod newer than %d.%d.%d.\n", + major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the libmikmod-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of libmikmod, but you can also set the LIBMIKMOD_CONFIG environment to point to the\n"); + printf("*** correct copy of libmikmod-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_libmikmod=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_libmikmod" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$LIBMIKMOD_CONFIG" = "no" ; then + echo "*** The libmikmod-config script installed by libmikmod could not be found" + echo "*** If libmikmod was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBMIKMOD_CONFIG environment variable to the" + echo "*** full path to libmikmod-config." + else + if test -f conf.mikmodtest ; then + : + else + echo "*** Could not run libmikmod test program, checking why..." + CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS" + LIBS="$LIBS $LIBMIKMOD_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return (MikMod_GetVersion()!=0); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libmikmod or finding the wrong" + echo "*** version of libmikmod. If it is not finding libmikmod, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location. Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libmikmod was incorrectly installed" + echo "*** or that you have moved libmikmod since it was installed. In the latter case, you" + echo "*** may want to edit the libmikmod-config script: $LIBMIKMOD_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + LIBMIKMOD_CFLAGS="" + LIBMIKMOD_LIBS="" + LIBMIKMOD_LDADD="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(LIBMIKMOD_CFLAGS) + AC_SUBST(LIBMIKMOD_LIBS) + AC_SUBST(LIBMIKMOD_LDADD) + rm -f conf.mikmodtest +]) + +AC_DEFUN(AC_FIND_FILE, + [ + $3=NO + for i in $2; + do + for j in $1; + do + if test -r "$i/$j"; then + $3=$i + break 2 + fi + done + done + ] +) + diff -r b1dcf238b2ba -r 8aee6a5bcc70 audacious/Makefile.in --- a/audacious/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/audacious/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -202,6 +202,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -230,6 +232,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 audacious/glade/Makefile.in --- a/audacious/glade/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/audacious/glade/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -140,6 +140,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -168,6 +170,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 audacious/images/Makefile.in --- a/audacious/images/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/audacious/images/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -140,6 +140,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -168,6 +170,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 configure --- a/configure Tue Oct 25 22:09:36 2005 -0700 +++ b/configure Tue Oct 25 22:53:38 2005 -0700 @@ -462,7 +462,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBBEEP_MAJOR_VERSION LIBBEEP_MINOR_VERSION LIBBEEP_MICRO_VERSION MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS LN_S ECHO AR ac_ct_AR CXXCPP LIBTOOL BEEP_PATH BMP_RCPATH EFFECT_PLUGINS GENERAL_PLUGINS INPUT_PLUGINS OUTPUT_PLUGINS VISUALIZATION_PLUGINS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG GTK_CFLAGS GTK_LIBS PC_REQUIRES LIBGLADE_CFLAGS LIBGLADE_LIBS USE_SIMD_TRUE USE_SIMD_FALSE GCONF_CFLAGS GCONF_LIBS HAVE_GCONF_TRUE HAVE_GCONF_FALSE GNOMEVFS_CFLAGS GNOMEVFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ENABLE_MPG123_TRUE ENABLE_MPG123_FALSE ID3LIBS OGG_VORBIS_CFLAGS OGG_VORBIS_LIBS HAVE_OGGVORBIS_TRUE HAVE_OGGVORBIS_FALSE ENABLE_AAC_TRUE ENABLE_AAC_FALSE HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_CDROM_TRUE HAVE_CDROM_FALSE HAVE_LINUX_JOYSTICK_TRUE HAVE_LINUX_JOYSTICK_FALSE ARCH_DEFINES ARCH_X86_TRUE ARCH_X86_FALSE USE_X86ASM_TRUE USE_X86ASM_FALSE HAVE_SOLARIS_TRUE HAVE_SOLARIS_FALSE HAVE_SUN_TRUE HAVE_SUN_FALSE plugindir INPUT_PLUGIN_DIR OUTPUT_PLUGIN_DIR EFFECT_PLUGIN_DIR GENERAL_PLUGIN_DIR VISUALIZATION_PLUGIN_DIR pluginsubs localedir BEEP_DEFINES PLUGIN_LDFLAGS beepdir LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar LIBBEEP_MAJOR_VERSION LIBBEEP_MINOR_VERSION LIBBEEP_MICRO_VERSION MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS LN_S ECHO AR ac_ct_AR CXXCPP LIBTOOL BEEP_PATH BMP_RCPATH EFFECT_PLUGINS GENERAL_PLUGINS INPUT_PLUGINS OUTPUT_PLUGINS VISUALIZATION_PLUGINS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG GTK_CFLAGS GTK_LIBS PC_REQUIRES LIBGLADE_CFLAGS LIBGLADE_LIBS USE_SIMD_TRUE USE_SIMD_FALSE GCONF_CFLAGS GCONF_LIBS HAVE_GCONF_TRUE HAVE_GCONF_FALSE GNOMEVFS_CFLAGS GNOMEVFS_LIBS HAVE_GNOME_VFS_TRUE HAVE_GNOME_VFS_FALSE ESD_CFLAGS ESD_LIBS HAVE_ESD_TRUE HAVE_ESD_FALSE ENABLE_MPG123_TRUE ENABLE_MPG123_FALSE ID3LIBS OGG_VORBIS_CFLAGS OGG_VORBIS_LIBS HAVE_OGGVORBIS_TRUE HAVE_OGGVORBIS_FALSE ENABLE_AAC_TRUE ENABLE_AAC_FALSE LIBMIKMOD_CONFIG LIBMIKMOD_CFLAGS LIBMIKMOD_LIBS LIBMIKMOD_LDADD HAVE_MIKMOD_TRUE HAVE_MIKMOD_FALSE HAVE_OSS_TRUE HAVE_OSS_FALSE ALSA_CFLAGS ALSA_LIBS HAVE_ALSA_TRUE HAVE_ALSA_FALSE HAVE_CDROM_TRUE HAVE_CDROM_FALSE HAVE_LINUX_JOYSTICK_TRUE HAVE_LINUX_JOYSTICK_FALSE ARCH_DEFINES ARCH_X86_TRUE ARCH_X86_FALSE USE_X86ASM_TRUE USE_X86ASM_FALSE HAVE_SOLARIS_TRUE HAVE_SOLARIS_FALSE HAVE_SUN_TRUE HAVE_SUN_FALSE plugindir INPUT_PLUGIN_DIR OUTPUT_PLUGIN_DIR EFFECT_PLUGIN_DIR GENERAL_PLUGIN_DIR VISUALIZATION_PLUGIN_DIR pluginsubs localedir BEEP_DEFINES PLUGIN_LDFLAGS beepdir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1049,6 +1049,8 @@ --disable-mp3 disable mp3 plugin. default=enabled --disable-vorbis disable Ogg Vorbis input plugin (default=enabled) --disable-aac disable aac plugin. default=enabled + --disable-mikmod Disable mikmod input plugin default=enabled + --disable-libmikmodtest Do not try to compile and run a test libmikmod program --disable-oss disable the OSS output plugin --disable-alsa disable ALSA input plugin (default=enabled) @@ -1073,6 +1075,8 @@ --with-cdda-dir=path Path to default cdaudio directory. --with-xmms-eq Use old XMMS equalization code. --with-x use the X Window System + --with-libmikmod-prefix=PFX Prefix where libmikmod is installed (optional) + --with-libmikmod-exec-prefix=PFX Exec prefix where libmikmod is installed (optional) Some influential environment variables: CC C compiler command @@ -9297,7 +9301,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 9300 "configure"' > conftest.$ac_ext + echo '#line 9304 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10760,11 +10764,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10763: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10767: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10767: \$? = $ac_status" >&5 + echo "$as_me:10771: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11003,11 +11007,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11006: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11010: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11010: \$? = $ac_status" >&5 + echo "$as_me:11014: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11063,11 +11067,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11066: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11070: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11070: \$? = $ac_status" >&5 + echo "$as_me:11074: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13248,7 +13252,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:15546: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15546: \$? = $ac_status" >&5 + echo "$as_me:15550: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15599,11 +15603,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15602: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15606: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15606: \$? = $ac_status" >&5 + echo "$as_me:15610: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16960,7 +16964,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:17902: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17902: \$? = $ac_status" >&5 + echo "$as_me:17906: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17955,11 +17959,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17958: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17962: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17962: \$? = $ac_status" >&5 + echo "$as_me:17966: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19990,11 +19994,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19993: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19997: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19997: \$? = $ac_status" >&5 + echo "$as_me:20001: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -20233,11 +20237,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20236: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20240: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:20240: \$? = $ac_status" >&5 + echo "$as_me:20244: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -20293,11 +20297,11 @@ -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:20296: $lt_compile\"" >&5) + (eval echo "\"\$as_me:20300: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:20300: \$? = $ac_status" >&5 + echo "$as_me:20304: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -22478,7 +22482,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_LIBMIKMOD_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $LIBMIKMOD_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_LIBMIKMOD_CONFIG="$LIBMIKMOD_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_LIBMIKMOD_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_LIBMIKMOD_CONFIG" && ac_cv_path_LIBMIKMOD_CONFIG="no" + ;; +esac +fi +LIBMIKMOD_CONFIG=$ac_cv_path_LIBMIKMOD_CONFIG + +if test -n "$LIBMIKMOD_CONFIG"; then + echo "$as_me:$LINENO: result: $LIBMIKMOD_CONFIG" >&5 +echo "${ECHO_T}$LIBMIKMOD_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + min_libmikmod_version=3.1.5 + echo "$as_me:$LINENO: checking for libmikmod - version >= $min_libmikmod_version" >&5 +echo $ECHO_N "checking for libmikmod - version >= $min_libmikmod_version... $ECHO_C" >&6 + no_libmikmod="" + if test "$LIBMIKMOD_CONFIG" = "no" ; then + no_libmikmod=yes + else + LIBMIKMOD_CFLAGS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --cflags` + LIBMIKMOD_LIBS=`$LIBMIKMOD_CONFIG $libmikmod_config_args --libs` + LIBMIKMOD_LDADD=`$LIBMIKMOD_CONFIG $libmikmod_config_args --ldadd` + libmikmod_config_major_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'` + libmikmod_config_minor_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'` + libmikmod_config_micro_version=`$LIBMIKMOD_CONFIG $libmikmod_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'` + if test "x$enable_libmikmodtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS $LIBMIKMOD_LDADD" + LIBS="$LIBMIKMOD_LIBS $LIBS" + rm -f conf.mikmodtest + if test "$cross_compiling" = yes; then + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include +#include + +char* my_strdup (char *str) +{ + char *new_str; + + if (str) { + new_str = malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } else + new_str = NULL; + + return new_str; +} + +int main() +{ + int major,minor,micro; + int libmikmod_major_version,libmikmod_minor_version,libmikmod_micro_version; + char *tmp_version; + + system ("touch conf.mikmodtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_libmikmod_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_libmikmod_version"); + exit(1); + } + + libmikmod_major_version=(MikMod_GetVersion()>>16)&255; + libmikmod_minor_version=(MikMod_GetVersion()>> 8)&255; + libmikmod_micro_version=(MikMod_GetVersion() )&255; + + if ((libmikmod_major_version != $libmikmod_config_major_version) || + (libmikmod_minor_version != $libmikmod_config_minor_version) || + (libmikmod_micro_version != $libmikmod_config_micro_version)) + { + printf("\n*** 'libmikmod-config --version' returned %d.%d.%d, but libmikmod (%d.%d.%d)\n", + $libmikmod_config_major_version, $libmikmod_config_minor_version, $libmikmod_config_micro_version, + libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version); + printf ("*** was found! If libmikmod-config was correct, then it is best\n"); + printf ("*** to remove the old version of libmikmod. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If libmikmod-config was wrong, set the environment variable LIBMIKMOD_CONFIG\n"); + printf("*** to point to the correct copy of libmikmod-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((libmikmod_major_version != LIBMIKMOD_VERSION_MAJOR) || + (libmikmod_minor_version != LIBMIKMOD_VERSION_MINOR) || + (libmikmod_micro_version != LIBMIKMOD_REVISION)) + { + printf("*** libmikmod header files (version %d.%d.%d) do not match\n", + LIBMIKMOD_VERSION_MAJOR, LIBMIKMOD_VERSION_MINOR, LIBMIKMOD_REVISION); + printf("*** library (version %d.%d.%d)\n", + libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version); + } + else + { + if ((libmikmod_major_version > major) || + ((libmikmod_major_version == major) && (libmikmod_minor_version > minor)) || + ((libmikmod_major_version == major) && (libmikmod_minor_version == minor) && (libmikmod_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of libmikmod (%d.%d.%d) was found.\n", + libmikmod_major_version, libmikmod_minor_version, libmikmod_micro_version); + printf("*** You need a version of libmikmod newer than %d.%d.%d.\n", + major, minor, micro); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the libmikmod-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of libmikmod, but you can also set the LIBMIKMOD_CONFIG environment to point to the\n"); + printf("*** correct copy of libmikmod-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +no_libmikmod=yes +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_libmikmod" = x ; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + have_mikmod=yes + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + if test "$LIBMIKMOD_CONFIG" = "no" ; then + echo "*** The libmikmod-config script installed by libmikmod could not be found" + echo "*** If libmikmod was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the LIBMIKMOD_CONFIG environment variable to the" + echo "*** full path to libmikmod-config." + else + if test -f conf.mikmodtest ; then + : + else + echo "*** Could not run libmikmod test program, checking why..." + CFLAGS="$CFLAGS $LIBMIKMOD_CFLAGS" + LIBS="$LIBS $LIBMIKMOD_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + return (MikMod_GetVersion()!=0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding libmikmod or finding the wrong" + echo "*** version of libmikmod. If it is not finding libmikmod, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location. Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means libmikmod was incorrectly installed" + echo "*** or that you have moved libmikmod since it was installed. In the latter case, you" + echo "*** may want to edit the libmikmod-config script: $LIBMIKMOD_CONFIG" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + LIBMIKMOD_CFLAGS="" + LIBMIKMOD_LIBS="" + LIBMIKMOD_LDADD="" + have_mikmod=no + fi + + + + rm -f conf.mikmodtest + +else + echo "$as_me:$LINENO: result: *** mikmod plugin disabled per user request ***" >&5 +echo "${ECHO_T}*** mikmod plugin disabled per user request ***" >&6 + have_mikmod=no +fi + + +if test "x$have_mikmod" = xyes; then + HAVE_MIKMOD_TRUE= + HAVE_MIKMOD_FALSE='#' +else + HAVE_MIKMOD_TRUE='#' + HAVE_MIKMOD_FALSE= +fi + + + # Check whether --enable-oss or --disable-oss was given. if test "${enable_oss+set}" = set; then @@ -28907,7 +29254,7 @@ - ac_config_files="$ac_config_files Makefile audacious.1 audacious.spec audacious.pc audacious/audacious.desktop audacious/Makefile audacious/glade/Makefile audacious/images/Makefile libaudacious/Makefile libvisual/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/alsa/Makefile Input/Makefile Input/mpg123/Makefile Input/aac/Makefile Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/aac/src/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile Input/wav/Makefile Visualization/Makefile Visualization/blur_scope/Makefile po/Makefile.in intl/Makefile icons/Makefile skin/Makefile" + ac_config_files="$ac_config_files Makefile audacious.1 audacious.spec audacious.pc audacious/audacious.desktop audacious/Makefile audacious/glade/Makefile audacious/images/Makefile libaudacious/Makefile libvisual/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/alsa/Makefile Input/Makefile Input/mpg123/Makefile Input/aac/Makefile Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/aac/src/Makefile Input/mikmod/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile Input/wav/Makefile Visualization/Makefile Visualization/blur_scope/Makefile po/Makefile.in intl/Makefile icons/Makefile skin/Makefile" cat >confcache <<\_ACEOF @@ -29071,6 +29418,13 @@ Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${HAVE_MIKMOD_TRUE}" && test -z "${HAVE_MIKMOD_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"HAVE_MIKMOD\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"HAVE_MIKMOD\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_OSS_TRUE}" && test -z "${HAVE_OSS_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_OSS\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -29598,6 +29952,7 @@ "Input/aac/libmp4v2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/libmp4v2/Makefile" ;; "Input/aac/libfaad2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/libfaad2/Makefile" ;; "Input/aac/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/src/Makefile" ;; + "Input/mikmod/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/mikmod/Makefile" ;; "Input/tonegen/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/tonegen/Makefile" ;; "Input/vorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/vorbis/Makefile" ;; "Input/cdaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/cdaudio/Makefile" ;; @@ -29830,6 +30185,12 @@ s,@HAVE_OGGVORBIS_FALSE@,$HAVE_OGGVORBIS_FALSE,;t t s,@ENABLE_AAC_TRUE@,$ENABLE_AAC_TRUE,;t t s,@ENABLE_AAC_FALSE@,$ENABLE_AAC_FALSE,;t t +s,@LIBMIKMOD_CONFIG@,$LIBMIKMOD_CONFIG,;t t +s,@LIBMIKMOD_CFLAGS@,$LIBMIKMOD_CFLAGS,;t t +s,@LIBMIKMOD_LIBS@,$LIBMIKMOD_LIBS,;t t +s,@LIBMIKMOD_LDADD@,$LIBMIKMOD_LDADD,;t t +s,@HAVE_MIKMOD_TRUE@,$HAVE_MIKMOD_TRUE,;t t +s,@HAVE_MIKMOD_FALSE@,$HAVE_MIKMOD_FALSE,;t t s,@HAVE_OSS_TRUE@,$HAVE_OSS_TRUE,;t t s,@HAVE_OSS_FALSE@,$HAVE_OSS_FALSE,;t t s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t @@ -30714,6 +31075,7 @@ echo " MPEG 1/2/3 (mpg123): $enable_mp3" echo " + id3v2 editing: $have_id3lib" echo " MPEG 4 Audio (AAC): $enable_aac" +echo " Module decoder (mikmod): $enable_mikmod" echo " CD Digital Audio (cdda): yes" echo " Microsoft WAV (wav): yes" echo " Tone Generator: yes" @@ -30725,7 +31087,7 @@ echo if test "$beep_cv_lib_xlibs_threadsafe" = "no"; then - echo "Note: You need to have thread-safe xlibs to use beep." + echo "Note: You need to have thread-safe xlibs to use Audacious." echo "If you are using libc5 thread aware Xlibs just skip this." echo "" echo "If you don't have those libs and you are on a libc5 system get them at:" diff -r b1dcf238b2ba -r 8aee6a5bcc70 configure.ac --- a/configure.ac Tue Oct 25 22:09:36 2005 -0700 +++ b/configure.ac Tue Oct 25 22:53:38 2005 -0700 @@ -337,6 +337,20 @@ AM_CONDITIONAL(ENABLE_AAC, test "$enable_aac" = "yes") +dnl *** mikmod +AC_ARG_ENABLE( mikmod, +[ --disable-mikmod Disable mikmod input plugin [default=enabled]],, + enable_mikmod="yes") + +if test "x$enable_mikmod" = xyes; then + AM_PATH_LIBMIKMOD(3.1.5,have_mikmod=yes, have_mikmod=no) +else + AC_MSG_RESULT([*** mikmod plugin disabled per user request ***]) + have_mikmod=no +fi +AM_CONDITIONAL(HAVE_MIKMOD,test "x$have_mikmod" = xyes) + + dnl *** OSS output AC_ARG_ENABLE(oss, @@ -603,6 +617,7 @@ Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/aac/src/Makefile + Input/mikmod/Makefile Input/tonegen/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile @@ -652,6 +667,7 @@ echo " MPEG 1/2/3 (mpg123): $enable_mp3" echo " + id3v2 editing: $have_id3lib" echo " MPEG 4 Audio (AAC): $enable_aac" +echo " Module decoder (mikmod): $enable_mikmod" echo " CD Digital Audio (cdda): yes" echo " Microsoft WAV (wav): yes" echo " Tone Generator: yes" @@ -663,7 +679,7 @@ echo if test "$beep_cv_lib_xlibs_threadsafe" = "no"; then - echo "Note: You need to have thread-safe xlibs to use beep." + echo "Note: You need to have thread-safe xlibs to use Audacious." echo "If you are using libc5 thread aware Xlibs just skip this." echo "" echo "If you don't have those libs and you are on a libc5 system get them at:" diff -r b1dcf238b2ba -r 8aee6a5bcc70 icons/Makefile.in --- a/icons/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/icons/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -133,6 +133,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -161,6 +163,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 libaudacious/Makefile.in --- a/libaudacious/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/libaudacious/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -173,6 +173,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -201,6 +203,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 libvisual/Makefile.in --- a/libvisual/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/libvisual/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -166,6 +166,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -194,6 +196,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ -L. -L$(libdir) LIBTOOL = @LIBTOOL@ diff -r b1dcf238b2ba -r 8aee6a5bcc70 skin/Makefile.in --- a/skin/Makefile.in Tue Oct 25 22:09:36 2005 -0700 +++ b/skin/Makefile.in Tue Oct 25 22:53:38 2005 -0700 @@ -140,6 +140,8 @@ HAVE_GNOME_VFS_TRUE = @HAVE_GNOME_VFS_TRUE@ HAVE_LINUX_JOYSTICK_FALSE = @HAVE_LINUX_JOYSTICK_FALSE@ HAVE_LINUX_JOYSTICK_TRUE = @HAVE_LINUX_JOYSTICK_TRUE@ +HAVE_MIKMOD_FALSE = @HAVE_MIKMOD_FALSE@ +HAVE_MIKMOD_TRUE = @HAVE_MIKMOD_TRUE@ HAVE_OGGVORBIS_FALSE = @HAVE_OGGVORBIS_FALSE@ HAVE_OGGVORBIS_TRUE = @HAVE_OGGVORBIS_TRUE@ HAVE_OSS_FALSE = @HAVE_OSS_FALSE@ @@ -168,6 +170,10 @@ LIBGLADE_LIBS = @LIBGLADE_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ +LIBMIKMOD_CFLAGS = @LIBMIKMOD_CFLAGS@ +LIBMIKMOD_CONFIG = @LIBMIKMOD_CONFIG@ +LIBMIKMOD_LDADD = @LIBMIKMOD_LDADD@ +LIBMIKMOD_LIBS = @LIBMIKMOD_LIBS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@