Mercurial > audlegacy
changeset 937:6158ee7d8b06 trunk
[svn] Port AudioCompress (AGC) effect plugin from XMMS, as requested by Junics on SorceryNet.
| author | chainsaw |
|---|---|
| date | Sat, 15 Apr 2006 08:05:03 -0700 |
| parents | 784052be35b3 |
| children | 2078cdac3502 |
| files | Plugins/Effect/Makefile.in Plugins/Effect/audiocompress/COPYING Plugins/Effect/audiocompress/Makefile.in Plugins/Effect/audiocompress/audacious-glue.c Plugins/Effect/audiocompress/compress.c Plugins/Effect/audiocompress/compress.h Plugins/Effect/audiocompress/config.h configure.ac |
| diffstat | 8 files changed, 1393 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Effect/Makefile.in Fri Apr 14 17:21:21 2006 -0700 +++ b/Plugins/Effect/Makefile.in Sat Apr 15 08:05:03 2006 -0700 @@ -1,4 +1,4 @@ include ../../mk/rules.mk include ../../mk/objective.mk -SUBDIRS = ladspa stereo_plugin voice_removal +SUBDIRS = audiocompress ladspa stereo_plugin voice_removal
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Effect/audiocompress/COPYING Sat Apr 15 08:05:03 2006 -0700 @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + 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 Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +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 other code 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. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. +^L + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + 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, whereas the latter must +be combined with the library in order to run. +^L + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser 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. +^L + 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. +^L + 6. As an exception to the Sections above, you may also combine 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) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) 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. + + d) 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. + + e) 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 materials to be 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. +^L + 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 with +this License. +^L + 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 Lesser 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. +^L + 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 +^L + 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. + + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +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. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Effect/audiocompress/Makefile.in Sat Apr 15 08:05:03 2006 -0700 @@ -0,0 +1,15 @@ +include ../../../mk/rules.mk +include ../../../mk/objective.mk + +OBJECTIVE_LIBS = libaudiocompress.so + +LIBDIR = $(plugindir)/$(EFFECT_PLUGIN_DIR) + +LIBADD = $(GTK_LIBS) + +SOURCES = compress.c audacious-glue.c + +CFLAGS += -fPIC -DPIC $(GTK_CFLAGS) -I../../../intl -I../../.. + +OBJECTS = ${SOURCES:.c=.o} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Effect/audiocompress/audacious-glue.c Sat Apr 15 08:05:03 2006 -0700 @@ -0,0 +1,618 @@ +/* audacious-glue.c +** Audacious effect plugin for AudioCompress +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <gtk/gtk.h> +#include "audacious/plugin.h" +#include "libaudacious/configdb.h" + +#include "config.h" +#include "compress.h" + +typedef struct { + gboolean anticlip; + gint target; + gint gainmax; + gint gainsmooth; + gint buckets; + + GtkWidget *dialog; +} CompressorPrefs; + +void initPrefs(CompressorPrefs *prefs); +void freePrefs(CompressorPrefs *prefs); +void showPrefs(CompressorPrefs *prefs); +void savePrefs(CompressorPrefs *prefs); + +static CompressorPrefs prefs; +static void myInit(void); +static void myCleanup(void); +static void myAbout(void); +static void myPrefs(void); +static int myModify(gpointer * data, gint length, AFormat fmt, + gint srate, gint nch); + + +static EffectPlugin xmms_plugin = { + NULL, NULL, + "AudioCompressor AGC plugin", + myInit, + myCleanup, + myAbout, + myPrefs, + myModify, + NULL +}; + +EffectPlugin *get_eplugin_info(void) +{ + return &xmms_plugin; +} + +void myInit(void) +{ + static int inited = 0; + if (!inited) + { + initPrefs(&prefs); + CompressCfg(prefs.anticlip, + prefs.target, + prefs.gainmax, + prefs.gainsmooth, + prefs.buckets); + } + inited = 1; +} + +void myCleanup(void) +{ + savePrefs(&prefs); + freePrefs(&prefs); + CompressFree(); +} + +int myModify(gpointer * data, gint length, AFormat fmt, gint srate, gint nch) +{ + if (fmt == FMT_S16_NE || + (fmt == FMT_S16_LE && G_BYTE_ORDER == G_LITTLE_ENDIAN) || + (fmt == FMT_S16_BE && G_BYTE_ORDER == G_BIG_ENDIAN)) + CompressDo(*data, length); + + return length; +} + +void closeAbout(GtkWidget* wg, GtkWidget* win) +{ + + gtk_widget_destroy(GTK_WIDGET(win)); +} + +void myAbout(void) +{ + gchar *window_title = "About AudioCompress"; + gchar *about_text = + "AudioCompress " ACVERSION "\n" + "(c)2003 trikuare studios(http://trikuare.cx)\n" + "Ported to Audacious by Tony Vroon (chainsaw@gentoo.org)\n\n" + "Simple dynamic range compressor for transparently\n" + "keeping the volume level more or less consistent"; + + GtkWidget *about_xmms_compress; + GtkWidget *vbox1; + GtkWidget *label1; + GtkWidget *hseparator1; + GtkWidget *hbuttonbox1; + GtkWidget *button1; + + about_xmms_compress = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_container_set_border_width(GTK_CONTAINER(about_xmms_compress), + 10); + gtk_window_set_title(GTK_WINDOW(about_xmms_compress), window_title); + gtk_window_set_wmclass(GTK_WINDOW(about_xmms_compress), "about", + "xmms"); + + vbox1 = gtk_vbox_new(FALSE, 12); + gtk_widget_show(vbox1); + gtk_container_add(GTK_CONTAINER(about_xmms_compress), vbox1); + + label1 = gtk_label_new(about_text); + gtk_widget_show(label1); + gtk_box_pack_start(GTK_BOX(vbox1), label1, FALSE, FALSE, 0); + + hseparator1 = gtk_hseparator_new(); + gtk_widget_show(hseparator1); + gtk_box_pack_start(GTK_BOX(vbox1), hseparator1, TRUE, TRUE, 0); + + hbuttonbox1 = gtk_hbutton_box_new(); + gtk_widget_show(hbuttonbox1); + gtk_box_pack_start(GTK_BOX(vbox1), hbuttonbox1, TRUE, TRUE, 0); + + button1 = gtk_button_new_with_label("Ok"); + gtk_widget_show(button1); + gtk_container_add(GTK_CONTAINER(hbuttonbox1), button1); + GTK_WIDGET_SET_FLAGS(button1, GTK_CAN_DEFAULT); + gtk_widget_grab_default(button1); + + gtk_signal_connect(GTK_OBJECT(button1), "clicked", + GTK_SIGNAL_FUNC(closeAbout), + about_xmms_compress); + + gtk_widget_show(GTK_WIDGET(about_xmms_compress)); +} + +void myPrefs(void) +{ + myInit(); + showPrefs(&prefs); +} + + +GtkWidget *create_prefs_dialog(CompressorPrefs * prefs); + +/* Manage preferences */ + +void initPrefs(CompressorPrefs * prefs) +{ + ConfigDb *db; + + prefs->anticlip = ANTICLIP; + prefs->target = TARGET; + prefs->gainmax = GAINMAX; + prefs->gainsmooth = GAINSMOOTH; + prefs->buckets = BUCKETS; + + db = bmp_cfg_db_open(); + + bmp_cfg_db_get_bool(db, "AudioCompress", + "anticlip", &prefs->anticlip); + bmp_cfg_db_get_int(db, "AudioCompress", "target", + &prefs->target); + bmp_cfg_db_get_int(db, "AudioCompress", "gainmax", + &prefs->gainmax); + bmp_cfg_db_get_int(db, "AudioCompress", + "gainsmooth", &prefs->gainsmooth); + bmp_cfg_db_get_int(db, "AudioCompress", "buckets", + &prefs->buckets); + + prefs->dialog = create_prefs_dialog(prefs); + + bmp_cfg_db_close(db); +} + +void freePrefs(CompressorPrefs * prefs) +{ + gtk_widget_destroy(prefs->dialog); + +} + +void savePrefs(CompressorPrefs * prefs) +{ + ConfigDb *db; + + db = bmp_cfg_db_open(); + + bmp_cfg_db_set_bool(db, "AudioCompress", "anticlip", + prefs->anticlip); + bmp_cfg_db_set_int(db, "AudioCompress", "target", + prefs->target); + bmp_cfg_db_set_int(db, "AudioCompress", "gainmax", + prefs->gainmax); + bmp_cfg_db_set_int(db, "AudioCompress", "gainsmooth", + prefs->gainsmooth); + bmp_cfg_db_set_int(db, "AudioCompress", "buckets", + prefs->buckets); + + bmp_cfg_db_close(db); +} + + +/* Dialogs */ + +GtkWidget *lookup_widget(GtkWidget * widget, const gchar * widget_name) +{ + GtkWidget *parent, *found_widget; + + for (;;) + { + if (GTK_IS_MENU(widget)) + parent = gtk_menu_get_attach_widget(GTK_MENU + (widget)); + else + parent = GTK_WIDGET(widget)->parent; + if (parent == NULL) + break; + widget = parent; + } + + found_widget =(GtkWidget *)gtk_object_get_data(GTK_OBJECT(widget), + widget_name); + if (!GTK_IS_WIDGET(found_widget)) + g_warning("Widget not found: %s", widget_name); + return found_widget; +} + + +/* Preferences dialog callbacks */ + +void close_window(GtkWidget * button, GtkWidget * win) +{ + gtk_widget_hide(GTK_WIDGET(win)); +} + +void on_apply_preferences_clicked(GtkWidget * wg, CompressorPrefs * prefs) +{ + /* Read spinbuttons values and update variables */ + + GtkWidget *look; + + look = lookup_widget(prefs->dialog, "anticlip"); + prefs->anticlip = GTK_TOGGLE_BUTTON(look)->active; + + look = lookup_widget(prefs->dialog, "target"); + prefs->target = + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(look)); + + look = lookup_widget(prefs->dialog, "gainmax"); + prefs->gainmax = + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(look)); + + look = lookup_widget(prefs->dialog, "gainsmooth"); + prefs->gainsmooth = + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(look)); + + look = lookup_widget(prefs->dialog, "buckets"); + prefs->buckets = + gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(look)); + + savePrefs(prefs); + CompressCfg(prefs->anticlip, prefs->target, prefs->gainmax, + prefs->gainsmooth, prefs->buckets); +} + +void +on_load_default_values_clicked(GtkWidget * wg, CompressorPrefs * prefs) +{ + + /* When the button is pressed, sets the values from config.h */ + + GtkWidget *look; + + look = lookup_widget(prefs->dialog, "anticlip"); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(look), FALSE); + + look = lookup_widget(prefs->dialog, "target"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look),(gfloat)TARGET); + + look = lookup_widget(prefs->dialog, "gainmax"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look),(gfloat)GAINMAX); + + look = lookup_widget(prefs->dialog, "gainsmooth"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look), + (gfloat)GAINSMOOTH); + + look = lookup_widget(prefs->dialog, "buckets"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look),(gfloat)BUCKETS); + +} + +void +on_ok_preferences_clicked(GtkWidget * wg, CompressorPrefs * prefs) +{ + + /* The same as apply, but also closes the window */ + + on_apply_preferences_clicked(NULL, prefs); + close_window(NULL, prefs->dialog); + +} + +/* Create / show prefs */ + +void showPrefs(CompressorPrefs * prefs) +{ + + GtkWidget *look; + + /* Set values */ + + look = lookup_widget(prefs->dialog, "anticlip"); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(look), + prefs->anticlip); + + look = lookup_widget(prefs->dialog, "target"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look), prefs->target); + + look = lookup_widget(prefs->dialog, "gainmax"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look), + (gfloat)prefs->gainmax); + + look = lookup_widget(prefs->dialog, "gainsmooth"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look), + (gfloat)prefs->gainsmooth); + + look = lookup_widget(prefs->dialog, "buckets"); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(look), + (gfloat)prefs->buckets); + + gtk_widget_show(prefs->dialog); + +} + +GtkWidget * +create_prefs_dialog(CompressorPrefs * prefs) +{ + + /* Preferences dialog */ + + gchar *clip_tip = + "If checked, when the sound peaks the volume will be " + "cut instantly; otherwise, it will ramp down just in time " + "for the peak (but some minor clipping may still occur)."; + gchar *gainmax_tip = + "The maximum amount to amplify the audio by"; + gchar *gainsmooth_tip = + "Defines how smoothly the volume will ramp up"; + gchar *target_tip = + "The target audio level for ramping up. Lowering the " + "value gives a bit more dynamic range for peaks, but " + "will make the overall sound quieter."; + gchar *hist_text = "How long of a window to maintain"; + + GtkWidget *preferences; + GtkWidget *vbox2; + GtkWidget *notebook1; + GtkWidget *vbox6; + GtkWidget *vbox5; + GtkWidget *frame1; + GtkWidget *clipping; + GtkWidget *frame2; + GtkWidget *table1; + GtkWidget *label5; + GtkWidget *label6; + GtkWidget *label7; + GtkObject *gainmax_adj; + GtkWidget *gainmax_sp; + GtkObject *gainsmooth_adj; + GtkWidget *gainsmooth_sp; + GtkObject *target_adj; + GtkWidget *target_sp; + GtkWidget *label4; + GtkWidget *hbuttonbox2; + GtkWidget *hbuttonbox7; + GtkWidget *button3; + GtkWidget *button4; + GtkWidget *button7; + GtkWidget *button8; + GtkWidget *frame3; + GtkWidget *table3; + GtkWidget *label9; + GtkWidget *buckets_sp; + GtkWidget *hseparator3; + GtkObject *buckets_adj; + GtkTooltips *tooltips; + + tooltips = gtk_tooltips_new(); + + preferences = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_object_set_data(GTK_OBJECT(preferences), "preferences", + preferences); + gtk_container_set_border_width(GTK_CONTAINER(preferences), 10); + gtk_window_set_title(GTK_WINDOW(preferences), + "AudioCompress preferences"); + gtk_window_set_policy(GTK_WINDOW(preferences), TRUE, TRUE, FALSE); + gtk_window_set_wmclass(GTK_WINDOW(preferences), "prefs", "xmms"); + + vbox2 = gtk_vbox_new(FALSE, 5); + gtk_widget_show(vbox2); + gtk_container_add(GTK_CONTAINER(preferences), vbox2); + + notebook1 = gtk_notebook_new(); + gtk_widget_show(notebook1); + gtk_box_pack_start(GTK_BOX(vbox2), notebook1, TRUE, TRUE, 0); + + vbox6 = gtk_vbox_new(FALSE, 0); + gtk_widget_show(vbox6); + gtk_container_add(GTK_CONTAINER(notebook1), vbox6); + + vbox5 = gtk_vbox_new(FALSE, 5); + gtk_widget_show(vbox5); + gtk_container_add(GTK_CONTAINER(notebook1), vbox5); + gtk_container_set_border_width(GTK_CONTAINER(vbox5), 5); + + frame1 = gtk_frame_new(" Quality Options "); + gtk_widget_show(frame1); + gtk_box_pack_start(GTK_BOX(vbox5), frame1, FALSE, FALSE, 0); + + clipping = gtk_check_button_new_with_label + (" Aggressively prevent clipping"); + gtk_widget_ref(clipping); + gtk_object_set_data_full(GTK_OBJECT(preferences), "anticlip", + clipping, + (GtkDestroyNotify)gtk_widget_unref); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(clipping), + prefs->anticlip); + gtk_widget_show(clipping); + gtk_container_add(GTK_CONTAINER(frame1), clipping); + gtk_container_set_border_width(GTK_CONTAINER(clipping), 5); + gtk_tooltips_set_tip(tooltips, clipping, clip_tip, NULL); + + frame2 = gtk_frame_new(" Target & gain"); + gtk_widget_show(frame2); + gtk_box_pack_start(GTK_BOX(vbox5), frame2, TRUE, TRUE, 0); + + table1 = gtk_table_new(4, 2, TRUE); + gtk_widget_show(table1); + gtk_container_add(GTK_CONTAINER(frame2), table1); + gtk_container_set_border_width(GTK_CONTAINER(table1), 5); + gtk_table_set_row_spacings(GTK_TABLE(table1), 5); + gtk_table_set_col_spacings(GTK_TABLE(table1), 5); + + label5 = gtk_label_new("Target audio level:"); + gtk_widget_show(label5); + gtk_table_attach(GTK_TABLE(table1), label5, 0, 1, 0, 1, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_label_set_justify(GTK_LABEL(label5), GTK_JUSTIFY_RIGHT); + gtk_misc_set_alignment(GTK_MISC(label5), 0, 0.5); + + label6 = gtk_label_new("Maximum gain:"); + gtk_widget_show(label6); + gtk_table_attach(GTK_TABLE(table1), label6, 0, 1, 1, 2, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_label_set_justify(GTK_LABEL(label6), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label6), 0, 0.5); + + label7 = gtk_label_new("Gain smooth:"); + gtk_widget_show(label7); + gtk_table_attach(GTK_TABLE(table1), label7, 0, 1, 2, 3, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_label_set_justify(GTK_LABEL(label7), GTK_JUSTIFY_LEFT); + gtk_misc_set_alignment(GTK_MISC(label7), 0, 0.5); + + gainmax_adj = + gtk_adjustment_new(prefs->gainmax, 0, + 1 << (31 - GAINSHIFT), 1, 2, 5); + gainmax_sp = gtk_spin_button_new(GTK_ADJUSTMENT(gainmax_adj), 1, 0); + gtk_widget_ref(gainmax_sp); + gtk_object_set_data_full(GTK_OBJECT(preferences), "gainmax", + gainmax_sp, + (GtkDestroyNotify)gtk_widget_unref); + gtk_widget_show(gainmax_sp); + gtk_table_attach(GTK_TABLE(table1), gainmax_sp, 1, 2, 1, 2, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_FILL), 0, 0); + gtk_tooltips_set_tip(tooltips, gainmax_sp, gainmax_tip, NULL); + gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(gainmax_sp), TRUE); + + gainsmooth_adj = + gtk_adjustment_new(prefs->gainsmooth, 0, GAINSHIFT - 1, + 1, 1, 1); + gainsmooth_sp = + gtk_spin_button_new(GTK_ADJUSTMENT(gainsmooth_adj), 1, 0); + gtk_widget_ref(gainsmooth_sp); + gtk_object_set_data_full(GTK_OBJECT(preferences), "gainsmooth", + gainsmooth_sp, + (GtkDestroyNotify)gtk_widget_unref); + gtk_widget_show(gainsmooth_sp); + gtk_table_attach(GTK_TABLE(table1), gainsmooth_sp, 1, 2, 2, 3, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_tooltips_set_tip(tooltips, gainsmooth_sp, gainsmooth_tip, NULL); + gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(gainsmooth_sp), TRUE); + + target_adj = gtk_adjustment_new(prefs->target, 0, 100000, 1, 10, 10); + target_sp = gtk_spin_button_new(GTK_ADJUSTMENT(target_adj), 1, 0); + gtk_widget_ref(target_sp); + gtk_object_set_data_full(GTK_OBJECT(preferences), "target", + target_sp, + (GtkDestroyNotify)gtk_widget_unref); + gtk_widget_show(target_sp); + gtk_table_attach(GTK_TABLE(table1), target_sp, 1, 2, 0, 1, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(GTK_FILL), 0, 0); + gtk_tooltips_set_tip(tooltips, target_sp, target_tip, NULL); + gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(target_sp), TRUE); + + frame3 = gtk_frame_new(" History "); + gtk_widget_show(frame3); + gtk_box_pack_start(GTK_BOX(vbox5), frame3, TRUE, TRUE, 0); + + table3 = gtk_table_new(1, 2, TRUE); + gtk_widget_show(table3); + gtk_container_add(GTK_CONTAINER(frame3), table3); + gtk_container_set_border_width(GTK_CONTAINER(table3), 5); + gtk_table_set_col_spacings(GTK_TABLE(table3), 5); + + /* Buckets label and spin */ + + label9 = gtk_label_new(hist_text); + gtk_widget_show(label9); + gtk_table_attach(GTK_TABLE(table3), label9, 0, 1, 0, 1, + (GtkAttachOptions)(GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + gtk_misc_set_alignment(GTK_MISC(label9), 7.45058e-09, 0.5); + + buckets_adj = + gtk_adjustment_new(prefs->buckets, 1, 10000, 1, 10, 10); + buckets_sp = gtk_spin_button_new(GTK_ADJUSTMENT(buckets_adj), 1, 0); + gtk_widget_ref(buckets_sp); + gtk_object_set_data_full(GTK_OBJECT(preferences), "buckets", + buckets_sp, + (GtkDestroyNotify)gtk_widget_unref); + gtk_widget_show(buckets_sp); + gtk_table_attach(GTK_TABLE(table3), buckets_sp, 1, 2, 0, 1, + (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), + (GtkAttachOptions)(0), 0, 0); + + gtk_tooltips_set_tip(tooltips, buckets_sp, + "How long of a history to maintain. " + "A higher number will make the volume changes " + "less responsive.", + NULL); + + hbuttonbox7 = gtk_hbutton_box_new(); + gtk_widget_show(hbuttonbox7); + gtk_box_pack_start(GTK_BOX(vbox5), hbuttonbox7, FALSE, FALSE, 0); + gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox7), + GTK_BUTTONBOX_END); + + button8 = gtk_button_new_with_label("Load default values"); + gtk_widget_show(button8); + gtk_container_add(GTK_CONTAINER(hbuttonbox7), button8); + GTK_WIDGET_SET_FLAGS(button8, GTK_CAN_DEFAULT); + + label4 = gtk_label_new("Audio values"); + gtk_widget_show(label4); + gtk_notebook_set_tab_label(GTK_NOTEBOOK(notebook1), + gtk_notebook_get_nth_page(GTK_NOTEBOOK + (notebook1), + 1), label4); + + hseparator3 = gtk_hseparator_new(); + gtk_widget_show(hseparator3); + gtk_box_pack_start(GTK_BOX(vbox2), hseparator3, TRUE, TRUE, 0); + + hbuttonbox2 = gtk_hbutton_box_new(); + gtk_widget_show(hbuttonbox2); + gtk_box_pack_start(GTK_BOX(vbox2), hbuttonbox2, TRUE, TRUE, 0); + gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox2), 5); + gtk_button_box_set_child_size(GTK_BUTTON_BOX(hbuttonbox2), 80, 0); + gtk_button_box_set_child_ipadding(GTK_BUTTON_BOX(hbuttonbox2), 0, + 0); + + button3 = gtk_button_new_with_label("Ok"); + gtk_widget_show(button3); + gtk_container_add(GTK_CONTAINER(hbuttonbox2), button3); + GTK_WIDGET_SET_FLAGS(button3, GTK_CAN_DEFAULT); + + button4 = gtk_button_new_with_label("Cancel"); + gtk_widget_show(button4); + gtk_container_add(GTK_CONTAINER(hbuttonbox2), button4); + GTK_WIDGET_SET_FLAGS(button4, GTK_CAN_DEFAULT); + + button7 = gtk_button_new_with_label("Apply"); + gtk_widget_show(button7); + gtk_container_add(GTK_CONTAINER(hbuttonbox2), button7); + GTK_WIDGET_SET_FLAGS(button7, GTK_CAN_DEFAULT); + + gtk_widget_grab_default(button4); + + gtk_signal_connect(GTK_OBJECT(button3), "clicked", + GTK_SIGNAL_FUNC(on_ok_preferences_clicked), + prefs); + gtk_signal_connect(GTK_OBJECT(button4), "clicked", + GTK_SIGNAL_FUNC(close_window), preferences); + gtk_signal_connect(GTK_OBJECT(button7), "clicked", + GTK_SIGNAL_FUNC(on_apply_preferences_clicked), + prefs); + gtk_signal_connect(GTK_OBJECT(button8), "clicked", + GTK_SIGNAL_FUNC(on_load_default_values_clicked), + prefs); + + return preferences; +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Effect/audiocompress/compress.c Sat Apr 15 08:05:03 2006 -0700 @@ -0,0 +1,203 @@ +/* compress.c +** Compressor logic +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +#include "config.h" +#include "compress.h" + +static int *peaks = NULL; +static int gainCurrent, gainTarget; + +static struct { + int anticlip; + int target; + int gainmax; + int gainsmooth; + int buckets; +} prefs; + +void CompressCfg(int anticlip, int target, int gainmax, + int gainsmooth, int buckets) +{ + static int lastsize = 0; + + prefs.anticlip = anticlip; + prefs.target = target; + prefs.gainmax = gainmax; + prefs.gainsmooth = gainsmooth; + prefs.buckets = buckets; + + /* Allocate the peak structure */ + peaks = realloc(peaks, sizeof(int)*prefs.buckets); + + if (prefs.buckets > lastsize) + memset(peaks + lastsize, 0, sizeof(int)*(prefs.buckets + - lastsize)); + lastsize = prefs.buckets; +} + +void CompressFree(void) +{ + if (peaks) + free(peaks); +} + +void CompressDo(void *data, unsigned int length) +{ + int16_t *audio = (int16_t *)data, *ap; + int peak, pos; + int i; + int gr, gf, gn; + static int pn = -1; +#ifdef STATS + static int clip = 0; +#endif + static int clipped = 0; + + if (!peaks) + return; + + if (pn == -1) + { + for (i = 0; i < prefs.buckets; i++) + peaks[i] = 0; + } + pn = (pn + 1)%prefs.buckets; + +#ifdef DEBUG + fprintf(stderr, "modifyNative16(0x%08x, %d)\n",(unsigned int)data, + length); +#endif + + /* Determine peak's value and position */ + peak = 1; + pos = 0; + +#ifdef DEBUG + fprintf(stderr, "finding peak(b=%d)\n", pn); +#endif + + ap = audio; + for (i = 0; i < length/2; i++) + { + int val = *ap; + if (val > peak) + { + peak = val; + pos = i; + } else if (-val > peak) + { + peak = -val; + pos = i; + } + ap++; + } + peaks[pn] = peak; + + for (i = 0; i < prefs.buckets; i++) + { + if (peaks[i] > peak) + { + peak = peaks[i]; + pos = 0; + } + } + + /* Determine target gain */ + gn = (1 << GAINSHIFT)*prefs.target/peak; + + if (gn <(1 << GAINSHIFT)) + gn = 1 << GAINSHIFT; + + gainTarget = (gainTarget *((1 << prefs.gainsmooth) - 1) + gn) + >> prefs.gainsmooth; + + /* Give it an extra insignifigant nudge to counteract possible + ** rounding error + */ + + if (gn < gainTarget) + gainTarget--; + else if (gn > gainTarget) + gainTarget++; + + if (gainTarget > prefs.gainmax << GAINSHIFT) + gainTarget = prefs.gainmax << GAINSHIFT; + + + /* See if a peak is going to clip */ + gn = (1 << GAINSHIFT)*32768/peak; + + if (gn < gainTarget) + { + gainTarget = gn; + + if (prefs.anticlip) + pos = 0; + + } else + { + /* We're ramping up, so draw it out over the whole frame */ + pos = length; + } + + /* Determine gain rate necessary to make target */ + if (!pos) + pos = 1; + + gr = ((gainTarget - gainCurrent) << 16)/pos; + + /* Do the shiznit */ + gf = gainCurrent << 16; + +#ifdef STATS + fprintf(stderr, "\rgain = %2.2f%+.2e ", + gainCurrent*1.0/(1 << GAINSHIFT), + (gainTarget - gainCurrent)*1.0/(1 << GAINSHIFT)); +#endif + + ap = audio; + for (i = 0; i < length/2; i++) + { + int sample; + + /* Interpolate the gain */ + gainCurrent = gf >> 16; + if (i < pos) + gf += gr; + else if (i == pos) + gf = gainTarget << 16; + + /* Amplify */ + sample = (*ap)*gainCurrent >> GAINSHIFT; + if (sample < -32768) + { +#ifdef STATS + clip++; +#endif + clipped += -32768 - sample; + sample = -32768; + } else if (sample > 32767) + { +#ifdef STATS + clip++; +#endif + clipped += sample - 32767; + sample = 32767; + } + *ap++ = sample; + } +#ifdef STATS + fprintf(stderr, "clip %d b%-3d ", clip, pn); +#endif + +#ifdef DEBUG + fprintf(stderr, "\ndone\n"); +#endif +} +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Effect/audiocompress/compress.h Sat Apr 15 08:05:03 2006 -0700 @@ -0,0 +1,18 @@ +/* compress.h +** interface to audio compression +*/ + +#ifndef COMPRESS_H +#define COMPRESS_H + +void CompressCfg(int anticlip, + int target, + int maxgain, + int smooth, + int buckets); + +void CompressDo(void *data, unsigned int numSamples); + +void CompressFree(void); + +#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Plugins/Effect/audiocompress/config.h Sat Apr 15 08:05:03 2006 -0700 @@ -0,0 +1,25 @@ +/* config.h +** Default values for the configuration, and also a few random debug things +*/ + +#ifndef CONFIG_H +#define CONFIG_H + +/*** Version information ***/ +#define ACVERSION "1.5.2" + +/*** Monitoring stuff ***/ +//#define DEBUG /* Show debugging information */ +//#define STATS /* Show statistics on stderr */ + +/*** Default configuration stuff ***/ +#define ANTICLIP 0 /* Strict clipping protection */ +#define TARGET 25000 /* Target level */ + +#define GAINMAX 32 /* The maximum amount to amplify by */ +#define GAINSHIFT 10 /* How fine-grained the gain is */ +#define GAINSMOOTH 8 /* How much inertia ramping has*/ +#define BUCKETS 400 /* How long of a history to store */ + +#endif +
--- a/configure.ac Fri Apr 14 17:21:21 2006 -0700 +++ b/configure.ac Sat Apr 15 08:05:03 2006 -0700 @@ -117,7 +117,7 @@ INPUT_PLUGINS="cdaudio tonegen console sexypsf wav" OUTPUT_PLUGINS="disk_writer" -EFFECT_PLUGINS="ladspa voice_removal" +EFFECT_PLUGINS="audiocompress ladspa voice_removal" GENERAL_PLUGINS="song_change" VISUALIZATION_PLUGINS="blur_scope" @@ -903,6 +903,7 @@ Plugins/General/lirc/Makefile Plugins/General/scrobbler/Makefile Plugins/Effect/Makefile + Plugins/Effect/audiocompress/Makefile Plugins/Effect/ladspa/Makefile Plugins/Effect/stereo_plugin/Makefile Plugins/Effect/voice_removal/Makefile @@ -972,12 +973,12 @@ echo " General" echo " -------" echo " Song Change: yes" -echo " Internet Control: yes" echo " LIRC: $have_lirc" echo " AudioScrobbler Client: $scrobbler" echo echo " Effect" echo " ------" +echo " AudioCompressor (AGC): yes" echo " LADSPA effects host (ladspa): yes" echo " Voice Removal: yes" echo