From 4f6b15ea26b5fa09f300f67e4ce1057c2b39a3aa Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 25 Sep 2014 17:08:44 +0200 Subject: New API, new name, new version. --- COPYING | 1145 +++++++++++++++++++++++------------------------------- Makefile.am | 7 +- audioin.pc.in | 13 - audioio.pc.in | 13 + configure.ac | 6 +- src/Makefile.am | 46 ++- src/aioloop.cc | 191 +++++++++ src/aiomixer.cc | 231 +++++++++++ src/airecord.cc | 24 +- src/audioin.cc | 445 --------------------- src/audioin.h | 130 ------- src/audioio.cc | 287 ++++++++++++++ src/audioio.h | 180 +++++++++ src/compat.h | 20 - src/device.cc | 275 +++++++++++++ src/device.h | 61 +++ src/mixer.cc | 321 +++++++++++++++ src/mixer.h | 125 ++++++ src/sink.cc | 79 ++++ src/sink.h | 56 +++ src/source.cc | 81 ++++ src/source.h | 56 +++ src/test_audio.h | 112 ------ tools/add_file | 42 +- 24 files changed, 2505 insertions(+), 1441 deletions(-) delete mode 100644 audioin.pc.in create mode 100644 audioio.pc.in create mode 100644 src/aioloop.cc create mode 100644 src/aiomixer.cc delete mode 100644 src/audioin.cc delete mode 100644 src/audioin.h create mode 100644 src/audioio.cc create mode 100644 src/audioio.h delete mode 100644 src/compat.h create mode 100644 src/device.cc create mode 100644 src/device.h create mode 100644 src/mixer.cc create mode 100644 src/mixer.h create mode 100644 src/sink.cc create mode 100644 src/sink.h create mode 100644 src/source.cc create mode 100644 src/source.h delete mode 100644 src/test_audio.h diff --git a/COPYING b/COPYING index 94a9ed0..efce2a8 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,503 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them 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 prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. +[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. + + 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. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of +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. + + 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. + + 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 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. + + 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. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or + + 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 convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - +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. + + 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 + + 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 program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + 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 program is distributed in the hope that it will be useful, + 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 General Public License for more details. + 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 General Public License - along with this program. If not, see . + 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. +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 --git a/Makefile.am b/Makefile.am index 47fbf09..f179056 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,13 +2,10 @@ AUTOMAKE_OPTIONS = gnu SUBDIRS = src tools DISTDIRS = src tools -EXTRA_DIST = audioin.pc.in +EXTRA_DIST = audioio.pc.in pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = audioin.pc +pkgconfig_DATA = audioio.pc .PHONY: -test: - $(MAKE) -C src test - diff --git a/audioin.pc.in b/audioin.pc.in deleted file mode 100644 index 664885b..0000000 --- a/audioin.pc.in +++ /dev/null @@ -1,13 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: libaudioin -Description: An audio input library using ALSA. -Version: @VERSION@ -Requires: -Conflicts: -Libs: -L${libdir} -laudioin -Libs.private: -Cflags: -I${includedir} diff --git a/audioio.pc.in b/audioio.pc.in new file mode 100644 index 0000000..664885b --- /dev/null +++ b/audioio.pc.in @@ -0,0 +1,13 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: libaudioin +Description: An audio input library using ALSA. +Version: @VERSION@ +Requires: +Conflicts: +Libs: -L${libdir} -laudioin +Libs.private: +Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac index 865e48c..a9b7f68 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ -AC_INIT([libaudioin], 0.12 ) +AC_INIT([libaudioio], 1.0.0 ) -AC_CONFIG_SRCDIR([src/audioin.cc]) +AC_CONFIG_SRCDIR([src/audioio.cc]) AM_INIT_AUTOMAKE @@ -44,5 +44,5 @@ AC_OUTPUT( Makefile src/Makefile tools/Makefile - audioin.pc) + audioio.pc) diff --git a/src/Makefile.am b/src/Makefile.am index 88fd261..094b436 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,19 +1,39 @@ -bin_PROGRAMS = airecord -lib_LTLIBRARIES = libaudioin.la +bin_PROGRAMS = aiomixer aioloop +lib_LTLIBRARIES = libaudioio.la -libaudioin_la_LIBADD = $(ALSA_LIBS) -libaudioin_la_CXXFLAGS = $(ALSA_CFLAGS) +libaudioio_la_LIBADD = $(ALSA_LIBS) +libaudioio_la_CXXFLAGS = $(ALSA_CFLAGS) +libaudioio_la_SOURCES = \ + source.cc \ + sink.cc \ + device.cc \ + mixer.cc \ + audioio.cc -libaudioin_la_SOURCES = \ - audioin.cc +include_HEADERS = \ + audioio.h -airecord_LDADD = libaudioin.la -airecord_SOURCES = \ - airecord.cc +aiomixer_LDADD = $(ALSA_LIBS) +aiomixer_CXXFLAGS = $(ALSA_CFLAGS) +aiomixer_SOURCES = \ + aiomixer.cc \ + source.cc \ + sink.cc \ + device.cc \ + mixer.cc -include_HEADERS = \ - audioin.h +aioloop_LDADD = $(ALSA_LIBS) +aioloop_CXXFLAGS = $(ALSA_CFLAGS) +aioloop_SOURCES = \ + aioloop.cc \ + source.cc \ + sink.cc \ + device.cc \ + mixer.cc EXTRA_DIST = \ - compat.h \ - test_audio.h + device.h \ + mixer.h \ + sink.h \ + source.h + diff --git a/src/aioloop.cc b/src/aioloop.cc new file mode 100644 index 0000000..ad70c72 --- /dev/null +++ b/src/aioloop.cc @@ -0,0 +1,191 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * aioloop.cc + * + * Thu Sep 25 11:25:30 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "device.h" +#include "mixer.h" +#include "source.h" +#include "sink.h" + +#include +#include + +int pcm_size[2]; +char *pcm[2]; +volatile int buf_rcnt = 0; +volatile int buf_wcnt = 0; + +struct semaphore_private_t; + +class Semaphore { +public: + Semaphore(const char *name = ""); + ~Semaphore(); + + void post(); + void wait(); + +private: + struct semaphore_private_t *prv; + const char *name; +}; + +struct semaphore_private_t { + sem_t semaphore; +}; + +Semaphore::Semaphore(const char *name) +{ + prv = new struct semaphore_private_t(); + sem_init(&prv->semaphore, 0, 0); +} + +Semaphore::~Semaphore() +{ + sem_destroy(&prv->semaphore); + if(prv) delete prv; +} + +void Semaphore::post() +{ + sem_post(&prv->semaphore); +} + +void Semaphore::wait() +{ + sem_wait(&prv->semaphore); +} + + +static void* thread_run(void *data); + +class Thread { +public: + virtual ~Thread() {} + void run() + { + pthread_create(&tid, NULL, thread_run, this); + } + + void wait_stop() + { + pthread_join(tid, NULL); + } + + virtual void thread_main() = 0; + +private: + pthread_t tid; +}; + +static void* thread_run(void *data) +{ + Thread *t = (Thread*)data; + t->thread_main(); + return 0; +} + +char ringbuffer[4096 * 10]; + +class Player : public Thread { +public: + Player(Sink *sink) + { + this->sink = sink; + } + + void thread_main() + { + int pos = sizeof(ringbuffer) / 2; + char pcm[940 * sizeof(short)]; + while(1) { + for(unsigned int i = 0; i < sizeof(pcm); i++) { + pcm[i] = ringbuffer[pos % sizeof(ringbuffer)]; + pos++; + } + int sz = sink->writeSamples(pcm, sizeof(pcm)); + if(sz < 1) { + printf("write: %d\n", sz); + continue; + } + } + } + +private: + Sink *sink; +}; + +int main(int argc, char *argv[]) +{ + if(argc < 4) { + printf("Usage: %s card input output\n", argv[0]); + return 1; + } + + size_t buffer_size = 940 * sizeof(short); + pcm[0] = (char *)malloc(buffer_size); + pcm[1] = (char *)malloc(buffer_size); + pcm_size[0] = 0; + pcm_size[1] = 0; + + Device device(argv[1]); + + Source *src = device.getSource(argv[2], 44100, 1); + if(src == NULL) { + printf("Source '%s' failed!\n", argv[2]); + return 1; + } + + Sink *sink = device.getSink(argv[3], 44100, 1); + if(sink == NULL) { + printf("Sink '%s' failed!\n", argv[3]); + return 1; + } + + memset(ringbuffer, 0, sizeof(ringbuffer)); + + Player p(sink); + p.run(); + + int sz = 0; + int pos = sizeof(ringbuffer) / 2; + char pcm[940 * sizeof(short)]; + while(1) { + sz = src->readSamples(pcm, sizeof(pcm)); + for(int i = 0; i < sz; i++) { + ringbuffer[pos % sizeof(ringbuffer)] = pcm[i]; + pos++; + } + if(sz < 1) { + printf("read: %d\n", sz); + continue; + } + } + + delete src; + delete sink; +} + diff --git a/src/aiomixer.cc b/src/aiomixer.cc new file mode 100644 index 0000000..bfe37f9 --- /dev/null +++ b/src/aiomixer.cc @@ -0,0 +1,231 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * aiomixer.cc + * + * Wed Sep 24 11:06:36 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include +#include +#include + +#include "device.h" +#include "mixer.h" + +static const char version_str[] = +"aiomixer v" VERSION "\n" +; + +static const char copyright_str[] = +"Copyright (C) 2014 Bent Bisballe Nyeng - Aasimon.org.\n" +"This is free software. You may redistribute copies of it under the terms of\n" +"the GNU Lesser General Public License " +".\n" +"There is NO WARRANTY, to the extent permitted by law.\n" +"\n" +"Written by Bent Bisballe Nyeng (deva@aasimon.org)\n" +; + +static const char usage_str[] = +"Usage: %s card [-l] [mixer [options]]\n" +"Options:\n" +" -L, --list List controls on card.\n" +" -E, --list-enum List enumeration values\n" +" -e, --enum y Set value of enum to y\n" +" -e, --enum Get value of enum\n" +" -C, --channels Get number of channels in mixer\n" +" -l, --level n=m Set level of channel n to value m\n" +" -l, --level n Get level of channel n\n" +" -r, --range Get range of mixer\n" +" -c, --capture Get capture mode.\n" +" -c, --capture n Set capture mode to n (1 or 0).\n" +" -v, --version Print version information and exit.\n" +" -h, --help Print this message and exit.\n" +; + +int main(int argc, char *argv[]) +{ + int c; + char *p; + + bool list = false; + bool list_enum = false; + bool range = false; + bool num_channels = false; + + std::string enum_name; + std::string enum_value; + + std::string level_name; + std::string level_value; + + int option_index = 0; + while(1) { + static struct option long_options[] = { + {"list", no_argument, 0, 'L'}, + {"enum", required_argument, 0, 'e'}, + {"level", required_argument, 0, 'l'}, + {"version", no_argument, 0, 'v'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + + c = getopt_long (argc, argv, "hvLe:l:rc", long_options, &option_index); + + if (c == -1) + break; + + switch(c) { + case 'L': + list = true; + break; + + case 'r': + range = true; + break; + + case 'c': + num_channels = true; + break; + + case 'e': + p = strchr(optarg, '='); + if(p) { + *p = '\0'; + enum_value = p+1; + } + enum_name = optarg; + if(enum_name == "") list_enum = true; + break; + + case 'l': + p = strchr(optarg, '='); + if(p) { + *p = '\0'; + level_value = p+1; + } + level_name = optarg; + break; + + case '?': + case 'h': + printf("%s", version_str); + printf(usage_str, argv[0]); + return 0; + + case 'v': + printf("%s", version_str); + printf("%s", copyright_str); + return 0; + + default: + break; + } + } + + std::string device; + std::string mixer; + + int arg = 0; + if(option_index < argc) { + while(optind < argc) { + switch(arg) { + case 0: device = argv[optind++]; break; + case 1: mixer = argv[optind++]; break; + default: + printf("Unknown third argument.\n"); + printf(usage_str, argv[0]); + return 1; + } + arg++; + } + } + + if(device == "") { + printf("Missing device argument.\n"); + printf(usage_str, argv[0]); + return 1; + } + + Device dev(device); + + if(list) { + std::vector mlist = dev.mixerNames(); + std::vector::iterator i = mlist.begin(); + while(i != mlist.end()) { + printf("%s\n", i->c_str()); + i++; + } + return 0; + } + + if(mixer != "") { + Mixer *mix = dev.getMixer(mixer); + if(!mix) return 1; + + if(range) { + Mixer::range_t range = mix->range(); + printf("Range: [%f ; %f]dB\n", range.min, range.max); + } + + if(num_channels) { + int num = mix->numberOfChannels(); + printf("Number of channels: %d\n", num); + } + + /* + for(int i = 0; i < num; i++) { + printf("Channel: %d\n", i); + float val = mix->level(i); + printf(" Level %fdB\n", val); + mix->setLevel(i, val - 1.1); + printf(" Level %fdB\n", mix->level(i)); + mix->setLevel(i, val); + printf(" Level %fdB\n", mix->level(i)); + } + */ + + if(list_enum) { + std::vector evs = mix->enumValues(); + std::vector::iterator i = evs.begin(); + printf("Enum values:\n"); + while(i != evs.end()) { + printf(" - '%s'\n", (*i).c_str()); + i++; + } + printf("\n"); + } + + if(enum_name != "" && enum_value == "") { + std::string ev = mix->enumValue(); + printf("Enum value: '%s'\n", ev.c_str()); + } + + // bool capt = mix->capture(); + // mix->setCapture(!capt); + + delete mix; + } + + return 0; +} diff --git a/src/airecord.cc b/src/airecord.cc index 8a40edc..e340832 100644 --- a/src/airecord.cc +++ b/src/airecord.cc @@ -10,19 +10,19 @@ /* * This file is part of libaudioin. * - * libaudioin is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * libaudioin is distributed in the hope that it will be useful, + * LibAudioIO 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. + * + * LibAudioIO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with libaudioin; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. + * 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include #include diff --git a/src/audioin.cc b/src/audioin.cc deleted file mode 100644 index cc6fffc..0000000 --- a/src/audioin.cc +++ /dev/null @@ -1,445 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * audioin.cc - * - * Wed Sep 30 11:36:18 CEST 2009 - * Copyright 2011 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of libaudioin. - * - * libaudioin is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * libaudioin is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with libaudioin; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#include "audioin.h" - -// Use the newer ALSA API -#define ALSA_PCM_NEW_HW_PARAMS_API - -#include -#include -#include -#include -#include - -class AudioIn { -public: - class CouldNotOpenPCMDevice : public std::exception {}; - class UnableToSetHWParams : public std::exception {}; - class PcmBufferTooSmall : public std::exception {}; - class OverRun : public std::exception {}; - class ReadError : public std::exception {}; - class ShortRead : public std::exception {}; - class CouldNotInitialiseParams : public std::exception {}; - class CouldNotSetAccessMode : public std::exception {}; - class CouldNotSetFormat : public std::exception {}; - class CouldNotSetChannelNumber : public std::exception {}; - class UnableToSetSampleRate : public std::exception {}; - class UnableToSetPeriodSize : public std::exception {}; - class MixerInitilisationFailed : public std::exception {}; - class MixerNotInitialised : public std::exception {}; - class InvalidMixerLevel : public std::exception {}; - class IllegalChannelNumber : public std::exception {}; - class CouldNotSetMixerLevel : public std::exception {}; - - AudioIn(std::string device, std::string mixer, unsigned int srate, int ch); - ~AudioIn(); - - /** - * Reads a number of samples from the soundcard. - * The returned signal is a 16bit mono pcm signal. - */ - size_t read(void *buf, size_t size); - - int set_level(unsigned int channel, float level); - - unsigned int get_samplerate(); - - void set_enable_noise_fix(bool fixit); - -private: - bool noisefix; - unsigned int samplerate; - int channels; - snd_pcm_t *handle; - snd_pcm_hw_params_t *params; - unsigned int val; - int dir; - snd_pcm_uframes_t frames; - - snd_mixer_t *mixhnd; - snd_mixer_elem_t *elem; - long lvl_min, lvl_max; -}; - -AudioIn::AudioIn(std::string device, std::string mixer_interface, - unsigned int srate, int ch) -{ - int open_mode = 0; - //open_mode |= SND_PCM_NONBLOCK; - //open_mode |= SND_PCM_NO_AUTO_RESAMPLE; - //open_mode |= SND_PCM_NO_AUTO_CHANNELS; - //open_mode |= SND_PCM_NO_AUTO_FORMAT; - //open_mode |= SND_PCM_NO_SOFTVOL; - elem = NULL; - mixhnd = NULL; - - noisefix = false; - - samplerate = 0; - - int rc; - - // Open PCM device for recording (capture). - rc = snd_pcm_open(&handle, device.c_str(), SND_PCM_STREAM_CAPTURE, open_mode); - if (rc < 0) throw CouldNotOpenPCMDevice(); - - // Allocate a hardware parameters object. - snd_pcm_hw_params_alloca(¶ms); - - // Fill it in with default values. - rc = snd_pcm_hw_params_any(handle, params); - if (rc < 0) throw CouldNotInitialiseParams(); - - // Set the desired hardware parameters. - - // Interleaved mode - rc = snd_pcm_hw_params_set_access(handle, params, - SND_PCM_ACCESS_RW_INTERLEAVED); - if (rc < 0) throw CouldNotSetAccessMode(); - - // Signed 16-bit little-endian format - rc = snd_pcm_hw_params_set_format(handle, params, SND_PCM_FORMAT_S16_LE); - if (rc < 0) throw CouldNotSetFormat(); - - // Set channels (stereo/mono) - rc = snd_pcm_hw_params_set_channels(handle, params, ch); - channels = ch; - if (rc < 0) throw CouldNotSetChannelNumber(); - - // Set sampling rate - samplerate = srate; - rc = snd_pcm_hw_params_set_rate_near(handle, params, &samplerate, &dir); - if(rc < 0) throw UnableToSetSampleRate(); - //if(samplerate != srate) throw UnableToSetSampleRate(); - - // NOTE: Setting period size to 32 frames will force use of lowest possible value. - frames = 512; - rc = snd_pcm_hw_params_set_period_size_near(handle, params, &frames, &dir); - if(rc < 0) throw UnableToSetPeriodSize(); - - // Write the parameters to the driver - rc = snd_pcm_hw_params(handle, params); - if (rc < 0) throw UnableToSetHWParams(); - - if(mixer_interface == "") return; - - // - // Set up mixer - // - snd_mixer_selem_id_t *mixer; - - // Open mixer device - if(snd_mixer_open(&mixhnd, 0) != 0) throw MixerInitilisationFailed(); - - if(snd_mixer_attach(mixhnd, device.c_str()) != 0) - throw MixerInitilisationFailed(); - - if(snd_mixer_selem_register(mixhnd, NULL, NULL) < 0) - throw MixerInitilisationFailed(); - - if(snd_mixer_load(mixhnd) < 0) - throw MixerInitilisationFailed(); - - // Obtain mixer element - snd_mixer_selem_id_alloca(&mixer); - if(mixer == NULL) throw MixerInitilisationFailed(); - snd_mixer_selem_id_set_name(mixer, mixer_interface.c_str()); - - elem = snd_mixer_find_selem(mixhnd, mixer); - if(elem == NULL) throw MixerInitilisationFailed(); - - if(snd_mixer_selem_get_capture_volume_range(elem, &lvl_min, &lvl_max) != 0) { - throw MixerInitilisationFailed(); - } - - if(snd_mixer_selem_set_capture_switch(elem, - SND_MIXER_SCHN_FRONT_LEFT, 1) != 0) { - throw MixerInitilisationFailed(); - } - - if(snd_mixer_selem_set_capture_switch(elem, - SND_MIXER_SCHN_FRONT_RIGHT, 1) != 0) { - throw MixerInitilisationFailed(); - } - - // Obtain mixer enumeration element "Input Source" and set it to 2 (line). - snd_mixer_selem_id_set_name(mixer, "Input Source"); - - snd_mixer_elem_t *iselem = snd_mixer_find_selem(mixhnd, mixer); - if(iselem == NULL) return; - - if(snd_mixer_selem_is_enumerated(iselem)) { - // Set to line-in - for(int i = 0; i < 3; i++) { - char name[16]; - snd_mixer_selem_get_enum_item_name(iselem, i, sizeof(name), name); - if(std::string(name) == "Line") { - snd_mixer_selem_set_enum_item(iselem, SND_MIXER_SCHN_MONO, i); - } - } - } -} - -AudioIn::~AudioIn() -{ - if(handle) { - snd_pcm_drain(handle); - snd_pcm_close(handle); - } - if(mixhnd) snd_mixer_close(mixhnd); -} - -size_t AudioIn::read(void *buf, size_t size) -{ - int rc; - - if(size < frames * sizeof(short) * channels) { - throw PcmBufferTooSmall(); - } - - rc = snd_pcm_readi(handle, buf, frames); - if (rc == -EPIPE) { - // EPIPE means overrun - snd_pcm_prepare(handle); - throw OverRun(); - return 0; - } else if (rc < 0) { - throw ReadError(); - } else if (rc != (int)frames) { - throw ShortRead(); - } - - return rc * sizeof(short) * channels; -} - -unsigned int AudioIn::get_samplerate() -{ - return samplerate; -} - -int AudioIn::set_level(unsigned int channel, float level) -{ - - if(!elem) throw MixerNotInitialised(); - - if(level > 1.0 || level < 0.0) throw InvalidMixerLevel(); - - long lvl = ((lvl_max - lvl_min) * level) + lvl_min; - - snd_mixer_selem_channel_id_t ch; - switch(channel) { - case 0: - ch = SND_MIXER_SCHN_FRONT_LEFT; - break; - case 1: - ch = SND_MIXER_SCHN_FRONT_RIGHT; - break; - default: - throw IllegalChannelNumber(); - break; - } - if(snd_mixer_selem_set_capture_volume(elem, ch, lvl) != 0) { - throw CouldNotSetMixerLevel(); - } - return 0; -} - - -#define MAGIC 0xdeadbeef - -struct ai_t { - unsigned int magic; - AudioIn *ai; -}; - -struct ai_t *ai_init(int *err, const char *device, const char *mixer, - unsigned int srate, unsigned int ch) -{ - *err = NO_ERROR; - - struct ai_t *handle = new ai_t; - handle->magic = MAGIC; - - if(handle == NULL) { - *err = OUT_OF_MEMORY; - return NULL; - } - - try { - handle->ai = new AudioIn(device, mixer, srate, ch); - } catch(AudioIn::CouldNotOpenPCMDevice &e) { *err = COULD_NOT_OPEN_DEVICE; - } catch(AudioIn::UnableToSetHWParams &e) { *err = COULD_NOT_SET_HW_PARAMS; - } catch(AudioIn::CouldNotInitialiseParams &e) { *err = COULD_NOT_INIT_PARAMS; - } catch(AudioIn::CouldNotSetAccessMode &e) { *err = COULD_NOT_SET_ACCESS_MODE; - } catch(AudioIn::CouldNotSetFormat &e) { *err = COULD_NOT_SET_FORMAT; - } catch(AudioIn::CouldNotSetChannelNumber &e) { *err = COULD_NOT_SET_CHANNELS; - } catch(AudioIn::UnableToSetSampleRate &e) { *err = COULD_NOT_SET_SAMPLE_RATE; - } catch(AudioIn::UnableToSetPeriodSize &e) { *err = COULD_NOT_SET_PERIOD_SIZE; - } catch(AudioIn::MixerInitilisationFailed &e) { *err = MIXER_INIT_FAILED; - } - - if(*err != NO_ERROR) { - handle->magic = 0; - delete handle; - return NULL; - } - - return handle; -} - -int ai_read(int *err, struct ai_t *handle, void *pcm, unsigned int maxsize) -{ - if(*err == 42) { // Magic debug function - short *p = (short*)pcm; - for(size_t i = 0; i < maxsize / sizeof(short); i++) { - p[i] = i; - } - *err = NO_ERROR; - return maxsize; - } - - *err = NO_ERROR; - - if(handle == NULL || handle->magic != MAGIC || handle->ai == NULL) { - *err = MISSING_HANDLE; - return -1; - } - - try { - return handle->ai->read(pcm, maxsize); - } catch(AudioIn::PcmBufferTooSmall &e) { *err = BUFFER_TOO_SMALL; - } catch(AudioIn::OverRun &e) { *err = BUFFER_OVERRUN; - } catch(AudioIn::ReadError &e) { *err = READ_ERROR; - } catch(AudioIn::ShortRead &e) { *err = SHORT_READ; - } - - return -1; -} - -int ai_get_samplerate(int *err, struct ai_t *handle) -{ - *err = NO_ERROR; - - if(handle == NULL || handle->magic != MAGIC || handle->ai == NULL) { - *err = MISSING_HANDLE; - return -1; - } - - return (int)handle->ai->get_samplerate(); -} - - -int ai_set_mixer_level(int *err, struct ai_t *handle, unsigned int channel, - float level) -{ - *err = NO_ERROR; - - if(handle == NULL || handle->magic != MAGIC || handle->ai == NULL) { - *err = MISSING_HANDLE; - return -1; - } - - try { - return handle->ai->set_level(channel, level); - } catch(AudioIn::MixerNotInitialised &e) { *err = MIXER_NOT_INITIALISED; - } catch(AudioIn::InvalidMixerLevel &e) { *err = INVALID_MIXER_LEVEL; - } catch(AudioIn::IllegalChannelNumber &e) { *err = INVALID_CHANNEL_NUMBER; - } catch(AudioIn::CouldNotSetMixerLevel &e) { *err = COULD_NOT_SET_MIXER_LEVEL; - } - - return -1; -} - -void ai_close(int *err, struct ai_t *handle) -{ - *err = NO_ERROR; - - if(handle == NULL || handle->magic != MAGIC || handle->ai == NULL) { - *err = MISSING_HANDLE; - return; - } - - delete handle->ai; - handle->ai = NULL; - handle->magic = 0; - delete handle; -} - -#ifdef TEST_AUDIOIN -//deps: -//cflags: $(ALSA_CFLAGS) -//libs: $(ALSA_LIBS) - -#include -#include "test_audio.h" -#include - -TEST_BEGIN; -int err; -struct ai_t *h; - -h = ai_init(&err, "default", "H/W Multi", 44100, 2); -TEST_EQUAL_INT(err, 0, "Check for errors."); -TEST_NOTEQUAL(h, NULL, "Check handle."); - -ai_close(&err, h); -TEST_EQUAL_INT(err, 0, "Check for errors."); - -h = ai_init(&err, "default", "H/W Multi", 22050, 1); -TEST_EQUAL_INT(err, 0, "Check for errors."); -TEST_NOTEQUAL(h, NULL, "Check handle."); - -char pcm[1880]; // Hold exactly one frame. -int r; - -r = ai_read(&err, h, pcm, 0); -TEST_EQUAL_INT(r, -1, "We should read something."); -TEST_EQUAL_INT(err, BUFFER_TOO_SMALL, "Check for errors."); - -for(int i = 0; i < 100; i++) { - r = ai_read(&err, h, pcm, sizeof(pcm)); -} -TEST_EQUAL_INT(err, 0, "Check for errors."); -TEST_NOTEQUAL_INT(r, 0, "We should read something."); - -char ref[sizeof(pcm)]; -memset(ref, 0, sizeof(ref)); -double diff = compareBuffers(r/sizeof(short), 1, pcm, ref); -TEST_LESS_THAN_FLOAT(diff, 1000.0, "Compare buffers (with no mic on the soundcard)"); - -short p[1024]; -err = 42; -ai_read(&err, h, p, sizeof(p)); -for(size_t i = 0; i < sizeof(p) / sizeof(short); i++) { - TEST_EQUAL_INT(p[i], i, "Compare slide."); -} - -ai_close(&err, h); - -TEST_END; - -#endif/*TEST_AUDIOIN*/ diff --git a/src/audioin.h b/src/audioin.h deleted file mode 100644 index fe12fa4..0000000 --- a/src/audioin.h +++ /dev/null @@ -1,130 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * audioin.h - * - * Wed Sep 30 11:36:18 CEST 2009 - * Copyright 2011 Bent Bisballe Nyeng - * deva@aasimon.org - ****************************************************************************/ - -/* - * This file is part of libaudioin. - * - * libaudioin is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * libaudioin is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with libaudioin; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ -#ifndef __LIBAUDIOIN_AUDIOIN_H__ -#define __LIBAUDIOIN_AUDIOIN_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define NO_ERROR 0 - -#define OUT_OF_MEMORY 101 -#define MISSING_HANDLE 102 - -#define COULD_NOT_OPEN_DEVICE 203 -#define COULD_NOT_SET_HW_PARAMS 204 -#define COULD_NOT_INIT_PARAMS 205 -#define COULD_NOT_SET_ACCESS_MODE 206 -#define COULD_NOT_SET_FORMAT 207 -#define COULD_NOT_SET_CHANNELS 208 -#define COULD_NOT_SET_SAMPLE_RATE 209 -#define COULD_NOT_SET_PERIOD_SIZE 210 - -#define BUFFER_TOO_SMALL 305 -#define BUFFER_OVERRUN 306 -#define READ_ERROR 307 -#define SHORT_READ 308 - -#define MIXER_INIT_FAILED 400 - -#define MIXER_NOT_INITIALISED 401 -#define INVALID_MIXER_LEVEL 402 -#define INVALID_CHANNEL_NUMBER 403 -#define COULD_NOT_SET_MIXER_LEVEL 404 - -struct ai_t; - -/** - * Initalise the AudioIn library and connect to a soundcard and a mixer. - * @param err An int pointer containing error value if function is unsuccessful. - * @param device A string containing the device name to connect to. A list - * possible devices can be seen with the 'aplay -L' command. The device - * "default" are usually the one needed. - * @param mixer A string containing the mixer interface to connect to. A list - * of possible interfaces can be seen with the 'amixer scontrols' command. - * Usually the interface "Capture" is the one needed. - * @param samplerate An unsigned integer containing the desired samplerate in - * Hertz. - * @param channels An unsigned integer containing the desired number of - * channels. The channel samples will be interleaved in the data stream whe - * ai_read is called. - * @return A pointer to the newly created handle or NULL on failure. - */ -struct ai_t *ai_init(int *err, const char *device, const char *mixer, - unsigned int samplerate, unsigned int channels); - -/** - * Read samples from the soundcard. - * @param err An int pointer containing error value if function is unsuccessful. - * @param handle A pointer to the handle to be used. - * @param maxsize The maximum number of bytes (not samples) to read. - * @return Returns the number of bytes (not samples) read or -1 on error. - * NOTE: to get the number of samples read, devide the return value with the - * sample width (2 bytes / 16 bits) and the number of interleaved channels - * (usually 1 or 2). - */ -int ai_read(int *err, struct ai_t *handle, void *pcm, unsigned int maxsize); - -/** - * Adjust channel mixer levels. - * @param err An int pointer containing error value if function is unsuccessful. - * @param handle A pointer to the handle to be used. - * @param channel The channel number to set mixer level of. 0 or 1 should be - * used for the two channels of a stereo interface. - * @param level The mixer level to set, ranging from 0.0 to 1.0 where 0.0 is - * mute and 1.0 is maximum gain. - * @return Returns -1 on error 0 otherwise. - */ -int ai_set_mixer_level(int *err, struct ai_t *handle, unsigned int channel, - float level); - -/** - * Get actual samplerate. - * The samplerate set in ai_init may or may not match a possible samplerate for - * the audio hardware and therefore the ALSA library might decide to use another - * samplerate than the one specified. - * This function can be called to obtain the actual samplerate that the hardware - * has been configured to use. - * @param err An int pointer containing error value if function is unsuccessful. - * @param handle A pointer to the handle to be used. - * @return The samplerate as an integer or -1 on error. - */ -int ai_get_samplerate(int *err, struct ai_t *handle); - -/** - * Close and free the handle. - * @param err An int pointer containing error value if function is unsuccessful. - * @param handle A pointer to the handle to be closed. - */ -void ai_close(int *err, struct ai_t *handle); - -#ifdef __cplusplus -} -#endif - -#endif/*__LIBAUDIOIN_AUDIOIN_H__*/ diff --git a/src/audioio.cc b/src/audioio.cc new file mode 100644 index 0000000..bb04762 --- /dev/null +++ b/src/audioio.cc @@ -0,0 +1,287 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * audioio.cc + * + * Thu Sep 25 15:55:14 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "audioio.h" + +#include "device.h" +#include "mixer.h" +#include "source.h" +#include "sink.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* +#define NO_ERROR 0 + +#define OUT_OF_MEMORY -101 +#define MISSING_HANDLE -102 + +#define COULD_NOT_OPEN_DEVICE -203 +#define COULD_NOT_SET_HW_PARAMS -204 +#define COULD_NOT_INIT_PARAMS -205 +#define COULD_NOT_SET_ACCESS_MODE -206 +#define COULD_NOT_SET_FORMAT -207 +#define COULD_NOT_SET_CHANNELS -208 +#define COULD_NOT_SET_SAMPLE_RATE -209 +#define COULD_NOT_SET_PERIOD_SIZE -210 + +#define BUFFER_TOO_SMALL -305 +#define BUFFER_OVERRUN -306 +#define READ_ERROR -307 +#define SHORT_READ -308 + +#define MIXER_INIT_FAILED -400 + +#define MIXER_NOT_INITIALISED -401 +#define INVALID_MIXER_LEVEL -402 +#define INVALID_CHANNEL_NUMBER -403 +#define COULD_NOT_SET_MIXER_LEVEL -404 +*/ + +#define MAGIC 0xdeadbeef + +struct aio_t { + unsigned int magic; + + Device *device; + + Source *source; + Mixer *source_mixer; + + Sink *sink; + Mixer *sink_mixer; +}; + +// Check if 'h' is a valid aio_t handle and report/return error if not. +#define CHECK_HANDLE(h) \ + do { \ + if(!h || h->magic != MAGIC) { \ + return MISSING_HANDLE; \ + } \ + } while(0) + +struct aio_t *aio_init(int *err, + const char *playback_device, + const char *playback_mixer, + const char *capture_device, + const char *capture_mixer, + unsigned int samplerate, + unsigned int channels) +{ + *err = NO_ERROR; + + const char *device = playback_device; + if(device == NULL || strlen(device) == 0) device = capture_device; + if(device == NULL || strlen(device) == 0) { + *err = COULD_NOT_OPEN_DEVICE; + return NULL; + } + + struct aio_t *h = new aio_t; + memset(h, 0, sizeof(struct aio_t)); + h->magic = MAGIC; + + + if(h == NULL) { + *err = OUT_OF_MEMORY; + return NULL; + } + + h->device = new Device(device); + + if(playback_device != NULL && strlen(playback_device) > 0) { + h->sink = h->device->getSink(playback_device, samplerate, channels); + if(h->sink == NULL) { + *err = COULD_NOT_OPEN_DEVICE; + } + } + + if(playback_mixer != NULL && strlen(playback_mixer) > 0) { + h->sink_mixer = h->device->getMixer(playback_mixer); + if(h->sink_mixer == NULL) { + *err = MIXER_INIT_FAILED; + } + } + + if(capture_device != NULL && strlen(capture_device) > 0) { + h->source = h->device->getSource(capture_device, samplerate, channels); + if(h->sink == NULL) { + *err = COULD_NOT_OPEN_DEVICE; + } + } + + if(capture_mixer != NULL && strlen(capture_mixer) > 0) { + h->source_mixer = h->device->getMixer(capture_mixer); + if(h->source_mixer == NULL) { + *err = MIXER_INIT_FAILED; + } + } + + if(*err != NO_ERROR) { + h->magic = 0; + if(h->source) delete h->source; + if(h->source_mixer) delete h->source_mixer; + if(h->sink) delete h->sink; + if(h->sink_mixer) delete h->sink_mixer; + delete h; + return NULL; + } + + return h; +} + +int aio_read(struct aio_t *h, char *pcm, unsigned int maxsize) +{ + CHECK_HANDLE(h); + + if(h->source) { + return h->source->readSamples(pcm, maxsize); + } + + return MISSING_HANDLE; +} + +int aio_write(struct aio_t *h, const char *pcm, unsigned int size) +{ + CHECK_HANDLE(h); + + if(h->sink) { + return h->sink->writeSamples(pcm, size); + } + + return MISSING_HANDLE; +} + +int aio_set_playback_mixer_level(struct aio_t *h, unsigned int c, float level) +{ + CHECK_HANDLE(h); + + if(h->sink_mixer) { + h->sink_mixer->setLevel(c, level); + return 0; + } + + return MISSING_HANDLE; +} + +int aio_get_playback_mixer_level(struct aio_t *h, unsigned int c, float *level) +{ + CHECK_HANDLE(h); + + if(h->sink_mixer) { + float l = h->sink_mixer->level(c); + if(l < -1000) return INVALID_MIXER_LEVEL; + *level = l; + return 0; + } + + return MISSING_HANDLE; +} + +int aio_get_playback_mixer_level_range(struct aio_t *h, float *min, float *max) +{ + CHECK_HANDLE(h); + + if(h->sink_mixer) { + Mixer::range_t r = h->sink_mixer->range(); + *min = r.min; + *max = r.max; + return 0; + } + + return MISSING_HANDLE; +} + +int aio_set_capture_mixer_level(struct aio_t *h, unsigned int c, float level) +{ + CHECK_HANDLE(h); + + if(h->source_mixer) { + h->source_mixer->setLevel(c, level); + return 0; + } + + return MISSING_HANDLE; +} + +int aio_get_capture_mixer_level(struct aio_t *h, unsigned int c, float *level) +{ + CHECK_HANDLE(h); + + if(h->source_mixer) { + float l = h->source_mixer->level(c); + if(l < -1000) return INVALID_MIXER_LEVEL; + *level = l; + return 0; + } + + return MISSING_HANDLE; +} + +int aio_get_capture_mixer_level_range(struct aio_t *h, float *min, float *max) +{ + CHECK_HANDLE(h); + + if(h->source_mixer) { + Mixer::range_t r = h->source_mixer->range(); + *min = r.min; + *max = r.max; + return 0; + } + + return MISSING_HANDLE; +} + +int aio_get_samplerate(struct aio_t *h) +{ + CHECK_HANDLE(h); + + if(h->source) return h->source->samplerate(); + else if(h->sink) return h->sink->samplerate(); + + return MISSING_HANDLE; +} + +int aio_close(struct aio_t *h) +{ + CHECK_HANDLE(h); + + h->magic = 0; + if(h->source) delete h->source; + if(h->source_mixer) delete h->source_mixer; + if(h->sink) delete h->sink; + if(h->sink_mixer) delete h->sink_mixer; + delete h; + + return 0; +} + +#ifdef __cplusplus +} +#endif diff --git a/src/audioio.h b/src/audioio.h new file mode 100644 index 0000000..f003d02 --- /dev/null +++ b/src/audioio.h @@ -0,0 +1,180 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * audioio.h + * + * Thu Sep 25 15:55:14 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef __LIBAUDIOIO_AUDIOIO_H__ +#define __LIBAUDIOIO_AUDIOIO_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define NO_ERROR 0 + +#define OUT_OF_MEMORY -101 +#define MISSING_HANDLE -102 + +#define COULD_NOT_OPEN_DEVICE -203 +#define COULD_NOT_SET_HW_PARAMS -204 +#define COULD_NOT_INIT_PARAMS -205 +#define COULD_NOT_SET_ACCESS_MODE -206 +#define COULD_NOT_SET_FORMAT -207 +#define COULD_NOT_SET_CHANNELS -208 +#define COULD_NOT_SET_SAMPLE_RATE -209 +#define COULD_NOT_SET_PERIOD_SIZE -210 + +#define BUFFER_TOO_SMALL -305 +#define BUFFER_OVERRUN -306 +#define READ_ERROR -307 +#define SHORT_READ -308 + +#define MIXER_INIT_FAILED -400 + +#define MIXER_NOT_INITIALISED -401 +#define INVALID_MIXER_LEVEL -402 +#define INVALID_CHANNEL_NUMBER -403 +#define COULD_NOT_SET_MIXER_LEVEL -404 + +struct aio_t; + +/** + * Initalise the AudioIO library and connect to a soundcard and a mixer. + * @param err An int pointer containing error value if function is unsuccessful. + * @param device A string containing the device name to connect to. A list + * possible devices can be seen with the 'aplay -L' command. The device + * "default" are usually the one needed. + * @param mixer A string containing the mixer interface to connect to. A list + * of possible interfaces can be seen with the 'amixer scontrols' command. + * Usually the interface "Capture" is the one needed. + * @param samplerate An unsigned integer containing the desired samplerate in + * Hertz. + * @param channels An unsigned integer containing the desired number of + * channels. The channel samples will be interleaved in the data stream whe + * ai_read is called. + * @return A pointer to the newly created handle or NULL on failure. + */ +struct aio_t *aio_init(int *err, + const char *playback_device, + const char *playback_mixer, + const char *capture_device, + const char *capture_mixer, + unsigned int samplerate, + unsigned int channels); + +/** + * Read samples from the soundcard. + * @param err An int pointer containing error value if function is unsuccessful. + * @param handle A pointer to the handle to be used. + * @param pcm Buffer cotaining which will be filled with samples. + * @param maxsize The maximum number of bytes (not samples) to read. + * @return Returns the number of bytes (not samples) read or -1 on error. + * NOTE: to get the number of samples read, devide the return value with the + * sample width (2 bytes / 16 bits) and the number of interleaved channels + * (usually 1 or 2). + */ +int aio_read(struct aio_t *handle, char *pcm, unsigned int maxsize); + +/** + * Write samples to the soundcard. + * @param err An int pointer containing error value if function is unsuccessful. + * @param handle A pointer to the handle to be used. + * @param size The maximum number of bytes (not samples) to be written. + * @return Returns the number of bytes (not samples) written or -1 on error. + * NOTE: to get the number of samples read, devide the return value with the + * sample width (2 bytes / 16 bits) and the number of interleaved channels + * (usually 1 or 2). + */ +int aio_write(struct aio_t *handle, const char *pcm, unsigned int size); + +#if 0 +/** + * Adjust channel mixer levels. + * @param err An int pointer containing error value if function is unsuccessful. + * @param handle A pointer to the handle to be used. + * @param channel The channel number to set mixer level of. 0 or 1 should be + * used for the two channels of a stereo interface. + * @param level The mixer level to set in dB + * @return Returns -1 on error 0 otherwise. + */ +int aio_set_mixer_level(struct ai_t *handle, unsigned int channel, float level); + +/** + * Get channel mixer levels. + * @param err An int pointer containing error value if function is unsuccessful. + * @param handle A pointer to the handle to be used. + * @param channel The channel number to get mixer level of. 0 or 1 should be + * used for the two channels of a stereo interface. + * @return Returns the level in dB. + */ +int aio_get_mixer_level(struct aio_t *handle, unsigned int channel, + float *level); + +int aio_get_mixer_level_range(struct aio_t *handle, float *min, float *max); +#endif + +int aio_set_playback_mixer_level(struct aio_t *handle, unsigned int channel, + float level); + +int aio_get_playback_mixer_level(struct aio_t *handle, unsigned int channel, + float *level); + +int aio_get_playback_mixer_level_range(struct aio_t *handle, + float *min, float *max); + +int aio_set_capture_mixer_level(struct aio_t *handle, unsigned int channel, + float level); + +int aio_get_capture_mixer_level(struct aio_t *handle, unsigned int channel, + float *level); + +int aio_get_capture_mixer_level_range(struct aio_t *handle, + float *min, float *max); + +/** + * Get actual samplerate. + * The samplerate set in ai_init may or may not match a possible samplerate for + * the audio hardware and therefore the ALSA library might decide to use another + * samplerate than the one specified. + * This function can be called to obtain the actual samplerate that the hardware + * has been configured to use. + * @param err An int pointer containing error value if function is unsuccessful. + * @param handle A pointer to the handle to be used. + * @return The samplerate as an integer or -1 on error. + */ +int aio_get_samplerate(struct aio_t *handle); + +/** + * Close and free the handle. + * @param err An int pointer containing error value if function is unsuccessful. + * @param handle A pointer to the handle to be closed. + */ +int aio_close(struct aio_t *handle); + +#ifdef __cplusplus +} +#endif + +#endif/*__LIBAUDIOIO_AUDIOIO_H__*/ diff --git a/src/compat.h b/src/compat.h deleted file mode 100644 index 868a729..0000000 --- a/src/compat.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -*- mode: c++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * File: compat.h - * This file belongs to the Bifrost project. - * Macros for throw compatability. - * Date: Tue Feb 16 14:14:30 CET 2010 - * Author: Bent Bisballe Nyeng - * Copyright: 2010 - * Email: deva@aasimon.org - ****************************************************************************/ -#ifndef __LIBAUDIOIN_COMPAT_H__ -#define __LIBAUDIOIN_COMPAT_H__ - -#ifdef WIN32 -#define _throw(...) -#else -#define _throw(fmt...) throw(fmt) -#endif - -#endif/*__LIBAUDIOIN_COMPAT_H__*/ diff --git a/src/device.cc b/src/device.cc new file mode 100644 index 0000000..f68a90a --- /dev/null +++ b/src/device.cc @@ -0,0 +1,275 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * device.cc + * + * Wed Sep 24 08:54:47 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "device.h" + +Device::Device(std::string device) +{ + card = device; +} + +Device::~Device() +{ + /* + if(handle) { + snd_pcm_drain(handle); + snd_pcm_close(handle); + } + */ +} + +std::vector Device::mixerNames() +{ + std::vector mlist; + + int err; + snd_mixer_t *handle; + snd_mixer_selem_id_t *sid; + snd_mixer_elem_t *elem; + snd_mixer_selem_id_alloca(&sid); + + if((err = snd_mixer_open(&handle, 0)) < 0) { + printf("Mixer %s open error: %s", card.c_str(), snd_strerror(err)); + return mlist; + } + + if((err = snd_mixer_attach(handle, card.c_str())) < 0) { + printf("Mixer attach %s error: %s", card.c_str(), snd_strerror(err)); + snd_mixer_close(handle); + return mlist; + } + + if((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) { + printf("Mixer register error: %s", snd_strerror(err)); + snd_mixer_close(handle); + return mlist; + } + err = snd_mixer_load(handle); + if (err < 0) { + printf("Mixer %s load error: %s", card.c_str(), snd_strerror(err)); + snd_mixer_close(handle); + return mlist; + } + for(elem = snd_mixer_first_elem(handle); + elem; + elem = snd_mixer_elem_next(elem)) { + snd_mixer_selem_get_id(elem, sid); + if(snd_mixer_selem_is_active(elem) == 0) continue; + + char cname[256]; + snprintf(cname, sizeof(cname), "'%s',%i", + snd_mixer_selem_id_get_name(sid), + snd_mixer_selem_id_get_index(sid)); + + mlist.push_back(cname); + } + + snd_mixer_close(handle); + + return mlist; +} + +Mixer *Device::getMixer(std::string name) +{ + int err; + snd_mixer_t *handle; + snd_mixer_selem_id_t *sid; + snd_mixer_elem_t *elem; + snd_mixer_selem_id_alloca(&sid); + + if((err = snd_mixer_open(&handle, 0)) < 0) { + printf("Mixer %s open error: %s", card.c_str(), snd_strerror(err)); + return NULL; + } + + if((err = snd_mixer_attach(handle, card.c_str())) < 0) { + printf("Mixer attach %s error: %s", card.c_str(), snd_strerror(err)); + snd_mixer_close(handle); + return NULL; + } + + if((err = snd_mixer_selem_register(handle, NULL, NULL)) < 0) { + printf("Mixer register error: %s", snd_strerror(err)); + snd_mixer_close(handle); + return NULL; + } + err = snd_mixer_load(handle); + if (err < 0) { + printf("Mixer %s load error: %s", card.c_str(), snd_strerror(err)); + snd_mixer_close(handle); + return NULL; + } + for(elem = snd_mixer_first_elem(handle); + elem; + elem = snd_mixer_elem_next(elem)) { + snd_mixer_selem_get_id(elem, sid); + if(snd_mixer_selem_is_active(elem) == 0) continue; + + char cname[256]; + snprintf(cname, sizeof(cname), "'%s',%i", + snd_mixer_selem_id_get_name(sid), + snd_mixer_selem_id_get_index(sid)); + + if(std::string(cname) == name) { + // NOTE: The Mixer object takes ownership of 'handle' which closed in + // its destructor. + return new Mixer(handle, elem); + } + } + + snd_mixer_close(handle); + + printf("Mixer element \"%s\" not found.\n", name.c_str()); + + return NULL; +} + +static int pcm_init(snd_pcm_t *handle, unsigned int *samplerate, + unsigned int channels, snd_pcm_uframes_t *frames) +{ + int err; + snd_pcm_hw_params_t *params; + + // Allocate a hardware parameters object. + snd_pcm_hw_params_alloca(¶ms); + + // Fill it in with default values. + err = snd_pcm_hw_params_any(handle, params); + if(err) { + printf("snd_pcm_hw_params_any: %s, %d\n", snd_strerror(err), err); + return 1; + } + + // Interleaved mode + err = snd_pcm_hw_params_set_access(handle, params, + SND_PCM_ACCESS_RW_INTERLEAVED); + if(err) { + printf("snd_pcm_hw_params_set_access: %s, %d\n", snd_strerror(err), err); + return 1; + } + + // Signed 16-bit little-endian format + err = snd_pcm_hw_params_set_format(handle, params, SND_PCM_FORMAT_S16_LE); + if(err) { + printf("snd_pcm_hw_params_set_format: %s, %d\n", snd_strerror(err), err); + return 1; + } + + // Set channels (stereo/mono) + err = snd_pcm_hw_params_set_channels(handle, params, channels); + if(err) { + printf("snd_pcm_hw_params_set_channels: %s, %d\n", snd_strerror(err), err); + return 1; + } + + // dir: -1 := exact or first below + // 0 := exact (error if not?) + // 1 := exact or first above + int dir = 1; + + // Set sampling rate + err = snd_pcm_hw_params_set_rate_near(handle, params, samplerate, &dir); + if(err) { + printf("snd_pcm_hw_params_set_rate_near: %s, %d\n", snd_strerror(err), err); + return 1; + } + + // printf("Actual samplerate: %d\n", samplerate); + + err = snd_pcm_hw_params_set_period_size_near(handle, params, frames, &dir); + if(err) { + printf("snd_pcm_hw_params_set_period_size_near: %s, %d\n", + snd_strerror(err), err); + return 1; + } + + // printf("Actual buffersize: %d\n", (int)frames); + + // Write the parameters to the driver + err = snd_pcm_hw_params(handle, params); + if(err) { + printf("snd_pcm_hw_params: %s, %d\n", + snd_strerror(err), err); + return 1; + } + + return 0; +} + +Source *Device::getSource(std::string name, unsigned int samplerate, + unsigned int channels) +{ + int open_mode = 0; + //open_mode |= SND_PCM_NONBLOCK; + //open_mode |= SND_PCM_NO_AUTO_RESAMPLE; + //open_mode |= SND_PCM_NO_AUTO_CHANNELS; + //open_mode |= SND_PCM_NO_AUTO_FORMAT; + //open_mode |= SND_PCM_NO_SOFTVOL; + + int err; + snd_pcm_t *handle; + + // Open PCM device for recording (capture). + err = snd_pcm_open(&handle, name.c_str(), SND_PCM_STREAM_CAPTURE, + open_mode); + if(err) { + printf("snd_pcm_open: %s, %d\n", snd_strerror(err), err); + return NULL; + } + + snd_pcm_uframes_t frames = 512; + if(pcm_init(handle, &samplerate, channels, &frames)) return NULL; + + return new Source(handle, samplerate, channels, frames); +} + +Sink *Device::getSink(std::string name, unsigned int samplerate, + unsigned int channels) +{ + int open_mode = 0; + //open_mode |= SND_PCM_NONBLOCK; + //open_mode |= SND_PCM_NO_AUTO_RESAMPLE; + //open_mode |= SND_PCM_NO_AUTO_CHANNELS; + //open_mode |= SND_PCM_NO_AUTO_FORMAT; + //open_mode |= SND_PCM_NO_SOFTVOL; + + int err; + snd_pcm_t *handle; + + // Open PCM device for recording (capture). + err = snd_pcm_open(&handle, name.c_str(), SND_PCM_STREAM_PLAYBACK, + open_mode); + if(err) { + printf("snd_pcm_open: %s, %d\n", snd_strerror(err), err); + return NULL; + } + + snd_pcm_uframes_t frames = 512; + if(pcm_init(handle, &samplerate, channels, &frames)) return NULL; + + return new Sink(handle, samplerate, channels, frames); +} diff --git a/src/device.h b/src/device.h new file mode 100644 index 0000000..5129d36 --- /dev/null +++ b/src/device.h @@ -0,0 +1,61 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * device.h + * + * Wed Sep 24 08:54:47 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef __LIBAUDIOIO_DEVICE_H__ +#define __LIBAUDIOIO_DEVICE_H__ + +#include +#include + +// Make API behave like ALSA 1.x.x with ALSA 0.9.x +#define ALSA_PCM_NEW_HW_PARAMS_API + +#include + +#include "mixer.h" +#include "source.h" +#include "sink.h" + +class Device { +public: + Device(std::string device); + ~Device(); + + std::vector mixerNames(); + Mixer *getMixer(std::string name); + + Source *getSource(std::string name, unsigned int samplerate, + unsigned int channels); + + Sink *getSink(std::string name, unsigned int samplerate, + unsigned int channels); + +private: + std::string card; +}; + +#endif/*__LIBAUDIOIO_DEVICE_H__*/ diff --git a/src/mixer.cc b/src/mixer.cc new file mode 100644 index 0000000..5a6efb7 --- /dev/null +++ b/src/mixer.cc @@ -0,0 +1,321 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * mixer.cc + * + * Tue Sep 23 14:38:54 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "mixer.h" + +#include +#include + +#define fERROR (strtof("-INF", NULL)) + +Mixer::Mixer(snd_mixer_t *handle, snd_mixer_elem_t *elem) +{ + this->handle = handle; + this->elem = elem; + + /* + if (snd_mixer_selem_has_capture_volume(elem) || + snd_mixer_selem_has_capture_switch(elem)) { + printf("Capture channels:\n"); + if(snd_mixer_selem_is_capture_mono(elem)) { + printf(" Mono"); + } else { + for(int ichn = 0; ichn <= (int)SND_MIXER_SCHN_LAST; ichn++) { + snd_mixer_selem_channel_id_t chn = (snd_mixer_selem_channel_id_t)ichn; + if(!snd_mixer_selem_has_capture_channel(elem, chn)) continue; + printf(" - %s\n", snd_mixer_selem_channel_name(chn)); + } + } + } + */ + + + + + + + + /* + snd_mixer_selem_id_t *mixer; + + // Open mixer device + if(snd_mixer_open(&mixhnd, 0) != 0) + throw MixerInitilisationFailed(); + + if(snd_mixer_attach_hctl(mixhnd, hctl) != 0) + throw MixerInitilisationFailed(); + + if(snd_mixer_selem_register(mixhnd, NULL, NULL) < 0) + throw MixerInitilisationFailed(); + + if(snd_mixer_load(mixhnd) < 0) + throw MixerInitilisationFailed(); + + // Obtain mixer element + snd_mixer_selem_id_alloca(&mixer); + if(mixer == NULL) throw MixerInitilisationFailed(); + snd_mixer_selem_id_set_name(mixer, mixer_interface); + + elem = snd_mixer_find_selem(mixhnd, mixer); + if(elem == NULL) throw MixerInitilisationFailed(); + */ + + /* + // Obtain mixer enumeration element "Input Source" and set it to 2 (line). + snd_mixer_selem_id_set_name(mixer, "Input Source"); + + snd_mixer_elem_t *iselem = snd_mixer_find_selem(mixhnd, mixer); + if(iselem == NULL) return; + + if(snd_mixer_selem_is_enumerated(iselem)) { + // Set to line-in + for(int i = 0; i < 3; i++) { + char name[16]; + snd_mixer_selem_get_enum_item_name(iselem, i, sizeof(name), name); + if(std::string(name) == "Line") { + snd_mixer_selem_set_enum_item(iselem, SND_MIXER_SCHN_MONO, i); + } + } + } + */ +} + +Mixer::~Mixer() +{ + if(handle) snd_mixer_close(handle); +} + +snd_mixer_selem_channel_id_t Mixer::chanId(int idx) +{ + int num = 0; + if(snd_mixer_selem_is_capture_mono(elem)) { + if(idx == 0) return SND_MIXER_SCHN_MONO; + } else { + for(int ichn = 0; ichn <= (int)SND_MIXER_SCHN_LAST; ichn++) { + snd_mixer_selem_channel_id_t chn = (snd_mixer_selem_channel_id_t)ichn; + if(!snd_mixer_selem_has_capture_channel(elem, chn) && + !snd_mixer_selem_has_playback_channel(elem, chn)) continue; + if(idx == num) return chn; + num++; + } + } + return SND_MIXER_SCHN_UNKNOWN; +} + +int Mixer::numberOfChannels() +{ + int num = 0; + if(snd_mixer_selem_is_capture_mono(elem)) { + num = 1; + } else { + for(int ichn = 0; ichn <= (int)SND_MIXER_SCHN_LAST; ichn++) { + snd_mixer_selem_channel_id_t chn = (snd_mixer_selem_channel_id_t)ichn; + if(!snd_mixer_selem_has_capture_channel(elem, chn)) continue; + num++; + } + } + + return num; +} + +bool Mixer::isCapture() +{ + return snd_mixer_selem_has_capture_volume(elem) || + snd_mixer_selem_has_capture_switch(elem); +} + +bool Mixer::isPlayback() +{ + return snd_mixer_selem_has_playback_volume(elem); +} + +bool Mixer::isEnum() +{ + return snd_mixer_selem_is_enumerated(elem); +} + +void Mixer::setEnumValue(std::string value) +{ + if(!isEnum()) return; +} + +std::string Mixer::enumValue() +{ + if(!isEnum()) return ""; + + int i; + unsigned int idx; + char itemname[40]; + for(i = 0; !snd_mixer_selem_get_enum_item(elem, + (snd_mixer_selem_channel_id_t)i, + &idx); i++) { + snd_mixer_selem_get_enum_item_name(elem, idx, + sizeof(itemname) - 1, itemname); + return itemname; + } + + return ""; +} + +std::vector Mixer::enumValues() +{ + std::vector values; + if(!isEnum()) return values; + + int i, items; + char itemname[40]; + items = snd_mixer_selem_get_enum_items(elem); + for (i = 0; i < items; i++) { + snd_mixer_selem_get_enum_item_name(elem, (snd_mixer_selem_channel_id_t)i, + sizeof(itemname) - 1, itemname); + values.push_back(itemname); + } + + return values; +} + +int Mixer::setLevel(int channel, float level) +{ + int err; + long int value = level * 100; + // dir: -1 := exact or first below + // 0 := exact (error if not?) + // 1 := exact or first above + int dir = 1; + + if(isCapture()) { + err = snd_mixer_selem_set_capture_dB(elem, chanId(channel), value, dir); + if(err) { + printf("snd_mixer_selem_set_capture_dB: %s, %d\n", + snd_strerror(err), err); + return 1; + } + } + + if(isPlayback()) { + err = snd_mixer_selem_set_playback_dB(elem, chanId(channel), value, dir); + if(err) { + printf("snd_mixer_selem_set_playback_dB: %s, %d\n", + snd_strerror(err), err); + return 1; + } + } + + return 0; +} + +float Mixer::level(int channel) +{ + int err; + long int value; + + if(isCapture()) { + err = snd_mixer_selem_get_capture_dB(elem, chanId(channel), &value); + if(err) { + printf("snd_mixer_selem_get_capture_dB: %s, %d\n", + snd_strerror(err), err); + return fERROR; + } + } else if(isPlayback()) { + err = snd_mixer_selem_get_playback_dB(elem, chanId(channel), &value); + if(err) { + printf("snd_mixer_selem_get_playback_dB: %s, %d\n", + snd_strerror(err), err); + return fERROR; + } + } else { + return fERROR; + } + + return (float)value / 100.0; +} + +Mixer::range_t Mixer::range() +{ + Mixer::range_t range; + + int err; + long int lvl_min, lvl_max; + + if(isCapture()) { + err = snd_mixer_selem_get_capture_dB_range(elem, &lvl_min, &lvl_max); + + if(err) { + printf("snd_mixer_selem_get_capture_dB_range: %s, %d\n", + snd_strerror(err), err); + } + } else if(isPlayback()) { + err = snd_mixer_selem_get_playback_dB_range(elem, &lvl_min, &lvl_max); + + if(err) { + printf("snd_mixer_selem_get_playback_dB_range: %s, %d\n", + snd_strerror(err), err); + } + } else { + range.min = fERROR; + range.max = fERROR; + return range; + } + + range.min = (float)lvl_min / 100.0; + range.max = (float)lvl_max / 100.0; + + return range; +} + +void Mixer::setCapture(bool capture) +{ + if(!isCapture()) return; + int c = capture?1:0; + int err; + err = snd_mixer_selem_set_capture_switch_all(elem, c); + if(err) { + printf("snd_mixer_selem_set_capture_switch_all: %s, %d\n", + snd_strerror(err), err); + } +} + +bool Mixer::capture() +{ + if(!isCapture()) return false; + + int err; + + int num = numberOfChannels(); + for(int idx = 0; idx < num; idx++) { + int value; + err = snd_mixer_selem_get_capture_switch(elem, chanId(idx), &value); + if(err) { + printf(" snd_mixer_selem_get_capture_switch: %s, %d\n", + snd_strerror(err), err); + return false; + } + if(value == 0) return false; + } + + return true; +} diff --git a/src/mixer.h b/src/mixer.h new file mode 100644 index 0000000..0adcdda --- /dev/null +++ b/src/mixer.h @@ -0,0 +1,125 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * mixer.h + * + * Tue Sep 23 14:38:54 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef __LIBAUDIOIO_MIXER_H__ +#define __LIBAUDIOIO_MIXER_H__ + +// Make API behave like ALSA 1.x.x with ALSA 0.9.x +#define ALSA_PCM_NEW_HW_PARAMS_API + +#include + +#include +#include +#include + +/** + * A Mixer object represents a single group of channels, for example the two + * channels of a stereo mixer. + */ +class Mixer { +public: + /** + * Mixer constructor is not to be called "manually" is is invoked by + * Device::getMixer() + */ + Mixer(snd_mixer_t *handle, snd_mixer_elem_t *elem); + ~Mixer(); + + /** + * Get number of channels in this mixer 'strip' + */ + int numberOfChannels(); + + /** + * Return true if this mixer is a capture device, false otherwise. + */ + bool isCapture(); + + /** + * Return true if this mixer is a playback device, false otherwise. + */ + bool isPlayback(); + + /** + * Return true if this mixer is a enum, false otherwise. + */ + bool isEnum(); + + /** + * For capture channels only! + * Set arm for recording flag on all mixer channels. + */ + void setCapture(bool capture); + + /** + * Return true if all channels are armed for recording. + * Return false if not a capture channels strip, or if at least one channel + * is not armed. + */ + bool capture(); + + /** + * Set enum value. + */ + void setEnumValue(std::string value); + + /** + * Get enum value. + */ + std::string enumValue(); + + /** + * Get list of possible enum values. + */ + std::vector enumValues(); + + /** + * Get/set mixer volume level in dB. + * On error (no such channel) -INF is returned. + */ + int setLevel(int channel, float level); + // 0 on success, 1 on error. + float level(int channel); + + typedef struct { + float min; + float max; + } range_t; + /** + * Poll the valid volume range of this mixer in dB. + */ + range_t range(); + +private: + snd_mixer_selem_channel_id_t chanId(int idx); + + snd_mixer_t *handle; + snd_mixer_elem_t *elem; +}; + +#endif/*__LIBAUDIOIO_MIXER_H__*/ diff --git a/src/sink.cc b/src/sink.cc new file mode 100644 index 0000000..4f7cd0f --- /dev/null +++ b/src/sink.cc @@ -0,0 +1,79 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * sink.cc + * + * Thu Sep 25 10:35:42 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "sink.h" +Sink::Sink(snd_pcm_t *handle, unsigned int _samplerate, + unsigned int _channels, snd_pcm_uframes_t _frames) +{ + this->handle = handle; + this->_samplerate = _samplerate; + this->_channels = _channels; + this->_frames = _frames; +} + +Sink::~Sink() +{ + snd_pcm_drain(handle); + snd_pcm_close(handle); +} + +int Sink::writeSamples(const char *pcm, size_t size) +{ + int rc; + + /* + if(size < frames * sizeof(short) * channels) { + throw PcmBufferTooSmall(); + } + */ + + rc = snd_pcm_writei(handle, pcm, size / sizeof(short)); + if(rc == -EPIPE) { + // EPIPE means overrun + //snd_pcm_prepare(handle); + return -2; + } else if (rc < 0) { + return -1; // Read Error + } + + return rc * sizeof(short) /* * channels */ ; +} + +unsigned int Sink::samplerate() +{ + return this->_samplerate; +} + +unsigned int Sink::channels() +{ + return this->_channels; +} + +snd_pcm_uframes_t Sink::frames() +{ + return this->_frames; +} diff --git a/src/sink.h b/src/sink.h new file mode 100644 index 0000000..3ea0bf0 --- /dev/null +++ b/src/sink.h @@ -0,0 +1,56 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * sink.h + * + * Thu Sep 25 10:35:42 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef __LIBAUDIOIO_SINK_H__ +#define __LIBAUDIOIO_SINK_H__ + +// Make API behave like ALSA 1.x.x with ALSA 0.9.x +#define ALSA_PCM_NEW_HW_PARAMS_API + +#include + +class Sink { +public: + Sink(snd_pcm_t *handle, unsigned int samplerate, + unsigned int channels, snd_pcm_uframes_t frames); + ~Sink(); + + int writeSamples(const char *pcm, size_t size); + + unsigned int samplerate(); + unsigned int channels(); + snd_pcm_uframes_t frames(); + +private: + snd_pcm_t *handle; + + unsigned int _samplerate; + unsigned int _channels; + snd_pcm_uframes_t _frames; +}; + +#endif/*__LIBAUDIOIO_SINK_H__*/ diff --git a/src/source.cc b/src/source.cc new file mode 100644 index 0000000..187a28e --- /dev/null +++ b/src/source.cc @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * source.cc + * + * Thu Sep 25 10:35:39 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "source.h" + +Source::Source(snd_pcm_t *handle, unsigned int _samplerate, + unsigned int _channels, snd_pcm_uframes_t _frames) +{ + this->handle = handle; + this->_samplerate = _samplerate; + this->_channels = _channels; + this->_frames = _frames; +} + +Source::~Source() +{ + snd_pcm_drain(handle); + snd_pcm_close(handle); +} + +int Source::readSamples(char *pcm, size_t maxsize) +{ + int rc; + + /* + if(size < frames * sizeof(short) * channels) { + throw PcmBufferTooSmall(); + } + */ + + rc = snd_pcm_readi(handle, pcm, maxsize / sizeof(short)); + if(rc == -EPIPE) { + // EPIPE means overrun + snd_pcm_prepare(handle); + return -2; + } else if (rc < 0) { + return -1; // Read Error + } + + return rc * sizeof(short) /* * channels */; +} + +unsigned int Source::samplerate() +{ + return this->_samplerate; +} + +unsigned int Source::channels() +{ + return this->_channels; +} + +snd_pcm_uframes_t Source::frames() +{ + return this->_frames; +} + diff --git a/src/source.h b/src/source.h new file mode 100644 index 0000000..d7e2d76 --- /dev/null +++ b/src/source.h @@ -0,0 +1,56 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set et sw=2 ts=2: */ +/*************************************************************************** + * source.h + * + * Thu Sep 25 10:35:39 CEST 2014 + * Copyright 2014 Bent Bisballe Nyeng + * deva@aasimon.org + ****************************************************************************/ + +/* + * This file is part of LibAudioIO. + * + * LibAudioIO 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. + * + * LibAudioIO 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 LibAudioIO; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#ifndef __LIBAUDIOIO_SOURCE_H__ +#define __LIBAUDIOIO_SOURCE_H__ + +// Make API behave like ALSA 1.x.x with ALSA 0.9.x +#define ALSA_PCM_NEW_HW_PARAMS_API + +#include + +class Source { +public: + Source(snd_pcm_t *handle, unsigned int samplerate, + unsigned int channels, snd_pcm_uframes_t frames); + ~Source(); + + int readSamples(char *pcm, size_t maxsize); + + unsigned int samplerate(); + unsigned int channels(); + snd_pcm_uframes_t frames(); + +private: + snd_pcm_t *handle; + + unsigned int _samplerate; + unsigned int _channels; + snd_pcm_uframes_t _frames; +}; + +#endif/*__LIBAUDIOIO_SOURCE_H__*/ diff --git a/src/test_audio.h b/src/test_audio.h deleted file mode 100644 index 68dac67..0000000 --- a/src/test_audio.h +++ /dev/null @@ -1,112 +0,0 @@ -/* -*- mode: c++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * File: test_audio.h - * This file belongs to the Bifrost project. - * [FILL IN DESCRIPTION HERE] - * Date: Wed Feb 3 08:04:33 CET 2010 - * Author: Bent Bisballe Nyeng - * Copyright: 2010 - * Email: deva@aasimon.org - ****************************************************************************/ -#ifndef __BIFROST_TEST_AUDIO_H__ -#define __BIFROST_TEST_AUDIO_H__ - -#include -#include -#include - -#ifdef VERBOSE -#include -#endif - -static inline size_t getBufferSize(size_t samples, size_t channels) -{ - return samples * channels * sizeof(short); -} - -static inline char *getBuffer(size_t samples, size_t channels) -{ - return (char*)calloc(getBufferSize(samples, channels), 1); -} - -static inline char *getSineBuffer(size_t samples, size_t channels, - size_t srate, size_t freq) -{ - short *s = (short*)getBuffer(samples, channels); - for(size_t i = 0; i < samples; i++) { - double x = (double)i / (double)srate; - double val = sin(x * 2 * M_PI * freq); - - for(size_t c = 0; c < channels; c++) { - s[(i * channels) + c] = val * 32500; - } - - } - return (char*)s; -} - -static inline char *getNoiseBuffer(size_t samples, size_t channels) -{ - srand(time(NULL)); - short *s = (short*)getBuffer(samples, channels); - for(size_t i = 0; i < samples; i++) { - for(size_t c = 0; c < channels; c++) { - s[(i * channels) + c] = (rand() % 65000) - 32500; - } - } - return (char*)s; -} - -static inline void normaliseBuffer(size_t samples, size_t channels, char *buf) -{ - int max = 0; - - short *s = (short*)buf; - for(size_t i = 0; i < samples; i++) { - for(size_t c = 0; c < channels; c++) { - if(max < abs(s[(i * channels) + c])) max = abs(s[(i * channels) + c]); - } - } - - for(size_t i = 0; i < samples; i++) { - for(size_t c = 0; c < channels; c++) { - s[(i * channels) + c] *= 32500/max; - } - } - -} - -static inline double compareBuffers(size_t samples, size_t channels, char *buf1, char *buf2) -{ - double diff = 0.0; - -#ifdef NORM - normaliseBuffer(samples, channels, buf1); - normaliseBuffer(samples, channels, buf2); -#endif - - short *s1 = (short*)buf1; - short *s2 = (short*)buf2; - - for(size_t i = 0; i < samples; i++) { - for(size_t c = 0; c < channels; c++) { - diff += (double)abs(s1[(i * channels) + c] - s2[(i * channels) + c]) / (double)(samples*channels); -#ifdef VERBOSE - if(c == 0) fprintf(stderr, "%d\t%d\t~%d\t: %f\n", - s1[(i * channels) + c], s2[(i * channels) + c], - s1[(i * channels) + c] - s2[(i * channels) + c], - diff); -#endif - - } - } - -#ifdef VERBOSE - fprintf(stderr, "Diff: %f\n", diff); -#endif - - return diff; -} - - -#endif/*__BIFROST_TEST_AUDIO_H__*/ diff --git a/tools/add_file b/tools/add_file index 89d4e1a..1a17d46 100755 --- a/tools/add_file +++ b/tools/add_file @@ -1,5 +1,5 @@ #!/bin/bash -PROJECT="LibAudioIn" +PROJECT="LibAudioIO" function allfile() { echo "/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */" > $1; @@ -17,19 +17,19 @@ function allfile() { echo "/*" >> $1; echo " * This file is part of $PROJECT." >> $1; echo " *" >> $1; - echo " * $PROJECT is free software; you can redistribute it and/or modify" >> $1; - echo " * it under the terms of the GNU General Public License as published by" >> $1; - echo " * the Free Software Foundation; either version 2 of the License, or" >> $1; - echo " * (at your option) any later version." >> $1; - echo " *" >> $1; + echo " * $PROJECT is free software; you can redistribute it and/or" >> $1; + echo " * modify it under the terms of the GNU Lesser General Public" >> $1; + echo " * License as published by the Free Software Foundation; either" >> $1; + echo " * version 2.1 of the License, or (at your option) any later version." >> $1; + echo " * " >> $1; echo " * $PROJECT is distributed in the hope that it will be useful," >> $1; echo " * but WITHOUT ANY WARRANTY; without even the implied warranty of" >> $1; - echo " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the" >> $1; - echo " * GNU General Public License for more details." >> $1; - echo " *" >> $1; - echo " * You should have received a copy of the GNU General Public License" >> $1; - echo " * along with $PROJECT; if not, write to the Free Software" >> $1; - echo " * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA." >> $1; + echo " * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU" >> $1; + echo " * Lesser General Public License for more details." >> $1; + echo " * " >> $1; + echo " * You should have received a copy of the GNU Lesser General Public" >> $1; + echo " * License along with $PROJECT; if not, write to the Free Software" >> $1; + echo " * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA" >> $1; echo " */" >> $1; } @@ -42,24 +42,6 @@ function ccfile() { echo -n $hf >> $1; echo '"' >> $1; echo '' >> $1; - - local hn=`echo $1 | cut -d'.' -f1 | tr 'a-z.' 'A-Z_'` - echo "#ifdef TEST_${hn}" >> $1; - echo "//Additional dependency files" >> $1; - echo "//deps:" >> $1; - echo "//Required cflags (autoconf vars may be used)" >> $1; - echo "//cflags:" >> $1; - echo "//Required link options (autoconf vars may be used)" >> $1; - echo "//libs:" >> $1; - echo "#include \"test.h\"" >> $1; - echo "" >> $1; - echo "TEST_BEGIN;" >> $1; - echo "" >> $1; - echo "// TODO: Put some testcode here (see test.h for usable macros)." >> $1; - echo "" >> $1; - echo "TEST_END;" >> $1; - echo "" >> $1; - echo "#endif/*TEST_${hn}*/" >> $1; } function hfile() { -- cgit v1.2.3