diff --git a/builds/r128x-cli b/builds/r128x-cli new file mode 100755 index 0000000..7ca09c6 Binary files /dev/null and b/builds/r128x-cli differ diff --git a/builds/r128x-gui.app/Contents/Info.plist b/builds/r128x-gui.app/Contents/Info.plist new file mode 100644 index 0000000..4d0b31a --- /dev/null +++ b/builds/r128x-gui.app/Contents/Info.plist @@ -0,0 +1,48 @@ + + + + + BuildMachineOSBuild + 12D78 + CFBundleDevelopmentRegion + en + CFBundleExecutable + r128x-gui + CFBundleIdentifier + net.audionuma.r128x-gui + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + r128x-gui + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.2 + CFBundleSignature + ???? + CFBundleVersion + 1 + DTCompiler + + DTPlatformBuild + 4H512 + DTPlatformVersion + GM + DTSDKBuild + 12D75 + DTSDKName + macosx10.8 + DTXcode + 0461 + DTXcodeBuild + 4H512 + LSMinimumSystemVersion + 10.8 + NSHumanReadableCopyright + Copyright © 2012-2013 Manuel Naudin. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/builds/r128x-gui.app/Contents/MacOS/r128x-gui b/builds/r128x-gui.app/Contents/MacOS/r128x-gui new file mode 100755 index 0000000..cc285ae Binary files /dev/null and b/builds/r128x-gui.app/Contents/MacOS/r128x-gui differ diff --git a/builds/r128x-gui.app/Contents/PkgInfo b/builds/r128x-gui.app/Contents/PkgInfo new file mode 100644 index 0000000..bd04210 --- /dev/null +++ b/builds/r128x-gui.app/Contents/PkgInfo @@ -0,0 +1 @@ +APPL???? \ No newline at end of file diff --git a/builds/r128x-gui.app/Contents/Resources/MainMenu.nib b/builds/r128x-gui.app/Contents/Resources/MainMenu.nib new file mode 100644 index 0000000..29bb18c Binary files /dev/null and b/builds/r128x-gui.app/Contents/Resources/MainMenu.nib differ diff --git a/builds/r128x-gui.app/Contents/Resources/en.lproj/Credits.rtf b/builds/r128x-gui.app/Contents/Resources/en.lproj/Credits.rtf new file mode 100644 index 0000000..7ee4f3d --- /dev/null +++ b/builds/r128x-gui.app/Contents/Resources/en.lproj/Credits.rtf @@ -0,0 +1,17 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\paperw11900\paperh16840\vieww9600\viewh8400\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 + +\f0\b\fs24 \cf0 r128x\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural + +\b0 \cf0 A software for measuring loudness of audio files.\ +\ +Should not be used for serious things like managing nuclear power plants or hospitals.\ +\ +Released under GPL license.\ +\ +Includes code from libebur128 by Jan Kokem\'fcller\ +https://github.com/jiixyj/libebur128} \ No newline at end of file diff --git a/builds/r128x-gui.app/Contents/Resources/en.lproj/InfoPlist.strings b/builds/r128x-gui.app/Contents/Resources/en.lproj/InfoPlist.strings new file mode 100644 index 0000000..5e45963 Binary files /dev/null and b/builds/r128x-gui.app/Contents/Resources/en.lproj/InfoPlist.strings differ diff --git a/gpl.txt b/gpl.txt new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/gpl.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + 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 +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 +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. + + + 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 program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +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 +. diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..d6406b4 --- /dev/null +++ b/license.txt @@ -0,0 +1,63 @@ +r128x, a command line tool for loudness measurement of files on Mac OSX Intel. + +License + +The libebur128 files are from the libebur128 project, https://github.com/jiixyj/libebur128. + +This is the original license for libebur128 : + + +Copyright (c) 2011 Jan Kokemüller + + +Permission is hereby granted, free of charge, to any person obtaining a copy + +of this software and associated documentation files (the "Software"), to deal + +in the Software without restriction, including without limitation the rights + +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + +copies of the Software, and to permit persons to whom the Software is + +furnished to do so, subject to the following conditions: + + +The above copyright notice and this permission notice shall be included in + +all copies or substantial portions of the Software. + + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +THE SOFTWARE. + + +The license for r128x is as follow : + + +Copyright (c) 2012-2013 Manuel Naudin (audionuma@gmail.com) + + +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 program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . \ No newline at end of file diff --git a/r128x-cli/CliController.h b/r128x-cli/CliController.h index 5049fc5..49e492a 100644 --- a/r128x-cli/CliController.h +++ b/r128x-cli/CliController.h @@ -1,13 +1,30 @@ +// CliController.h +// This file is part of r128x. // -// CliController.h -// r128x +// r128x 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. // -// Created by manu naudin on 08/04/13. -// Copyright (c) 2013 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import @interface CliController : NSObject +@property NSString *filePath; +@property double il, lra; +@property Float32 maxTP; +@property SInt32 status; + +- (id) initWithPath: (NSString *) thePath; + +- (void) doMeasure; @end diff --git a/r128x-cli/CliController.m b/r128x-cli/CliController.m index 60244ad..fe77c09 100644 --- a/r128x-cli/CliController.m +++ b/r128x-cli/CliController.m @@ -1,13 +1,53 @@ +// CliController.m +// This file is part of r128x. // -// CliController.m -// r128x +// r128x 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. // -// Created by manu naudin on 08/04/13. -// Copyright (c) 2013 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import "CliController.h" +#import "ExtAudioProcessor.h" @implementation CliController +- (id) initWithPath: (NSString *) thePath { + if (self = [super init]) { + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(progressUpdate:) name:@"R128X_Progress" object:nil]; + self.filePath = thePath; + } + return self; + +} +- (void) doMeasure { + OSStatus err = noErr; + double il, lra; + Float32 max_tp; + self.status = ExtAudioReader((__bridge CFStringRef)(self.filePath), &il, &lra, &max_tp); + if (self.status != noErr) { + self.il = NAN; + self.lra = NAN; + self.maxTP = NAN; + } else { + self.il = il; + self.lra = lra; + self.maxTP = max_tp; + self.status = err; + //printf("%.1f %.1f %.1f\n", il, lra, max_tp); + } +} + +- (void) progressUpdate: (NSNotification *) notification { + NSNumber *f = [notification object]; + //printf("%.1f\n", [f floatValue]); +} @end diff --git a/r128x-cli/main.m b/r128x-cli/main.m index da2dfb9..001a551 100644 --- a/r128x-cli/main.m +++ b/r128x-cli/main.m @@ -1,20 +1,42 @@ +// main.m +// This file is part of r128x. // -// main.m -// r128x-cli +// r128x 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. // -// Created by manu naudin on 08/04/13. -// Copyright (c) 2013 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 + #import +#import "CliController.h" int main(int argc, const char * argv[]) { - + @autoreleasepool { - - // insert code here... - NSLog(@"Hello, World!"); + if (argc < 2) { + printf("Missing arguments\nYou should specify at least one audio file\nr128x /some/file\n"); + return 0; + } else { + CliController *controller = [[CliController alloc] init]; + [[NSNotificationCenter defaultCenter] addObserver:controller selector:@selector(progressUpdate:) name:@"R128X_Progress" object:nil]; + + for (int i = 1; i < argc; i++) { + [controller setFilePath:[NSString stringWithUTF8String:argv[i]]]; + [controller doMeasure]; + NSString *fileName = [[controller filePath] lastPathComponent]; + printf("%s\t %.1f\t%.1f\t%.1f\n", [fileName UTF8String], [controller il], [controller lra], [controller maxTP]); + } + } } return 0; diff --git a/r128x-gui/AppDelegate.h b/r128x-gui/AppDelegate.h index fea87da..568d1ca 100644 --- a/r128x-gui/AppDelegate.h +++ b/r128x-gui/AppDelegate.h @@ -1,10 +1,19 @@ +// AppDelegate.h +// This file is part of r128x. // -// AppDelegate.h -// r128x-gui +// r128x 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. // -// Created by Manuel Naudin on 08/04/13. -// Copyright (c) 2013 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import @@ -12,4 +21,25 @@ @property (assign) IBOutlet NSWindow *window; +@property (unsafe_unretained) IBOutlet NSButton *fileSelectBtn; +@property (unsafe_unretained) IBOutlet NSTextField *filesInQueueFld; +@property (unsafe_unretained) IBOutlet NSTextField *currentFileProcessedFld; +@property (unsafe_unretained) IBOutlet NSArrayController *myArrayController; +@property (unsafe_unretained) IBOutlet NSTableView *myTableView; +@property (unsafe_unretained) IBOutlet NSLevelIndicatorCell *progressIndicator; +@property NSMutableArray *filesQueue; +@property NSThread *workingThread; + +- (IBAction)selectBtnPressed:(id)sender; + +- (void) timerFire; + +- (void) updateView; + +- (void) droppedFiles: (NSNotification *) notification; + +- (void) processedFiles: (NSNotification *) notification; + +- (void) progressUpdate: (NSNotification *) notification; + @end diff --git a/r128x-gui/AppDelegate.m b/r128x-gui/AppDelegate.m index ab1c82d..1c95191 100644 --- a/r128x-gui/AppDelegate.m +++ b/r128x-gui/AppDelegate.m @@ -1,18 +1,119 @@ +// AppDelegate.m +// This file is part of r128x. // -// AppDelegate.m -// r128x-gui +// r128x 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. // -// Created by Manuel Naudin on 08/04/13. -// Copyright (c) 2013 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import "AppDelegate.h" +#import "FileReport.h" @implementation AppDelegate - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - // Insert code here to initialize your application + //self.maintainer = [[FilesMaintainer alloc] init]; + self.filesQueue =[NSMutableArray arrayWithCapacity:1]; + [self.filesInQueueFld setStringValue:@"0"]; + [self.currentFileProcessedFld setStringValue:@""]; + [self.progressIndicator setIntegerValue:0]; + [NSTimer scheduledTimerWithTimeInterval:1.0 + target:self + selector:@selector(timerFire) + userInfo:nil + repeats:true]; + //self.workingThread = [[NSThread alloc] initWithTarget:self.maintainer + //selector:@selector(processNextFileInQueue:) + // object:self]; + self.workingThread = nil; + //[self.receiver registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil]]; + //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(droppedFiles:) name:@"R128X_FilesDropped" object:nil]; + [self.window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil]]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(droppedFiles:) name:@"R128X_FilesDropped" object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(processedFiles:) name:@"R128X_FileProcessed" object:nil]; + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(progressUpdate:) name:@"R128X_Progress" object:nil]; + +} +- (IBAction)selectBtnPressed:(id)sender { + //NSLog(@"pressed"); + NSOpenPanel *fileChooser = [NSOpenPanel openPanel]; + [fileChooser setCanChooseDirectories:false]; + [fileChooser setCanChooseFiles:true]; + [fileChooser setAllowsMultipleSelection:true]; + if ([fileChooser runModal] == NSOKButton) { + for (NSURL *fileURL in [fileChooser URLs]) { + [self.filesQueue addObject:[fileURL path]]; + } + } + //[self.maintainer addToQueue:@"string"]; + [self updateView]; +} + +- (void) timerFire { + //NSLog(@"fire !************************"); + //NSLog([self.workingThread isExecuting] ? @"Yes" : @"No"); + if ([self.filesQueue count] > 0 && ![self.workingThread isExecuting]) { + //[self setIsWorking:true]; + //[self.maintainer processNextFileInQueue:self]; + self.workingThread = [[NSThread alloc] initWithTarget:self + selector:@selector(processNextFileInQueue:) + object:self]; + [self.workingThread start]; + } else { + //NSLog(@"nothing to do"); + } + [self updateView]; +} + +- (void) updateView { + [self.progressIndicator setIntegerValue:0]; + [self.filesInQueueFld setStringValue:[NSString stringWithFormat:@"%ld", [self.filesQueue count]]]; } +- (void) droppedFiles: (NSNotification *) notification { + NSArray *files = [notification object]; + //NSLog(@"dropped %ld", [files count]); + for (NSString *path in files) { + BOOL exist, isdir; + exist = [[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isdir]; + if (exist && !isdir) { + [self.filesQueue addObject:path]; + [self updateView]; + } + } +} +- (void) processedFiles: (NSNotification *) notification { + [self updateView]; + FileReport *f = [notification object]; + [self.myArrayController addObject:f]; +} +- (void) processNextFileInQueue:(id)launcher { + NSString *file = [self.filesQueue objectAtIndex:0]; + [self.filesQueue removeObjectAtIndex:0]; + FileReport *report = [[FileReport alloc] initWithPath:file]; + [self.currentFileProcessedFld setStringValue:file]; + [report doMeasure]; + //[self.filesProcessed addObject:report]; + [self.currentFileProcessedFld setStringValue:@""]; + [[NSNotificationCenter defaultCenter] postNotificationName:@"R128X_FileProcessed"object:report]; + //[launcher setIsWorking:false]; +} +- (void) progressUpdate: (NSNotification *) notification { + //NSLog(@"progress"); + NSNumber *f = [notification object]; + [self.progressIndicator setIntegerValue:[f integerValue]]; + //NSLog(@"%f", [f floatValue]); +} + + @end diff --git a/r128x-gui/FileReport.h b/r128x-gui/FileReport.h index bc1e760..89d367c 100644 --- a/r128x-gui/FileReport.h +++ b/r128x-gui/FileReport.h @@ -1,13 +1,22 @@ +// FileReport.h +// This file is part of r128x. // -// FileReport.h -// g_r128x +// r128x 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. // -// Created by manu naudin on 05/01/13. -// Copyright (c) 2013 manu naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import -#import "fileprocessor.h" +#import "ExtAudioProcessor.h" @interface FileReport : NSObject @property NSString *filePath; diff --git a/r128x-gui/FileReport.m b/r128x-gui/FileReport.m index 7fd6606..7d20437 100644 --- a/r128x-gui/FileReport.m +++ b/r128x-gui/FileReport.m @@ -1,10 +1,19 @@ +// FileReport.m +// This file is part of r128x. // -// FileReport.m -// g_r128x +// r128x 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. // -// Created by manu naudin on 05/01/13. -// Copyright (c) 2013 manu naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import "FileReport.h" @@ -15,7 +24,7 @@ - (id) initWithPath: (NSString *) thePath { self.filePath = thePath; } return self; - + } - (void) doMeasure { @@ -23,7 +32,7 @@ - (void) doMeasure { double il, lra; Float32 max_tp; //err = CAReader((__bridge CFStringRef)(self.filePath), &il, &lra, &max_tp); - self.status = CAReader((__bridge CFStringRef)(self.filePath), &il, &lra, &max_tp); + self.status = ExtAudioReader((__bridge CFStringRef)(self.filePath), &il, &lra, &max_tp); if (self.status != noErr) { //NSLog(self.filePath); //printf("File Error %d\n", err); diff --git a/r128x-gui/MainMenu.xib b/r128x-gui/MainMenu.xib index 0349db0..be624ef 100644 --- a/r128x-gui/MainMenu.xib +++ b/r128x-gui/MainMenu.xib @@ -2,13 +2,13 @@ 1060 - 12C60 - 2844 - 1187.34 - 625.00 + 12D78 + 3084 + 1187.37 + 626.00 com.apple.InterfaceBuilder.CocoaPlugin - 2844 + 3084 NSArrayController @@ -52,7 +52,7 @@ - g_r128x + r128x 1048576 2147483647 @@ -66,11 +66,11 @@ submenuAction: - g_r128x + r128x - About g_r128x + About r128x 2147483647 @@ -135,7 +135,7 @@ - Hide g_r128x + Hide r128x h 1048576 2147483647 @@ -173,7 +173,7 @@ - Quit g_r128x + Quit r128x q 1048576 2147483647 @@ -1307,7 +1307,7 @@ 2 {{335, 390}, {1009, 360}} 1954021376 - g_r128x + r128x MainWindow @@ -1884,7 +1884,7 @@ - {{0, 0}, {1920, 1058}} + {{0, 0}, {1920, 1178}} {10000000000000, 10000000000000} YES diff --git a/r128x-gui/MainWindow.h b/r128x-gui/MainWindow.h index 72fa269..a2bc896 100644 --- a/r128x-gui/MainWindow.h +++ b/r128x-gui/MainWindow.h @@ -1,10 +1,19 @@ +// MainWindow.h +// This file is part of r128x. // -// MainWindow.h -// g_r128x +// r128x 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. // -// Created by manu naudin on 06/01/13. -// Copyright (c) 2013 manu naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import diff --git a/r128x-gui/MainWindow.m b/r128x-gui/MainWindow.m index f2283f3..5fdae30 100644 --- a/r128x-gui/MainWindow.m +++ b/r128x-gui/MainWindow.m @@ -1,10 +1,19 @@ +// MainWindow.m +// This file is part of r128x. // -// MainWindow.m -// g_r128x +// r128x 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. // -// Created by manu naudin on 06/01/13. -// Copyright (c) 2013 manu naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import "MainWindow.h" diff --git a/r128x-gui/en.lproj/Credits.rtf b/r128x-gui/en.lproj/Credits.rtf index 46576ef..7ee4f3d 100644 --- a/r128x-gui/en.lproj/Credits.rtf +++ b/r128x-gui/en.lproj/Credits.rtf @@ -1,29 +1,17 @@ -{\rtf0\ansi{\fonttbl\f0\fswiss Helvetica;} +{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf370 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} -\paperw9840\paperh8400 -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural +\paperw11900\paperh16840\vieww9600\viewh8400\viewkind0 +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 -\f0\b\fs24 \cf0 Engineering: -\b0 \ - Some people\ -\ +\f0\b\fs24 \cf0 r128x\ +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural -\b Human Interface Design: -\b0 \ - Some other people\ +\b0 \cf0 A software for measuring loudness of audio files.\ \ - -\b Testing: -\b0 \ - Hopefully not nobody\ +Should not be used for serious things like managing nuclear power plants or hospitals.\ \ - -\b Documentation: -\b0 \ - Whoever\ +Released under GPL license.\ \ - -\b With special thanks to: -\b0 \ - Mom\ -} +Includes code from libebur128 by Jan Kokem\'fcller\ +https://github.com/jiixyj/libebur128} \ No newline at end of file diff --git a/r128x-gui/main.m b/r128x-gui/main.m index 1cd113d..9d91313 100644 --- a/r128x-gui/main.m +++ b/r128x-gui/main.m @@ -1,10 +1,19 @@ +// main.m +// This file is part of r128x. // -// main.m -// r128x-gui +// r128x 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. // -// Created by Manuel Naudin on 08/04/13. -// Copyright (c) 2013 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #import diff --git a/r128x-gui/r128x-gui-Info.plist b/r128x-gui/r128x-gui-Info.plist index 0398a3d..6b55dd7 100644 --- a/r128x-gui/r128x-gui-Info.plist +++ b/r128x-gui/r128x-gui-Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 0.2 CFBundleSignature ???? CFBundleVersion @@ -25,7 +25,7 @@ LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} NSHumanReadableCopyright - Copyright © 2013 Manuel Naudin. All rights reserved. + Copyright © 2012-2013 Manuel Naudin. NSMainNibFile MainMenu NSPrincipalClass diff --git a/r128x.xcodeproj/project.pbxproj b/r128x.xcodeproj/project.pbxproj index b030b78..75ee0bc 100644 --- a/r128x.xcodeproj/project.pbxproj +++ b/r128x.xcodeproj/project.pbxproj @@ -7,47 +7,88 @@ objects = { /* Begin PBXBuildFile section */ - 564C37131605ABFC00C3F184 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 564C37121605ABFC00C3F184 /* CoreFoundation.framework */; }; - 564C37161605ABFC00C3F184 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 564C37151605ABFC00C3F184 /* main.c */; }; - 564C37181605ABFC00C3F184 /* r128x.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 564C37171605ABFC00C3F184 /* r128x.1 */; }; - 564C37251605AD0100C3F184 /* ebur128.c in Sources */ = {isa = PBXBuildFile; fileRef = 564C37201605AD0100C3F184 /* ebur128.c */; }; - 564C37311605B1CE00C3F184 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 564C37301605B1CE00C3F184 /* AudioToolbox.framework */; }; - 564C37331605B3FA00C3F184 /* fileprocessor.c in Sources */ = {isa = PBXBuildFile; fileRef = 564C37321605B3FA00C3F184 /* fileprocessor.c */; }; + 565EC47417127B49008B09A2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 565EC47317127B49008B09A2 /* Foundation.framework */; }; + 565EC47717127B49008B09A2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 565EC47617127B49008B09A2 /* main.m */; }; + 565EC47B17127B49008B09A2 /* r128x_cli.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = 565EC47A17127B49008B09A2 /* r128x_cli.1 */; }; + 565EC48117128083008B09A2 /* CliController.m in Sources */ = {isa = PBXBuildFile; fileRef = 565EC48017128083008B09A2 /* CliController.m */; }; + 565EC48217128162008B09A2 /* ExtAudioProcessor.c in Sources */ = {isa = PBXBuildFile; fileRef = 564C37321605B3FA00C3F184 /* ExtAudioProcessor.c */; }; + 565EC483171282A4008B09A2 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 564C37301605B1CE00C3F184 /* AudioToolbox.framework */; }; + 565EC48417128305008B09A2 /* ebur128.c in Sources */ = {isa = PBXBuildFile; fileRef = 564C37201605AD0100C3F184 /* ebur128.c */; }; + 56CAF8C817132C480027800C /* MainWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 56CAF8C717132C480027800C /* MainWindow.m */; }; + F5CDA33B1713162E001649E7 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5CDA33A1713162E001649E7 /* Cocoa.framework */; }; + F5CDA3451713162E001649E7 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5CDA3431713162E001649E7 /* InfoPlist.strings */; }; + F5CDA3471713162E001649E7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F5CDA3461713162E001649E7 /* main.m */; }; + F5CDA34B1713162E001649E7 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = F5CDA3491713162E001649E7 /* Credits.rtf */; }; + F5CDA34E1713162E001649E7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5CDA34D1713162E001649E7 /* AppDelegate.m */; }; + F5CDA35617131726001649E7 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5CDA35517131726001649E7 /* MainMenu.xib */; }; + F5CDA35717131875001649E7 /* ExtAudioProcessor.c in Sources */ = {isa = PBXBuildFile; fileRef = 564C37321605B3FA00C3F184 /* ExtAudioProcessor.c */; }; + F5CDA35A17131924001649E7 /* FileReport.m in Sources */ = {isa = PBXBuildFile; fileRef = F5CDA35917131924001649E7 /* FileReport.m */; }; + F5CDA35B17131993001649E7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 564C37301605B1CE00C3F184 /* AudioToolbox.framework */; }; + F5CDA35C171319BB001649E7 /* ebur128.c in Sources */ = {isa = PBXBuildFile; fileRef = 564C37201605AD0100C3F184 /* ebur128.c */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - 564C370C1605ABFC00C3F184 /* CopyFiles */ = { + 565EC47017127B49008B09A2 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; dstPath = /usr/share/man/man1/; dstSubfolderSpec = 0; files = ( - 564C37181605ABFC00C3F184 /* r128x.1 in CopyFiles */, + 565EC47B17127B49008B09A2 /* r128x_cli.1 in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 1; }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 564C370E1605ABFC00C3F184 /* r128x */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = r128x; sourceTree = BUILT_PRODUCTS_DIR; }; 564C37121605ABFC00C3F184 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - 564C37151605ABFC00C3F184 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = ""; }; - 564C37171605ABFC00C3F184 /* r128x.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = r128x.1; sourceTree = ""; }; 564C37201605AD0100C3F184 /* ebur128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ebur128.c; sourceTree = ""; }; 564C37211605AD0100C3F184 /* ebur128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ebur128.h; sourceTree = ""; }; - 564C37241605AD0100C3F184 /* queue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = queue.h; sourceTree = ""; }; - 564C372E1605B16B00C3F184 /* fileprocessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fileprocessor.h; sourceTree = ""; }; + 564C372E1605B16B00C3F184 /* ExtAudioProcessor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ExtAudioProcessor.h; path = r128x/ExtAudioProcessor.h; sourceTree = ""; }; 564C37301605B1CE00C3F184 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - 564C37321605B3FA00C3F184 /* fileprocessor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fileprocessor.c; sourceTree = ""; }; + 564C37321605B3FA00C3F184 /* ExtAudioProcessor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ExtAudioProcessor.c; path = r128x/ExtAudioProcessor.c; sourceTree = ""; }; + 565EC47217127B49008B09A2 /* r128x-cli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "r128x-cli"; sourceTree = BUILT_PRODUCTS_DIR; }; + 565EC47317127B49008B09A2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 565EC47617127B49008B09A2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 565EC47917127B49008B09A2 /* r128x-cli-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "r128x-cli-Prefix.pch"; sourceTree = ""; }; + 565EC47A17127B49008B09A2 /* r128x_cli.1 */ = {isa = PBXFileReference; lastKnownFileType = text.man; path = r128x_cli.1; sourceTree = ""; }; + 565EC47F17128083008B09A2 /* CliController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CliController.h; sourceTree = ""; }; + 565EC48017128083008B09A2 /* CliController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CliController.m; sourceTree = ""; }; + 56CAF8C617132C480027800C /* MainWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainWindow.h; sourceTree = ""; }; + 56CAF8C717132C480027800C /* MainWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainWindow.m; sourceTree = ""; }; + F5CDA3391713162E001649E7 /* r128x-gui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "r128x-gui.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + F5CDA33A1713162E001649E7 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + F5CDA33D1713162E001649E7 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + F5CDA33E1713162E001649E7 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; + F5CDA33F1713162E001649E7 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + F5CDA3421713162E001649E7 /* r128x-gui-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "r128x-gui-Info.plist"; sourceTree = ""; }; + F5CDA3441713162E001649E7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + F5CDA3461713162E001649E7 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + F5CDA3481713162E001649E7 /* r128x-gui-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "r128x-gui-Prefix.pch"; sourceTree = ""; }; + F5CDA34A1713162E001649E7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = ""; }; + F5CDA34C1713162E001649E7 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; + F5CDA34D1713162E001649E7 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; + F5CDA35517131726001649E7 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = ""; }; + F5CDA35817131924001649E7 /* FileReport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileReport.h; sourceTree = ""; }; + F5CDA35917131924001649E7 /* FileReport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FileReport.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 564C370B1605ABFC00C3F184 /* Frameworks */ = { + 565EC46F17127B49008B09A2 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 564C37311605B1CE00C3F184 /* AudioToolbox.framework in Frameworks */, - 564C37131605ABFC00C3F184 /* CoreFoundation.framework in Frameworks */, + 565EC483171282A4008B09A2 /* AudioToolbox.framework in Frameworks */, + 565EC47417127B49008B09A2 /* Foundation.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F5CDA3361713162E001649E7 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + F5CDA35B17131993001649E7 /* AudioToolbox.framework in Frameworks */, + F5CDA33B1713162E001649E7 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -57,8 +98,11 @@ 564C37031605ABFC00C3F184 = { isa = PBXGroup; children = ( + 564C372E1605B16B00C3F184 /* ExtAudioProcessor.h */, + 564C37321605B3FA00C3F184 /* ExtAudioProcessor.c */, 564C371E1605AD0100C3F184 /* ebur128 */, - 564C37141605ABFC00C3F184 /* r128x */, + 565EC47517127B49008B09A2 /* r128x-cli */, + F5CDA3401713162E001649E7 /* r128x-gui */, 564C37111605ABFC00C3F184 /* Frameworks */, 564C370F1605ABFC00C3F184 /* Products */, ); @@ -67,7 +111,8 @@ 564C370F1605ABFC00C3F184 /* Products */ = { isa = PBXGroup; children = ( - 564C370E1605ABFC00C3F184 /* r128x */, + 565EC47217127B49008B09A2 /* r128x-cli */, + F5CDA3391713162E001649E7 /* r128x-gui.app */, ); name = Products; sourceTree = ""; @@ -77,74 +122,123 @@ children = ( 564C37301605B1CE00C3F184 /* AudioToolbox.framework */, 564C37121605ABFC00C3F184 /* CoreFoundation.framework */, + 565EC47317127B49008B09A2 /* Foundation.framework */, + F5CDA33A1713162E001649E7 /* Cocoa.framework */, + F5CDA33C1713162E001649E7 /* Other Frameworks */, ); name = Frameworks; sourceTree = ""; }; - 564C37141605ABFC00C3F184 /* r128x */ = { + 564C371E1605AD0100C3F184 /* ebur128 */ = { isa = PBXGroup; children = ( - 564C37151605ABFC00C3F184 /* main.c */, - 564C37171605ABFC00C3F184 /* r128x.1 */, - 564C372E1605B16B00C3F184 /* fileprocessor.h */, - 564C37321605B3FA00C3F184 /* fileprocessor.c */, + 564C37201605AD0100C3F184 /* ebur128.c */, + 564C37211605AD0100C3F184 /* ebur128.h */, ); - path = r128x; + path = ebur128; sourceTree = ""; }; - 564C371E1605AD0100C3F184 /* ebur128 */ = { + 565EC47517127B49008B09A2 /* r128x-cli */ = { isa = PBXGroup; children = ( - 564C37201605AD0100C3F184 /* ebur128.c */, - 564C37211605AD0100C3F184 /* ebur128.h */, - 564C37221605AD0100C3F184 /* queue */, + 565EC47617127B49008B09A2 /* main.m */, + 565EC47A17127B49008B09A2 /* r128x_cli.1 */, + 565EC47817127B49008B09A2 /* Supporting Files */, + 565EC47F17128083008B09A2 /* CliController.h */, + 565EC48017128083008B09A2 /* CliController.m */, ); - path = ebur128; + path = "r128x-cli"; + sourceTree = ""; + }; + 565EC47817127B49008B09A2 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 565EC47917127B49008B09A2 /* r128x-cli-Prefix.pch */, + ); + name = "Supporting Files"; sourceTree = ""; }; - 564C37221605AD0100C3F184 /* queue */ = { + F5CDA33C1713162E001649E7 /* Other Frameworks */ = { isa = PBXGroup; children = ( - 564C37231605AD0100C3F184 /* sys */, + F5CDA33D1713162E001649E7 /* AppKit.framework */, + F5CDA33E1713162E001649E7 /* CoreData.framework */, + F5CDA33F1713162E001649E7 /* Foundation.framework */, ); - path = queue; + name = "Other Frameworks"; sourceTree = ""; }; - 564C37231605AD0100C3F184 /* sys */ = { + F5CDA3401713162E001649E7 /* r128x-gui */ = { isa = PBXGroup; children = ( - 564C37241605AD0100C3F184 /* queue.h */, + 56CAF8C617132C480027800C /* MainWindow.h */, + 56CAF8C717132C480027800C /* MainWindow.m */, + F5CDA35817131924001649E7 /* FileReport.h */, + F5CDA35917131924001649E7 /* FileReport.m */, + F5CDA35517131726001649E7 /* MainMenu.xib */, + F5CDA34C1713162E001649E7 /* AppDelegate.h */, + F5CDA34D1713162E001649E7 /* AppDelegate.m */, + F5CDA3411713162E001649E7 /* Supporting Files */, ); - path = sys; + path = "r128x-gui"; + sourceTree = ""; + }; + F5CDA3411713162E001649E7 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + F5CDA3421713162E001649E7 /* r128x-gui-Info.plist */, + F5CDA3431713162E001649E7 /* InfoPlist.strings */, + F5CDA3461713162E001649E7 /* main.m */, + F5CDA3481713162E001649E7 /* r128x-gui-Prefix.pch */, + F5CDA3491713162E001649E7 /* Credits.rtf */, + ); + name = "Supporting Files"; sourceTree = ""; }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 564C370D1605ABFC00C3F184 /* r128x */ = { + 565EC47117127B49008B09A2 /* r128x-cli */ = { isa = PBXNativeTarget; - buildConfigurationList = 564C371B1605ABFC00C3F184 /* Build configuration list for PBXNativeTarget "r128x" */; + buildConfigurationList = 565EC47E17127B49008B09A2 /* Build configuration list for PBXNativeTarget "r128x-cli" */; buildPhases = ( - 564C370A1605ABFC00C3F184 /* Sources */, - 564C370B1605ABFC00C3F184 /* Frameworks */, - 564C370C1605ABFC00C3F184 /* CopyFiles */, + 565EC46E17127B49008B09A2 /* Sources */, + 565EC46F17127B49008B09A2 /* Frameworks */, + 565EC47017127B49008B09A2 /* CopyFiles */, ); buildRules = ( ); dependencies = ( ); - name = r128x; - productName = r128x; - productReference = 564C370E1605ABFC00C3F184 /* r128x */; + name = "r128x-cli"; + productName = "r128x-cli"; + productReference = 565EC47217127B49008B09A2 /* r128x-cli */; productType = "com.apple.product-type.tool"; }; + F5CDA3381713162E001649E7 /* r128x-gui */ = { + isa = PBXNativeTarget; + buildConfigurationList = F5CDA3541713162F001649E7 /* Build configuration list for PBXNativeTarget "r128x-gui" */; + buildPhases = ( + F5CDA3351713162E001649E7 /* Sources */, + F5CDA3361713162E001649E7 /* Frameworks */, + F5CDA3371713162E001649E7 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "r128x-gui"; + productName = "r128x-gui"; + productReference = F5CDA3391713162E001649E7 /* r128x-gui.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 564C37051605ABFC00C3F184 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0440; + LastUpgradeCheck = 0460; ORGANIZATIONNAME = "Manuel Naudin"; }; buildConfigurationList = 564C37081605ABFC00C3F184 /* Build configuration list for PBXProject "r128x" */; @@ -159,24 +253,71 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 564C370D1605ABFC00C3F184 /* r128x */, + 565EC47117127B49008B09A2 /* r128x-cli */, + F5CDA3381713162E001649E7 /* r128x-gui */, ); }; /* End PBXProject section */ +/* Begin PBXResourcesBuildPhase section */ + F5CDA3371713162E001649E7 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F5CDA3451713162E001649E7 /* InfoPlist.strings in Resources */, + F5CDA34B1713162E001649E7 /* Credits.rtf in Resources */, + F5CDA35617131726001649E7 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ - 564C370A1605ABFC00C3F184 /* Sources */ = { + 565EC46E17127B49008B09A2 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 564C37161605ABFC00C3F184 /* main.c in Sources */, - 564C37251605AD0100C3F184 /* ebur128.c in Sources */, - 564C37331605B3FA00C3F184 /* fileprocessor.c in Sources */, + 565EC47717127B49008B09A2 /* main.m in Sources */, + 565EC48117128083008B09A2 /* CliController.m in Sources */, + 565EC48217128162008B09A2 /* ExtAudioProcessor.c in Sources */, + 565EC48417128305008B09A2 /* ebur128.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + F5CDA3351713162E001649E7 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + F5CDA3471713162E001649E7 /* main.m in Sources */, + F5CDA34E1713162E001649E7 /* AppDelegate.m in Sources */, + F5CDA35717131875001649E7 /* ExtAudioProcessor.c in Sources */, + F5CDA35A17131924001649E7 /* FileReport.m in Sources */, + F5CDA35C171319BB001649E7 /* ebur128.c in Sources */, + 56CAF8C817132C480027800C /* MainWindow.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXVariantGroup section */ + F5CDA3431713162E001649E7 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + F5CDA3441713162E001649E7 /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + F5CDA3491713162E001649E7 /* Credits.rtf */ = { + isa = PBXVariantGroup; + children = ( + F5CDA34A1713162E001649E7 /* en */, + ); + name = Credits.rtf; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + /* Begin XCBuildConfiguration section */ 564C37191605ABFC00C3F184 /* Debug */ = { isa = XCBuildConfiguration; @@ -226,20 +367,82 @@ }; name = Release; }; - 564C371C1605ABFC00C3F184 /* Debug */ = { + 565EC47C17127B49008B09A2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "r128x-cli/r128x-cli-Prefix.pch"; + MACOSX_DEPLOYMENT_TARGET = 10.8; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; - 564C371D1605ABFC00C3F184 /* Release */ = { + 565EC47D17127B49008B09A2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CURRENT_PROJECT_VERSION = 0.2; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "r128x-cli/r128x-cli-Prefix.pch"; + MACOSX_DEPLOYMENT_TARGET = 10.8; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; + F5CDA3521713162F001649E7 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + COMBINE_HIDPI_IMAGES = YES; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "r128x-gui/r128x-gui-Prefix.pch"; + INFOPLIST_FILE = "r128x-gui/r128x-gui-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.8; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Debug; + }; + F5CDA3531713162F001649E7 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 0.2; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "r128x-gui/r128x-gui-Prefix.pch"; + INFOPLIST_FILE = "r128x-gui/r128x-gui-Info.plist"; + MACOSX_DEPLOYMENT_TARGET = 10.8; + PRODUCT_NAME = "$(TARGET_NAME)"; + WRAPPER_EXTENSION = app; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -252,11 +455,20 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 564C371B1605ABFC00C3F184 /* Build configuration list for PBXNativeTarget "r128x" */ = { + 565EC47E17127B49008B09A2 /* Build configuration list for PBXNativeTarget "r128x-cli" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 565EC47C17127B49008B09A2 /* Debug */, + 565EC47D17127B49008B09A2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + F5CDA3541713162F001649E7 /* Build configuration list for PBXNativeTarget "r128x-gui" */ = { isa = XCConfigurationList; buildConfigurations = ( - 564C371C1605ABFC00C3F184 /* Debug */, - 564C371D1605ABFC00C3F184 /* Release */, + F5CDA3521713162F001649E7 /* Debug */, + F5CDA3531713162F001649E7 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/r128x.xcodeproj/project.xcworkspace/xcuserdata/manuelnaudin.xcuserdatad/UserInterfaceState.xcuserstate b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manuelnaudin.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..6e6fc49 Binary files /dev/null and b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manuelnaudin.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/r128x.xcodeproj/project.xcworkspace/xcuserdata/manuelnaudin.xcuserdatad/WorkspaceSettings.xcsettings b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manuelnaudin.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..bfffcfe --- /dev/null +++ b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manuelnaudin.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/r128x.xcodeproj/project.xcworkspace/xcuserdata/manunaudin.xcuserdatad/UserInterfaceState.xcuserstate b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manunaudin.xcuserdatad/UserInterfaceState.xcuserstate index 588f4ae..4a34273 100644 Binary files a/r128x.xcodeproj/project.xcworkspace/xcuserdata/manunaudin.xcuserdatad/UserInterfaceState.xcuserstate and b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manunaudin.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/r128x.xcodeproj/project.xcworkspace/xcuserdata/manunaudin.xcuserdatad/WorkspaceSettings.xcsettings b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manunaudin.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..bfffcfe --- /dev/null +++ b/r128x.xcodeproj/project.xcworkspace/xcuserdata/manunaudin.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist new file mode 100644 index 0000000..75b7a05 --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -0,0 +1,59 @@ + + + + + + + + + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x-cli.xcscheme b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x-cli.xcscheme new file mode 100644 index 0000000..a9b75b8 --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x-cli.xcscheme @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x-gui.xcscheme b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x-gui.xcscheme new file mode 100644 index 0000000..8ec7cd4 --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x-gui.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x.xcscheme b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x.xcscheme new file mode 100644 index 0000000..998766d --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/r128x.xcscheme @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/xcschememanagement.plist b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..312eb5a --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manuelnaudin.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,42 @@ + + + + + SchemeUserState + + r128x-cli.xcscheme + + orderHint + 1 + + r128x-gui.xcscheme + + orderHint + 2 + + r128x.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 564C370D1605ABFC00C3F184 + + primary + + + 565EC47117127B49008B09A2 + + primary + + + F5CDA3381713162E001649E7 + + primary + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist new file mode 100644 index 0000000..05301bc --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist @@ -0,0 +1,5 @@ + + + diff --git a/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x-cli.xcscheme b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x-cli.xcscheme new file mode 100644 index 0000000..ffc4780 --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x-cli.xcscheme @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x-gui.xcscheme b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x-gui.xcscheme new file mode 100644 index 0000000..8ec7cd4 --- /dev/null +++ b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x-gui.xcscheme @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x.xcscheme b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x.xcscheme index 6cfc9d2..15d553f 100644 --- a/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x.xcscheme +++ b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/r128x.xcscheme @@ -44,7 +44,7 @@ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" launchStyle = "0" useCustomWorkingDirectory = "NO" - buildConfiguration = "Debug" + buildConfiguration = "Release" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" allowLocationSimulation = "YES"> @@ -57,6 +57,20 @@ ReferencedContainer = "container:r128x.xcodeproj"> + + + + + + + + diff --git a/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/xcschememanagement.plist b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/xcschememanagement.plist index 470ef45..312eb5a 100644 --- a/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/r128x.xcodeproj/xcuserdata/manunaudin.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,6 +4,16 @@ SchemeUserState + r128x-cli.xcscheme + + orderHint + 1 + + r128x-gui.xcscheme + + orderHint + 2 + r128x.xcscheme orderHint @@ -17,6 +27,16 @@ primary + 565EC47117127B49008B09A2 + + primary + + + F5CDA3381713162E001649E7 + + primary + + diff --git a/r128x/ExtAudioProcessor.c b/r128x/ExtAudioProcessor.c index 135d649..eccba83 100644 --- a/r128x/ExtAudioProcessor.c +++ b/r128x/ExtAudioProcessor.c @@ -1,15 +1,26 @@ +// ExtAudioProcessor.c +// This file is part of r128x. // -// fileprocessor.c -// r128x +// r128x 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. // -// Created by manu naudin on 16/09/12. -// Copyright (c) 2012 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 -#include "fileprocessor.h" +#define PROGRESS_NOTIFICATION CFSTR("R128X_Progress") +#define DEFAULT_BUFFER_SIZE 192000 +#include "ExtAudioProcessor.h" #include -OSStatus CAConverterProc(AudioConverterRef inAudioConverter, +OSStatus ExtAudioConvCallback(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription **outDataPacketDescription, @@ -27,8 +38,8 @@ OSStatus CAConverterProc(AudioConverterRef inAudioConverter, &converterInASBD); if (err != noErr) return err; - UserData *userData = (UserData *)inUserData; - UInt8 *fileOutBuffer = userData->mFileOutBuffer; + ExtAudioData *userData = (ExtAudioData *)inUserData; + Float32 *fileOutBuffer = userData->mFileOutBuffer; AudioBufferList fileOutBufferList; fileOutBufferList.mNumberBuffers = 1; fileOutBufferList.mBuffers[0].mNumberChannels = converterInASBD.mChannelsPerFrame; @@ -45,17 +56,49 @@ OSStatus CAConverterProc(AudioConverterRef inAudioConverter, return err; userData->mFileFramesRead += framesInFileOutBuffer; - ebur128_add_frames_float(userData->mState, - (float *)fileOutBuffer, - (size_t)framesInFileOutBuffer); + UInt32 framesInBuffer = framesInFileOutBuffer; + UInt32 pushedFrames = 0; + Float32 *offset; + double mom; + while (framesInBuffer >= userData->mNeededFrames) { + offset = (fileOutBuffer + (pushedFrames * converterInASBD.mChannelsPerFrame)); + ebur128_add_frames_float(userData->mState, + offset, + (size_t)userData->mNeededFrames); + ebur128_loudness_momentary(userData->mState, &mom); + CFNumberRef cmom = CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &mom); + CFArrayAppendValue(userData->mBlocks, cmom); + framesInBuffer -= userData->mNeededFrames; + pushedFrames += userData->mNeededFrames; + userData->mNeededFrames = userData->mReportIntervalFrames; + } + if (framesInBuffer > 0) { + offset = (fileOutBuffer + (pushedFrames * converterInASBD.mChannelsPerFrame)); + ebur128_add_frames_float(userData->mState, + offset, + (size_t)framesInBuffer); + userData->mNeededFrames -= framesInBuffer; + } + + float progress = 100.0 * userData->mFileFramesRead / userData->fileLengthInFrames; + CFNumberRef num = CFNumberCreate(kCFAllocatorDefault, kCFNumberFloatType, &progress); + CFNotificationCenterPostNotification(CFNotificationCenterGetLocalCenter(), + PROGRESS_NOTIFICATION, + num, + NULL, true); + CFRelease(num); + ioNumberDataPackets = &framesInFileOutBuffer; ioData->mBuffers[0].mData = fileOutBuffer; ioData->mBuffers[0].mDataByteSize = framesInFileOutBuffer * converterInASBD.mBytesPerFrame; return err; } -OSStatus CAReader (CFStringRef audioFilePath) +OSStatus ExtAudioReader (CFStringRef audioFilePath, + double *il_p, + double *lra_p, + Float32 *maxtp_p) { OSStatus err = noErr; CFURLRef myFileRef = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, @@ -138,7 +181,7 @@ OSStatus CAReader (CFStringRef audioFilePath) return err;*/ // setting AudioConverter out AudioBufferList - UInt32 framesInConverterOutBuffer = overSamplingFactor*4096; + UInt32 framesInConverterOutBuffer = overSamplingFactor * DEFAULT_BUFFER_SIZE; UInt8 *converterOutBuffer = (UInt8 *)malloc(framesInConverterOutBuffer * converterOutASBD.mBytesPerFrame); if (converterOutBuffer == NULL) return 1; @@ -158,12 +201,12 @@ OSStatus CAReader (CFStringRef audioFilePath) if (err != noErr) return err; - UInt8 *fileOutBuffer = (UInt8 *)malloc(converterInputBufferSize); + Float32 *fileOutBuffer = (Float32 *)malloc(converterInputBufferSize); if (fileOutBuffer == NULL) return 1; //setting userData - UserData userData = {0}; + ExtAudioData userData = {0}; userData.mAudioFileRef = &audioFileRef; ebur128_state *state = ebur128_init(clientASBD.mChannelsPerFrame, clientASBD.mSampleRate, @@ -174,16 +217,25 @@ OSStatus CAReader (CFStringRef audioFilePath) userData.mFileOutBuffer = fileOutBuffer; userData.mFileFramesRead = 0; userData.mFramesProduced = 0; - + userData.mReportIntervalFrames = clientASBD.mSampleRate / 10; + userData.mNeededFrames = userData.mReportIntervalFrames; + UInt32 size = sizeof(SInt64); + err = ExtAudioFileGetProperty(audioFileRef, kExtAudioFileProperty_FileLengthFrames, &size, &(userData.fileLengthInFrames)); + if (err != noErr) + return err; Float32 maxTP = 0; + userData.mBlocks = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); + if (userData.mBlocks == NULL) + return -1; + //calling AudioConverterFillComplexBuffer UInt32 framesToRead; do { framesToRead = framesInConverterOutBuffer; err = AudioConverterFillComplexBuffer(converterRef, - CAConverterProc, + ExtAudioConvCallback, &userData, &framesToRead, &converterOutBufferList, @@ -202,20 +254,38 @@ OSStatus CAReader (CFStringRef audioFilePath) if (err != noErr && err != 'insz') return err; - } while (framesToRead > 0); + } while (framesToRead > 0 && (userData.mFileFramesRead < userData.fileLengthInFrames)); double il, lra; ebur128_loudness_global(userData.mState, &il); il = rint(10 * il) / 10; + *il_p = il; + ebur128_loudness_range(userData.mState, &lra); + *lra_p = lra; lra = rint(10 * lra) / 10; maxTP = rintf(10 * 20 * log10(maxTP)) / 10; + *maxtp_p = maxTP; + //CFIndex nblocks = CFArrayGetCount(userData.mBlocks); + /* + CFNumberRef value; + double dvalue; + Boolean ok; + printf("nblocks : %ld\n", CFArrayGetCount(userData.mBlocks)); + for (long i = 0; i < CFArrayGetCount(userData.mBlocks); i++) { + value = CFArrayGetValueAtIndex(userData.mBlocks, i); + ok = CFNumberGetValue(value, kCFNumberDoubleType, &dvalue); + printf("%ld %f\n", i, dvalue); + } + */ + /* char cstring[128]; Boolean success; success = CFStringGetCString(audioFilePath, cstring, 128, kCFStringEncodingUTF8); printf("%s\t%.1f\t%.1f\t%.1f\n", cstring, il, lra, maxTP); - + */ //cleaning + CFRelease(userData.mBlocks); free(fileOutBuffer); ebur128_destroy(&state); free(converterOutBuffer); diff --git a/r128x/ExtAudioProcessor.h b/r128x/ExtAudioProcessor.h index ccb7749..52f4e0a 100644 --- a/r128x/ExtAudioProcessor.h +++ b/r128x/ExtAudioProcessor.h @@ -1,10 +1,19 @@ +// ExtAudioProcessor.h +// This file is part of r128x. // -// fileprocessor.h -// r128x +// r128x 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. // -// Created by manu naudin on 16/09/12. -// Copyright (c) 2012 Manuel Naudin. All rights reserved. +// r128x 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 Foobar. If not, see . +// copyright Manuel Naudin 2012-2013 #ifndef r128x_fileprocessor_h #define r128x_fileprocessor_h @@ -14,26 +23,35 @@ #include "ebur128.h" // a struct to keep some user data -typedef struct UserData +typedef struct ExtAudioData { ExtAudioFileRef *mAudioFileRef; - UInt8 *mFileOutBuffer; + Float32 *mFileOutBuffer; ebur128_state *mState; UInt32 mFileFramesRead; UInt32 mFramesProduced; + UInt32 mNeededFrames; + UInt32 mReportIntervalFrames; //experimental block logging every interval + SInt64 fileLengthInFrames; -} UserData; + CFMutableArrayRef mBlocks; //to store momentary blocks + + +} ExtAudioData; -// a callback for an AudioConberter that uses ExtAudioFileRead to get samples from a file -OSStatus CAConverterProc(AudioConverterRef inAudioConverter, +// a callback for an ExtAudioReader that uses ExtAudioFileRead to get samples from a file +OSStatus ExtAudioConvCallback(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription **outDataPacketDescription, void *inUserData); // a function that will measure r128 descriptors from a file. -// using CAConverterCallback as callback -OSStatus CAReader (CFStringRef audioFilePath); +// using ExtAudioConvCallback as callback +OSStatus ExtAudioReader (CFStringRef audioFilePath, + double *il_p, + double *lra_p, + Float32 *maxtp_p); #endif