diff -Nru kodi-audioencoder-lame-2.1.0/audioencoder.lame/addon.xml.in kodi-audioencoder-lame-3.0.1/audioencoder.lame/addon.xml.in --- kodi-audioencoder-lame-2.1.0/audioencoder.lame/addon.xml.in 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/audioencoder.lame/addon.xml.in 2014-05-17 10:40:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -10,10 +10,12 @@ extension=".mp3" library_@PLATFORM@="@LIBRARY_FILENAME@"/> -

LAME is a high quality MPEG Audio Layer III (MP3)

- It use LAME, the high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. +

LAME ist ein hochwertiger MPEG Audio Layer III (MP3)

LAME is a high quality MPEG Audio Layer III (MP3)

+ Es verwendet LAME, den hochwertigen MPEG Audio Layer III (MP3) Encoder, der unter der LGPL lizenziert ist. + It use LAME, the high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. @PLATFORM@ - GPL-2.0 + GPL-2.0-or-later https://github.com/xbmc/audioencoder.lame icon.png diff -Nru kodi-audioencoder-lame-2.1.0/audioencoder.lame/resources/language/resource.language.de_de/strings.po kodi-audioencoder-lame-3.0.1/audioencoder.lame/resources/language/resource.language.de_de/strings.po --- kodi-audioencoder-lame-2.1.0/audioencoder.lame/resources/language/resource.language.de_de/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/audioencoder.lame/resources/language/resource.language.de_de/strings.po 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,53 @@ +# Kodi Media Center language file +# Addon Name: Lame Audio Encoder +# Addon id: audioencoder.lame +# Addon Provider: Team Kodi +msgid "" +msgstr "" +"Project-Id-Version: KODI Addons\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/audioencoder.lame/issues/\n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: German (Germany) (http://www.transifex.com/projects/p/kodi-addons/language/de_DE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: de_DE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "#30000" +msgid "Preset" +msgstr "Voreinstellung" + +msgctxt "#30001" +msgid "Enables some preconfigured settings" +msgstr "Aktiviert einige vorkonfigurierte Einstellungen" + +msgctxt "#30002" +msgid "Medium" +msgstr "Mittel" + +msgctxt "#30003" +msgid "Standard" +msgstr "Standard" + +msgctxt "#30004" +msgid "Extreme" +msgstr "Extrem" + +msgctxt "#30005" +msgid "Constant bitrate" +msgstr "Konstante Bitrate" + +msgctxt "#30006" +msgid "Bitrate" +msgstr "Bitrate" + +msgctxt "#30007" +msgid "The bitrate to be used" +msgstr "Die zu verwendende Bitrate" + +msgctxt "#30008" +msgid "{0:d} kHz" +msgstr "{0:d} kHz" diff -Nru kodi-audioencoder-lame-2.1.0/audioencoder.lame/resources/language/resource.language.en_gb/strings.po kodi-audioencoder-lame-3.0.1/audioencoder.lame/resources/language/resource.language.en_gb/strings.po --- kodi-audioencoder-lame-2.1.0/audioencoder.lame/resources/language/resource.language.en_gb/strings.po 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/audioencoder.lame/resources/language/resource.language.en_gb/strings.po 2014-05-17 10:40:22.000000000 +0000 @@ -1,15 +1,19 @@ +# Kodi Media Center language file +# Addon Name: Lame Audio Encoder +# Addon id: audioencoder.lame +# Addon Provider: Team Kodi msgid "" msgstr "" -"Project-Id-Version: XBMC Main Translation Project (Frodo)\n" -"Report-Msgid-Bugs-To: http://trac.xbmc.org/\n" +"Project-Id-Version: KODI Addons\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/audioencoder.lame/issues/\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: XBMC Translation Team\n" -"Language-Team: English (http://www.transifex.com/projects/p/XBMC-Main-Frodo/language/en/)\n" +"Last-Translator: Kodi Translation Team\n" +"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/kodi-addons/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en\n" +"Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "#30000" diff -Nru kodi-audioencoder-lame-2.1.0/.clang-format kodi-audioencoder-lame-3.0.1/.clang-format --- kodi-audioencoder-lame-2.1.0/.clang-format 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/.clang-format 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,88 @@ +--- +# BasedOnStyle: LLVM +AccessModifierOffset: -2 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: DontAlign +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: InlineOnly +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: true +BinPackArguments: true +BinPackParameters: false +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Allman +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializers: BeforeColon +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 100 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 2 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IncludeBlocks: Regroup +IncludeCategories: + - Regex: '^<[a-z0-9_]+>$' + Priority: 3 + - Regex: '^<(assert|complex|ctype|errno|fenv|float|inttypes|iso646|limits|locale|math|setjmp|signal|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|tgmath|threads|time|uchar|wchar|wctype)\.h>$' + Priority: 3 + - Regex: '^<' + Priority: 3 + - Regex: '^["<](kodi|p8-platform)\/.*\.h[">]$' + Priority: 2 + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '$' +IndentCaseLabels: true +IndentWidth: 2 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: None +ObjCBlockIndentWidth: 2 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60000 +PointerAlignment: Left +ReflowComments: false +SortIncludes: true +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: ControlStatements +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 8 +UseTab: Never +... diff -Nru kodi-audioencoder-lame-2.1.0/debian/changelog kodi-audioencoder-lame-3.0.1/debian/changelog --- kodi-audioencoder-lame-2.1.0/debian/changelog 2020-04-09 10:58:49.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/debian/changelog 2014-05-17 10:40:22.000000000 +0000 @@ -1,9 +1,7 @@ -kodi-audioencoder-lame (2.1.0-1~focal) focal; urgency=low +kodi-audioencoder-lame (3.0.1-1~focal) focal; urgency=low [ kodi ] * autogenerated dummy changelog - [ wsnipex ] - * no upstream changelog available + -- dummy Sat, 17 May 2014 11:40:22 +0100 - -- wsnipex Thu, 09 Apr 2020 10:58:49 +0000 diff -Nru kodi-audioencoder-lame-2.1.0/debian/changelog.tmp kodi-audioencoder-lame-3.0.1/debian/changelog.tmp --- kodi-audioencoder-lame-2.1.0/debian/changelog.tmp 2020-04-09 10:58:47.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/debian/changelog.tmp 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -kodi-audioencoder-lame (2.1.0-1~#DIST#) #DIST#; urgency=low - - [ kodi ] - * autogenerated dummy changelog - - -- dummy Sat, 17 May 2014 11:40:22 +0100 - diff -Nru kodi-audioencoder-lame-2.1.0/debian/control kodi-audioencoder-lame-3.0.1/debian/control --- kodi-audioencoder-lame-2.1.0/debian/control 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/debian/control 2014-05-17 10:40:22.000000000 +0000 @@ -4,7 +4,7 @@ Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, libtool, libmp3lame-dev Standards-Version: 4.1.2 Section: libs -Homepage: http://kodi.tv +Homepage: https://kodi.tv Package: kodi-audioencoder-lame Section: libs diff -Nru kodi-audioencoder-lame-2.1.0/debian/kodi-audioencoder-lame.install kodi-audioencoder-lame-3.0.1/debian/kodi-audioencoder-lame.install --- kodi-audioencoder-lame-2.1.0/debian/kodi-audioencoder-lame.install 2020-04-09 10:58:47.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/debian/kodi-audioencoder-lame.install 2014-05-17 10:40:22.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib -usr/share +usr/lib/* +usr/share/* diff -Nru kodi-audioencoder-lame-2.1.0/debian/rules kodi-audioencoder-lame-3.0.1/debian/rules --- kodi-audioencoder-lame-2.1.0/debian/rules 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/debian/rules 2014-05-17 10:40:22.000000000 +0000 @@ -13,10 +13,7 @@ dh $@ override_dh_auto_configure: - dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 - -override_dh_strip: - dh_strip --dbg-package=kodi-audioencoder-lame-dbg + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 override_dh_installdocs: dh_installdocs --link-doc=kodi-audioencoder-lame diff -Nru kodi-audioencoder-lame-2.1.0/debian/source/format kodi-audioencoder-lame-3.0.1/debian/source/format --- kodi-audioencoder-lame-2.1.0/debian/source/format 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/debian/source/format 2014-05-17 10:40:22.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru kodi-audioencoder-lame-2.1.0/.gitignore kodi-audioencoder-lame-3.0.1/.gitignore --- kodi-audioencoder-lame-2.1.0/.gitignore 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -# build artifacts -build/ -audioencoder.*/addon.xml - -# Debian build files -debian/changelog -debian/files -debian/*.log -debian/*.substvars -debian/.debhelper/ -debian/tmp/ -debian/kodi-audioencoder-*/ -obj-x86_64-linux-gnu/ - -# commonly used editors -# vim -*.swp - -# Eclipse -*.project -*.cproject -.classpath -*.sublime-* -.settings/ - -# KDevelop 4 -*.kdev4 - -# gedit -*~ - -# CLion -/.idea - -# clion -.idea/ - -# to prevent add after a "git format-patch VALUE" and "git add ." call -/*.patch - -# to prevent add if project code opened by Visual Studio over CMake file -.vs/ diff -Nru kodi-audioencoder-lame-2.1.0/LICENSE.md kodi-audioencoder-lame-3.0.1/LICENSE.md --- kodi-audioencoder-lame-2.1.0/LICENSE.md 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/LICENSE.md 2014-05-17 10:40:22.000000000 +0000 @@ -0,0 +1,264 @@ +The GNU General Public License, Version 2, June 1991 (GPLv2) +============================================================ + +> Copyright (C) 1989, 1991 Free Software Foundation, Inc. +> 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. + + +Preamble +-------- + +The licenses for most software are designed to take away your freedom to share +and change it. By contrast, the GNU General Public License is intended to +guarantee your freedom to share and change free software--to make sure the +software is free for all its users. This General Public License applies to most +of the Free Software Foundation's software and to any other program whose +authors commit to using it. (Some other Free Software Foundation software is +covered by the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the freedom to +distribute copies of free software (and charge for this service if you wish), +that you receive source code or can get it if you want it, that you can change +the software or use pieces of it in new free programs; and that you know you can +do these things. + +To protect your rights, we need to make restrictions that forbid anyone to deny +you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for a +fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show them +these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) offer +you this license which gives you legal permission to copy, distribute and/or +modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients to +know that what they have is not the original, so that any problems introduced by +others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We wish +to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's free +use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + +Terms And Conditions For Copying, Distribution And Modification +--------------------------------------------------------------- + +**0.** This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms of +this General Public License. The "Program", below, refers to any such program or +work, and a "work based on the Program" means either the Program or any +derivative work under copyright law: that is to say, a work containing the +Program or a portion of it, either verbatim or with modifications and/or +translated into another language. (Hereinafter, translation is included without +limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by +this License; they are outside its scope. The act of running the Program is not +restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made by +running the Program). Whether that is true depends on what the Program does. + +**1.** You may copy and distribute verbatim copies of the Program's source code +as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the Program +a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at +your option offer warranty protection in exchange for a fee. + +**2.** You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you also +meet all of these conditions: + +* **a)** You must cause the modified files to carry prominent notices stating + that you changed the files and the date of any change. + +* **b)** You must cause any work that you distribute or publish, that in whole + or in part contains or is derived from the Program or any part thereof, to + be licensed as a whole at no charge to all third parties under the terms of + this License. + +* **c)** If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use in the + most ordinary way, to print or display an announcement including an + appropriate copyright notice and a notice that there is no warranty (or + else, saying that you provide a warranty) and that users may redistribute + the program under these conditions, and telling the user how to view a copy + of this License. (Exception: if the Program itself is interactive but does + not normally print such an announcement, your work based on the Program is + not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be reasonably +considered independent and separate works in themselves, then this License, and +its terms, do not apply to those sections when you distribute them as separate +works. But when you distribute the same sections as part of a whole which is a +work based on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the entire whole, +and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your +rights to work written entirely by you; rather, the intent is to exercise the +right to control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program with the +Program (or with a work based on the Program) on a volume of a storage or +distribution medium does not bring the other work under the scope of this +License. + +**3.** You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 and 2 +above provided that you also do one of the following: + +* **a)** Accompany it with the complete corresponding machine-readable source + code, which must be distributed under the terms of Sections 1 and 2 above on + a medium customarily used for software interchange; or, + +* **b)** Accompany it with a written offer, valid for at least three years, to + give any third party, for a charge no more than your cost of physically + performing source distribution, a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of Sections 1 + and 2 above on a medium customarily used for software interchange; or, + +* **c)** Accompany it with the information you received as to the offer to + distribute corresponding source code. (This alternative is allowed only for + noncommercial distribution and only if you received the program in object + code or executable form with such an offer, in accord with Subsection b + above.) + +The source code for a work means the preferred form of the work for making +modifications to it. For an executable work, complete source code means all the +source code for all modules it contains, plus any associated interface +definition files, plus the scripts used to control compilation and installation +of the executable. However, as a special exception, the source code distributed +need not include anything that is normally distributed (in either source or +binary form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component itself +accompanies the executable. + +If distribution of executable or object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the source code +from the same place counts as distribution of the source code, even though third +parties are not compelled to copy the source along with the object code. + +**4.** You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, modify, +sublicense or distribute the Program is void, and will automatically terminate +your rights under this License. However, parties who have received copies, or +rights, from you under this License will not have their licenses terminated so +long as such parties remain in full compliance. + +**5.** You are not required to accept this License, since you have not signed +it. However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you do +not accept this License. Therefore, by modifying or distributing the Program (or +any work based on the Program), you indicate your acceptance of this License to +do so, and all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +**6.** Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +**7.** If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution of +the Program by all those who receive copies directly or indirectly through you, +then the only way you could satisfy both it and this License would be to refrain +entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and the +section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose that +choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +**8.** If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +**9.** The Free Software Foundation may publish revised and/or new versions of +the General Public License from time to time. Such new versions will be similar +in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that version +or of any later version published by the Free Software Foundation. If the +Program does not specify a version number of this License, you may choose any +version ever published by the Free Software Foundation. + +**10.** If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software Foundation, +write to the Free Software Foundation; we sometimes make exceptions for this. +Our decision will be guided by the two goals of preserving the free status of +all derivatives of our free software and of promoting the sharing and reuse of +software generally. + + +No Warranty +----------- + +**11.** BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR +THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM +"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +**12.** IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR +INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA +BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER +OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff -Nru kodi-audioencoder-lame-2.1.0/README.md kodi-audioencoder-lame-3.0.1/README.md --- kodi-audioencoder-lame-2.1.0/README.md 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/README.md 2014-05-17 10:40:22.000000000 +0000 @@ -1,10 +1,12 @@ # LAME Audio Encoder add-on for Kodi -This is a [Kodi] (https://kodi.tv) LAME audio encoder add-on. +This is a [Kodi](https://kodi.tv) LAME audio encoder add-on. #### CI Testing +[![License: GPL-2.0-or-later](https://img.shields.io/badge/License-GPL%20v2+-blue.svg)](LICENSE.md) [![Build Status](https://travis-ci.org/xbmc/audioencoder.lame.svg?branch=Matrix)](https://travis-ci.org/xbmc/audioencoder.lame/branches) [![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audioencoder.lame?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=22&branchName=Matrix) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/audioencoder.lame/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Faudioencoder.lame/branches/) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120) @@ -27,4 +29,4 @@ ##### Useful links -* [Kodi's add-ons development support] (https://forum.kodi.tv/forumdisplay.php?fid=26) +* [Kodi's add-ons development support](https://forum.kodi.tv/forumdisplay.php?fid=26) diff -Nru kodi-audioencoder-lame-2.1.0/src/EncoderLame.cpp kodi-audioencoder-lame-3.0.1/src/EncoderLame.cpp --- kodi-audioencoder-lame-2.1.0/src/EncoderLame.cpp 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/src/EncoderLame.cpp 2014-05-17 10:40:22.000000000 +0000 @@ -1,33 +1,20 @@ /* - * Copyright (C) 2005-2020 Team Kodi - * http://kodi.tv - * - * This Program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, 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 Kodi; see the file COPYING. If not, see - * . + * Copyright (C) 2005-2020 Team Kodi (https://kodi.tv) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ -#include +#include #include -#include +#include #include -#include +#include class ATTRIBUTE_HIDDEN CEncoderLame : public kodi::addon::CInstanceAudioEncoder { public: - CEncoderLame(KODI_HANDLE instance); + CEncoderLame(KODI_HANDLE instance, const std::string& version); ~CEncoderLame() override; bool Start(int inChannels, @@ -46,18 +33,16 @@ bool Finish() override; private: - lame_global_flags* m_encoder; ///< lame encoder context - int m_audio_pos; ///< audio position in file - uint8_t m_buffer[65536]; ///< buffer for writing out audio data - int m_preset; - int m_bitrate; + lame_global_flags* m_encoder; ///< lame encoder context + int m_audio_pos; ///< audio position in file + uint8_t m_buffer[65536]; ///< buffer for writing out audio data + int m_preset; + int m_bitrate; }; -CEncoderLame::CEncoderLame(KODI_HANDLE instance) - : CInstanceAudioEncoder(instance), - m_audio_pos(0), - m_preset(-1) +CEncoderLame::CEncoderLame(KODI_HANDLE instance, const std::string& version) + : CInstanceAudioEncoder(instance, version), m_audio_pos(0), m_preset(-1) { m_encoder = lame_init(); if (!m_encoder) @@ -90,11 +75,18 @@ lame_close(m_encoder); } -bool CEncoderLame::Start(int inChannels, int inRate, int inBits, - const std::string& title, const std::string& artist, - const std::string& albumartist, const std::string& album, - const std::string& year, const std::string& track, const std::string& genre, - const std::string& comment, int trackLength) +bool CEncoderLame::Start(int inChannels, + int inRate, + int inBits, + const std::string& title, + const std::string& artist, + const std::string& albumartist, + const std::string& album, + const std::string& year, + const std::string& track, + const std::string& genre, + const std::string& comment, + int trackLength) { if (!m_encoder) return false; @@ -121,7 +113,7 @@ id3tag_set_year(m_encoder, year.c_str()); id3tag_set_track(m_encoder, track.c_str()); int test = id3tag_set_genre(m_encoder, genre.c_str()); - if(test==-1) + if (test == -1) id3tag_set_genre(m_encoder, "Other"); // Now that all the options are set, lame needs to analyze them and @@ -148,14 +140,15 @@ return -1; // note: assumes 2ch 16bit atm - const int bytes_per_frame = 2*2; + const int bytes_per_frame = 2 * 2; int bytes_left = numBytesRead; while (bytes_left) { const int frames = std::min(bytes_left / bytes_per_frame, 4096); - int written = lame_encode_buffer_interleaved(m_encoder, (short*)stream, frames, m_buffer, sizeof(m_buffer)); + int written = lame_encode_buffer_interleaved(m_encoder, (short*)stream, frames, m_buffer, + sizeof(m_buffer)); if (written < 0) return -1; // error Write(m_buffer, written); @@ -201,12 +194,20 @@ { public: CMyAddon() = default; - ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) override; + ADDON_STATUS CreateInstance(int instanceType, + const std::string& instanceID, + KODI_HANDLE instance, + const std::string& version, + KODI_HANDLE& addonInstance) override; }; -ADDON_STATUS CMyAddon::CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) +ADDON_STATUS CMyAddon::CreateInstance(int instanceType, + const std::string& instanceID, + KODI_HANDLE instance, + const std::string& version, + KODI_HANDLE& addonInstance) { - addonInstance = new CEncoderLame(instance); + addonInstance = new CEncoderLame(instance, version); return ADDON_STATUS_OK; } diff -Nru kodi-audioencoder-lame-2.1.0/.travis.yml kodi-audioencoder-lame-3.0.1/.travis.yml --- kodi-audioencoder-lame-2.1.0/.travis.yml 2020-02-06 19:10:38.000000000 +0000 +++ kodi-audioencoder-lame-3.0.1/.travis.yml 2014-05-17 10:40:22.000000000 +0000 @@ -3,13 +3,13 @@ # # Define the build matrix # -# Travis defaults to building on Ubuntu Precise when building on -# Linux. We need Trusty in order to get up to date versions of +# Travis defaults to building on Ubuntu Trusty when building on +# Linux. We need Xenial in order to get up to date versions of # cmake and g++. # env: global: - - APPID=audioencoder.lame + - app_id=audioencoder.lame matrix: include: @@ -21,22 +21,34 @@ dist: xenial sudo: required compiler: clang + - os: linux + dist: bionic + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true - os: osx osx_image: xcode10.2 before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew link gettext --force; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR, # we'll put the Kodi source on the same level # before_script: - - cd $TRAVIS_BUILD_DIR/.. - - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - - cd ${APPID} - - mkdir build - - cd build - - cmake -DADDONS_TO_BUILD=${APPID} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons + - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi + - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi + - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi + - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi + - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi + - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi + - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-addon-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi + - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi -script: make +script: + - if [[ $DEBIAN_BUILD != true ]]; then make; fi + - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi