diff -Nru kodi-audiodecoder-ssf-2.0.2/appveyor.yml kodi-audiodecoder-ssf-3.0.0/appveyor.yml --- kodi-audiodecoder-ssf-2.0.2/appveyor.yml 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/appveyor.yml 2013-05-31 22:59:22.000000000 +0000 @@ -16,14 +16,14 @@ CONFIG: Release - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" - GENERATOR: "Visual Studio 15 ARM" CONFIG: Release - WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0" + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" build_script: - cd .. - - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build diff -Nru kodi-audiodecoder-ssf-2.0.2/audiodecoder.ssf/addon.xml.in kodi-audiodecoder-ssf-3.0.0/audiodecoder.ssf/addon.xml.in --- kodi-audiodecoder-ssf-2.0.2/audiodecoder.ssf/addon.xml.in 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/audiodecoder.ssf/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -12,10 +12,12 @@ tags="true" library_@PLATFORM@="@LIBRARY_FILENAME@"/> -

Sega SSF/DSF Audio Decoder

- Sega Saturn Sound Format (SSF) and Dreamcast Sound Format (DSF) is an audio format based on PSF. It stores audio ripped from the ROMs of Sega Saturn and Sega Dreamcast games. +

Sega SSF/DSF Audio Decoder

+ Das Sega Saturn Sound Format (SSF) und das Dreamcast Sound Format (DSF) ist ein auf PSF basierendes Audioformat. Es speichert Audio, das aus den ROMs von Sega Saturn- und Sega Dreamcast-Spielen gerippt wurde. + Sega Saturn Sound Format (SSF) and Dreamcast Sound Format (DSF) is an audio format based on PSF. It stores audio ripped from the ROMs of Sega Saturn and Sega Dreamcast games. @PLATFORM@ - GPL-2.0 + GPL-2.0-or-later https://github.com/xbmc/audiodecoder.ssf icon.png diff -Nru kodi-audiodecoder-ssf-2.0.2/audiodecoder.ssf/resources/language/resource.language.de_de/strings.po kodi-audiodecoder-ssf-3.0.0/audiodecoder.ssf/resources/language/resource.language.de_de/strings.po --- kodi-audiodecoder-ssf-2.0.2/audiodecoder.ssf/resources/language/resource.language.de_de/strings.po 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/audiodecoder.ssf/resources/language/resource.language.de_de/strings.po 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,109 @@ +# Kodi Media Center language file +# Addon Name: SSF/DSF Audio Decoder +# Addon id: audiodecoder.ssf +# Addon Provider: Team Kodi +msgid "" +msgstr "" +"Project-Id-Version: KODI Addons\n" +"Report-Msgid-Bugs-To: https://github.com/xbmc/audiodecoder.ssf/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" + +#[Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file. +#[Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/ +#For example, prefer wording as "This new string" instead of "This New String". +#[Referencing] If a suitable string already exists, reuse it, making a note of where it's used! +#[Description / location] For example, "#. Description of some setting" used on "#: xbmc/addons/guidialogaddoninfo.cpp" +#When writing a description or setting, refer to a setting name in quotes. See existing entries for guidance. +#For example, "Press \"OK\" for \"All seasons\"" instead of "Press OK for All seasons" after first word. + +msgctxt "#30000" +msgid "Default length" +msgstr "Standardlänge" + +msgctxt "#30001" +msgid "Used if specified file does not provide the length." +msgstr "Wird verwendet, wenn die angegebene Datei nicht die Länge angibt." + +msgctxt "#30002" +msgid "unused" +msgstr "unbenutzt" + +msgctxt "#30003" +msgid "{0:d} s" +msgstr "{0:d} s" + +msgctxt "#30004" +msgid "Default fade out time" +msgstr "Standard-Ausblendzeit" + +msgctxt "#30005" +msgid "Used if specified file does not provide the length and fade." +msgstr "Wird verwendet, wenn angegebene Datei die Länge und verblassen nicht zur Verfügung stellt." + +msgctxt "#30006" +msgid "unused" +msgstr "unbenutzt" + +msgctxt "#30007" +msgid "{0:d} ms" +msgstr "{0:d} ms" + +msgctxt "#30008" +msgid "Suppress opening silence" +msgstr "Unterdrücke die Eröffnungsstille" + +msgctxt "#30009" +msgid "Some files start with silent data, this prevents it and looks for the beginning." +msgstr "Einige Dateien beginnen mit stillen Daten, dies verhindert dies und sucht nach dem Anfang." + +msgctxt "#30010" +msgid "Suppress end silence" +msgstr "Unterdrücke die Stille am Ende" + +msgctxt "#30011" +msgid "Some files end with silent data, this prevents it and looks for the end." +msgstr "Einige Dateien enden mit stillen Daten, dies verhindert dies und sucht nach dem Ende." + +msgctxt "#30012" +msgid "Second of silence to check" +msgstr "Sekunden der Stille zu prüfen" + +msgctxt "#30013" +msgid "How many silent seconds are allowed before playback is stopped." +msgstr "Wie viele stille Sekunden sind zulässig, bevor die Wiedergabe gestoppt wird?" + +msgctxt "#30014" +msgid "{0:d} s" +msgstr "{0:d} s" + +msgctxt "#30015" +msgid "Direct output" +msgstr "Direkte Ausgabe" + +msgctxt "#30016" +msgid "Enable direct (dry) output." +msgstr "Aktivieren Sie die direkte (trockene) Ausgabe." + +msgctxt "#30017" +msgid "DSP emulation" +msgstr "DSP-Emulation" + +msgctxt "#30018" +msgid "Enable DSP emulation (for reverb, etc.)." +msgstr "Aktivieren Sie die DSP-Emulation (für Hall usw.)." + +msgctxt "#30019" +msgid "Dynamic recompiler" +msgstr "Dynamischer Recompiler" + +msgctxt "#30020" +msgid "Emulate DSP using dynamic recompiler." +msgstr "Emulieren Sie DSP mit dem dynamischen Recompiler." diff -Nru kodi-audiodecoder-ssf-2.0.2/audiodecoder.ssf/resources/language/resource.language.en_gb/strings.po kodi-audiodecoder-ssf-3.0.0/audiodecoder.ssf/resources/language/resource.language.en_gb/strings.po --- kodi-audiodecoder-ssf-2.0.2/audiodecoder.ssf/resources/language/resource.language.en_gb/strings.po 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/audiodecoder.ssf/resources/language/resource.language.en_gb/strings.po 2013-05-31 22:59:22.000000000 +0000 @@ -1,23 +1,35 @@ +# Kodi Media Center language file +# Addon Name: SSF/DSF Audio Decoder +# Addon id: audiodecoder.ssf +# 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/audiodecoder.ssf/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" +#[Consistency] Make terms, settings names, brands and other minutiae, consistent throughout file. +#[Capitalization] Avoid capitalizing every second word. See http://grammarist.com/capitalization/ +#For example, prefer wording as "This new string" instead of "This New String". +#[Referencing] If a suitable string already exists, reuse it, making a note of where it's used! +#[Description / location] For example, "#. Description of some setting" used on "#: xbmc/addons/guidialogaddoninfo.cpp" +#When writing a description or setting, refer to a setting name in quotes. See existing entries for guidance. +#For example, "Press \"OK\" for \"All seasons\"" instead of "Press OK for All seasons" after first word. + msgctxt "#30000" msgid "Default length" msgstr "" msgctxt "#30001" -msgid "Used if specified file does not provide the length" +msgid "Used if specified file does not provide the length." msgstr "" msgctxt "#30002" @@ -33,7 +45,7 @@ msgstr "" msgctxt "#30005" -msgid "Used if specified file does not provide the length and fade" +msgid "Used if specified file does not provide the length and fade." msgstr "" msgctxt "#30006" @@ -49,7 +61,7 @@ msgstr "" msgctxt "#30009" -msgid "Some files start with silent data, this prevents it and looks for the beginning" +msgid "Some files start with silent data, this prevents it and looks for the beginning." msgstr "" msgctxt "#30010" @@ -57,7 +69,7 @@ msgstr "" msgctxt "#30011" -msgid "Some files end with silent data, this prevents it and looks for the end" +msgid "Some files end with silent data, this prevents it and looks for the end." msgstr "" msgctxt "#30012" @@ -65,7 +77,7 @@ msgstr "" msgctxt "#30013" -msgid "How many silent seconds are allowed before playback is stopped" +msgid "How many silent seconds are allowed before playback is stopped." msgstr "" msgctxt "#30014" @@ -77,7 +89,7 @@ msgstr "" msgctxt "#30016" -msgid "Enable direct (dry) output" +msgid "Enable direct (dry) output." msgstr "" msgctxt "#30017" @@ -85,7 +97,7 @@ msgstr "" msgctxt "#30018" -msgid "Enable DSP emulation (for reverb, etc.)" +msgid "Enable DSP emulation (for reverb, etc.)." msgstr "" msgctxt "#30019" @@ -93,5 +105,5 @@ msgstr "" msgctxt "#30020" -msgid "Emulate DSP using dynamic recompiler" +msgid "Emulate DSP using dynamic recompiler." msgstr "" diff -Nru kodi-audiodecoder-ssf-2.0.2/azure-pipelines.yml kodi-audiodecoder-ssf-3.0.0/azure-pipelines.yml --- kodi-audiodecoder-ssf-2.0.2/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/azure-pipelines.yml 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,65 @@ +variables: + app_id: 'audiodecoder.ssf' + +trigger: + branches: + include: + - Matrix + - releases/* + paths: + include: + - '*' + exclude: + - 'debian/*' + +jobs: + - job: Windows + + pool: + vmImage: 'VS2017-Win2016' + + strategy: + matrix: + Win32: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: Win32 + CONFIGURATION: Release + Win64: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + Win64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: x64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + ARM64-UWP: + GENERATOR: "Visual Studio 15 2017" + ARCHITECTURE: ARM64 + CONFIGURATION: Release + WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.17763.0" + + workspace: + clean: all + + steps: + + - script: | + cd .. + git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git kodi + cd $(Build.SourcesDirectory) + mkdir build + cd build + mkdir "definition/$(app_id)" + echo $(app_id) . . > definition/$(app_id)/$(app_id).txt + mklink /J "$(Pipeline.Workspace)/$(app_id)" "$(Build.SourcesDirectory)" + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '-T host=x64 -G "$(GENERATOR)" -A $(ARCHITECTURE) $(WINSTORE) -DADDONS_TO_BUILD=$(app_id) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DADDONS_DEFINITION_DIR=$(Pipeline.Workspace)/$(app_id)/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../kodi/addons -DPACKAGE_ZIP=1 ../../kodi/cmake/addons' + + - task: CMake@1 + inputs: + workingDirectory: 'build' + cmakeArgs: '--build . --config $(CONFIGURATION) --target $(app_id)' diff -Nru kodi-audiodecoder-ssf-2.0.2/.clang-format kodi-audiodecoder-ssf-3.0.0/.clang-format --- kodi-audiodecoder-ssf-2.0.2/.clang-format 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/.clang-format 2013-05-31 22:59: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-audiodecoder-ssf-2.0.2/debian/changelog kodi-audiodecoder-ssf-3.0.0/debian/changelog --- kodi-audiodecoder-ssf-2.0.2/debian/changelog 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-audiodecoder-ssf (2.0.2-1~bionic) bionic; urgency=low +kodi-audiodecoder-ssf (3.0.0-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-audiodecoder-ssf-2.0.2/debian/control kodi-audiodecoder-ssf-3.0.0/debian/control --- kodi-audiodecoder-ssf-2.0.2/debian/control 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/debian/control 2013-05-31 22:59:22.000000000 +0000 @@ -5,7 +5,7 @@ zlib1g-dev Standards-Version: 4.1.2 Section: libs -Homepage: http://kodi.tv +Homepage: https://kodi.tv Package: kodi-audiodecoder-ssf Section: libs diff -Nru kodi-audiodecoder-ssf-2.0.2/debian/copyright kodi-audiodecoder-ssf-3.0.0/debian/copyright --- kodi-audiodecoder-ssf-2.0.2/debian/copyright 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/debian/copyright 2013-05-31 22:59:22.000000000 +0000 @@ -1,6 +1,6 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: audiodecoder.ssf -Source: +Source: https://github.com/xbmc/audiodecoder.ssf Files: * Copyright: 2005-2020 Team Kodi diff -Nru kodi-audiodecoder-ssf-2.0.2/debian/rules kodi-audiodecoder-ssf-3.0.0/debian/rules --- kodi-audiodecoder-ssf-2.0.2/debian/rules 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/debian/rules 2013-05-31 22:59:22.000000000 +0000 @@ -10,13 +10,10 @@ #export DH_VERBOSE=1 %: - dh $@ + 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-audiodecoder-ssf-dbg + dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=1 -DUSE_LTO=1 override_dh_installdocs: dh_installdocs --link-doc=kodi-audiodecoder-ssf diff -Nru kodi-audiodecoder-ssf-2.0.2/debian/source/format kodi-audiodecoder-ssf-3.0.0/debian/source/format --- kodi-audiodecoder-ssf-2.0.2/debian/source/format 2013-05-31 22:59:22.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/debian/source/format 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru kodi-audiodecoder-ssf-2.0.2/.gitignore kodi-audiodecoder-ssf-3.0.0/.gitignore --- kodi-audiodecoder-ssf-2.0.2/.gitignore 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -# build artifacts -build/ -audiodecoder.*/addon.xml - -# Debian build files -debian/changelog -debian/files -debian/*.log -debian/*.substvars -debian/.debhelper/ -debian/tmp/ -debian/kodi-audiodecoder-*/ -obj-x86_64-linux-gnu/ - -# commonly used editors -# vim -*.swp - -# Eclipse -*.project -*.cproject -.classpath -*.sublime-* -.settings/ - -# KDevelop 4 -*.kdev4 - -# Visual Studio -.vs/ - -# gedit -*~ - -# CLion -/.idea - -# clion -.idea/ diff -Nru kodi-audiodecoder-ssf-2.0.2/Jenkinsfile kodi-audiodecoder-ssf-3.0.0/Jenkinsfile --- kodi-audiodecoder-ssf-2.0.2/Jenkinsfile 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin(version: "Leia") +buildPlugin(version: "Matrix") diff -Nru kodi-audiodecoder-ssf-2.0.2/lib/Highly_Theoretical/Core/.gitignore kodi-audiodecoder-ssf-3.0.0/lib/Highly_Theoretical/Core/.gitignore --- kodi-audiodecoder-ssf-2.0.2/lib/Highly_Theoretical/Core/.gitignore 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/lib/Highly_Theoretical/Core/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -m68k/m68kmake.exe -m68k/m68kmake.obj -*.user -Debug -Release \ No newline at end of file diff -Nru kodi-audiodecoder-ssf-2.0.2/lib/kodi-Highly_Theoretical-note.txt kodi-audiodecoder-ssf-3.0.0/lib/kodi-Highly_Theoretical-note.txt --- kodi-audiodecoder-ssf-2.0.2/lib/kodi-Highly_Theoretical-note.txt 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/lib/kodi-Highly_Theoretical-note.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,6 @@ -Highly_Theoretical source from https://github.com/kode54/Highly_Theoretical -Sync to 2998a4b (24 Jul 2016) +Highly_Theoretical source from https://g.losno.co/chris/Highly_Theoretical +Sync to eb3f3e0682 (2 May 2019) + +Other source URL https://github.com/kode54/Highly_Theoretical Include fix build for ios/osx/android, see https://github.com/xbmc/audiodecoder.ssf/commit/41ef56f7 diff -Nru kodi-audiodecoder-ssf-2.0.2/lib/kodi-psflib-note.txt kodi-audiodecoder-ssf-3.0.0/lib/kodi-psflib-note.txt --- kodi-audiodecoder-ssf-2.0.2/lib/kodi-psflib-note.txt 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/lib/kodi-psflib-note.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,2 +1,4 @@ -psflib source from https://github.com/kode54/psflib -Sync to 6cb3515 (2 May 2019) +psflib source from https://g.losno.co/chris/psflib +Sync to 591f2a3b31 (25 May 2020) + +Old source https://github.com/kode54/psflib (38b1419 (28 Feb 2020)) diff -Nru kodi-audiodecoder-ssf-2.0.2/lib/psflib/LICENSE kodi-audiodecoder-ssf-3.0.0/lib/psflib/LICENSE --- kodi-audiodecoder-ssf-2.0.2/lib/psflib/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/lib/psflib/LICENSE 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,21 @@ +PSFLIB - The MIT License (MIT) + +Copyright (c) 2012-2015 Christopher Snowhill + +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. diff -Nru kodi-audiodecoder-ssf-2.0.2/lib/psflib/psflib.c kodi-audiodecoder-ssf-3.0.0/lib/psflib/psflib.c --- kodi-audiodecoder-ssf-2.0.2/lib/psflib/psflib.c 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/lib/psflib/psflib.c 2013-05-31 22:59:22.000000000 +0000 @@ -440,7 +440,7 @@ strcat(full_path, file_name); #endif - file = state->file_callbacks->fopen(full_path); + file = state->file_callbacks->fopen(state->file_callbacks->context, full_path); free(full_path); diff -Nru kodi-audiodecoder-ssf-2.0.2/lib/psflib/psflib.h kodi-audiodecoder-ssf-3.0.0/lib/psflib/psflib.h --- kodi-audiodecoder-ssf-2.0.2/lib/psflib/psflib.h 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/lib/psflib/psflib.h 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ /* PSFLIB - Main PSF parser implementation -Copyright (c) 2012-2015 Christopher Snowhill +Copyright (c) 2012-2020 Christopher Snowhill Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -38,9 +38,12 @@ /* list of characters which act as path separators, null terminated */ const char * path_separators; + /* Context pointer for fopen callback */ + void * context; + /* opens the file pointed to by path read-only in binary mode, * accepts UTF-8 encoding, returns file handle */ - void * (* fopen )(const char * path); + void * (* fopen )(void * context, const char * path); /* reads to specified buffer, returns count of size bytes read */ size_t (* fread )(void * buffer, size_t size, size_t count, void * handle); diff -Nru kodi-audiodecoder-ssf-2.0.2/LICENSE.md kodi-audiodecoder-ssf-3.0.0/LICENSE.md --- kodi-audiodecoder-ssf-2.0.2/LICENSE.md 1970-01-01 00:00:00.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/LICENSE.md 2013-05-31 22:59: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-audiodecoder-ssf-2.0.2/README.md kodi-audiodecoder-ssf-3.0.0/README.md --- kodi-audiodecoder-ssf-2.0.2/README.md 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/README.md 2013-05-31 22:59:22.000000000 +0000 @@ -1,14 +1,17 @@ # audiodecoder.ssf addon for Kodi -This is a [Kodi](http://kodi.tv) audio decoder addon for SSF and (mini-)DSF files. +This is a [Kodi](https://kodi.tv) audio decoder addon for SSF and (mini-)DSF files. -[![Build Status](https://travis-ci.org/xbmc/audiodecoder.ssf.svg?branch=master)](https://travis-ci.org/xbmc/audiodecoder.ssf) -[![Build Status](https://ci.appveyor.com/api/projects/status/github/xbmc/audiodecoder.ssf?svg=true)](https://ci.appveyor.com/project/xbmc/audiodecoder-ssf) +[![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/audiodecoder.ssf.svg?branch=Matrix)](https://travis-ci.org/xbmc/audiodecoder.ssf/branches) +[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audiodecoder.ssf?branchName=Matrix)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=15&branchName=Matrix) +[![Build Status](https://jenkins.kodi.tv/view/Addons/job/xbmc/job/audiodecoder.ssf/job/Matrix/badge/icon)](https://jenkins.kodi.tv/blue/organizations/jenkins/xbmc%2Faudiodecoder.ssf/branches/) + ## Build instructions When building the addon you have to use the correct branch depending on which version of Kodi you're building against. -For example, if you're building the `master` branch of Kodi you should checkout the `master` branch of this repository. +If you want to build the addon to be compatible with the latest kodi `master` commit, you need to checkout the branch with the current kodi codename. Also make sure you follow this README from the branch in question. ### Linux @@ -16,7 +19,7 @@ The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` +1. `git clone --branch master https://github.com/xbmc/xbmc.git` 2. `git clone https://github.com/xbmc/audiodecoder.ssf.git` 3. `cd audiodecoder.ssf && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=audiodecoder.ssf -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` diff -Nru kodi-audiodecoder-ssf-2.0.2/src/CircularBuffer.h kodi-audiodecoder-ssf-3.0.0/src/CircularBuffer.h --- kodi-audiodecoder-ssf-2.0.2/src/CircularBuffer.h 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/src/CircularBuffer.h 2013-05-31 22:59:22.000000000 +0000 @@ -1,20 +1,8 @@ /* - * Copyright (C) 2019-2020 Team Kodi - * - * 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) 2019-2020 Team Kodi (https://kodi.tv) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #pragma once @@ -24,69 +12,73 @@ int const silence_threshold = 8; -template +template class circular_buffer { public: - circular_buffer( unsigned p_size ) : readptr( 0 ), writeptr( 0 ), size( p_size ), used( 0 ) + circular_buffer(unsigned p_size) : readptr(0), writeptr(0), size(p_size), used(0) { - buffer.resize( p_size ); + buffer.resize(p_size); } unsigned data_available() { return used; } unsigned free_space() { return size - used; } - bool write( const T * src, unsigned count ) + bool write(const T* src, unsigned count) { - if ( count > free_space() ) return false; - while( count ) + if (count > free_space()) + return false; + while (count) { unsigned delta = size - writeptr; - if ( delta > count ) delta = count; - std::copy( src, src + delta, buffer.begin() + writeptr ); + if (delta > count) + delta = count; + std::copy(src, src + delta, buffer.begin() + writeptr); used += delta; - writeptr = ( writeptr + delta ) % size; + writeptr = (writeptr + delta) % size; src += delta; count -= delta; } return true; } - unsigned read( T * dst, unsigned count ) + unsigned read(T* dst, unsigned count) { unsigned done = 0; - for(;;) + for (;;) { unsigned delta = size - readptr; - if ( delta > used ) delta = used; - if ( delta > count ) delta = count; - if ( !delta ) break; + if (delta > used) + delta = used; + if (delta > count) + delta = count; + if (!delta) + break; - std::copy( buffer.begin() + readptr, buffer.begin() + readptr + delta, dst ); + std::copy(buffer.begin() + readptr, buffer.begin() + readptr + delta, dst); dst += delta; done += delta; - readptr = ( readptr + delta ) % size; + readptr = (readptr + delta) % size; count -= delta; used -= delta; } return done; } - void reset() - { - readptr = writeptr = used = 0; - } + void reset() { readptr = writeptr = used = 0; } void resize(unsigned p_size) { size = p_size; - buffer.resize( p_size ); + buffer.resize(p_size); reset(); } bool test_silence() const { - T* begin = (T*) &buffer[0]; + T* begin = (T*)&buffer[0]; T first = *begin; *begin = silence_threshold * 2; T* p = begin + size; - while ( (unsigned) ( *--p + silence_threshold ) <= (unsigned) silence_threshold * 2 ) { } + while ((unsigned)(*--p + silence_threshold) <= (unsigned)silence_threshold * 2) + { + } *begin = first; - return p == begin && ( (unsigned) ( first + silence_threshold ) <= (unsigned) silence_threshold * 2 ); + return p == begin && ((unsigned)(first + silence_threshold) <= (unsigned)silence_threshold * 2); } private: diff -Nru kodi-audiodecoder-ssf-2.0.2/src/SSFCodec.cpp kodi-audiodecoder-ssf-3.0.0/src/SSFCodec.cpp --- kodi-audiodecoder-ssf-2.0.2/src/SSFCodec.cpp 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/src/SSFCodec.cpp 2013-05-31 22:59:22.000000000 +0000 @@ -1,21 +1,9 @@ /* - * Copyright (C) 2014-2020 Arne Morten Kvarving - * Copyright (C) 2019-2020 Team Kodi - * - * 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) 2014-2020 Arne Morten Kvarving + * Copyright (C) 2019-2020 Team Kodi (https://kodi.tv) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ // Code based upon https://bitbucket.org/losnoco/foo_input_ht @@ -28,234 +16,238 @@ extern "C" { -inline unsigned get_le32(void const* p) -{ - return (unsigned) ((unsigned char const*) p) [3] << 24 | - (unsigned) ((unsigned char const*) p) [2] << 16 | - (unsigned) ((unsigned char const*) p) [1] << 8 | - (unsigned) ((unsigned char const*) p) [0]; -} - -static int sdsf_load(void* context, const uint8_t* exe, size_t exe_size, - const uint8_t* reserved, size_t reserved_size) -{ - if (exe_size < 4) - return -1; - - sdsf_load_state* state = static_cast(context); - - std::vector& dst = state->state; - - if (dst.size() < 4) + inline unsigned get_le32(void const* p) { - dst.resize(exe_size); - memcpy(&dst[0], exe, exe_size); - return 0; + return (unsigned)((unsigned char const*)p)[3] << 24 | + (unsigned)((unsigned char const*)p)[2] << 16 | + (unsigned)((unsigned char const*)p)[1] << 8 | (unsigned)((unsigned char const*)p)[0]; } - uint32_t dst_start = get_le32(&dst[0]); - uint32_t src_start = get_le32(exe); - dst_start &= 0x7FFFFF; - src_start &= 0x7FFFFF; - size_t dst_len = dst.size() - 4; - size_t src_len = exe_size - 4; - if (dst_len > 0x800000) - dst_len = 0x800000; - if (src_len > 0x800000) - src_len = 0x800000; - - if (src_start < dst_start) - { - size_t diff = dst_start - src_start; - dst.resize(dst_len + 4 + diff); - memmove(&dst[0] + 4 + diff, &dst[0] + 4, dst_len); - memset(&dst[0] + 4, 0, diff ); - dst_len += diff; - dst_start = src_start; - *(uint32_t*)(&dst[0]) = get_le32(&dst_start); - } - if ((src_start + src_len) > (dst_start + dst_len)) - { - size_t diff = (src_start + src_len) - (dst_start + dst_len); - dst.resize(dst_len + 4 + diff); - memset(&dst[0] + 4 + dst_len, 0, diff); - dst_len += diff; - } - - memcpy(&dst[0] + 4 + (src_start - dst_start), exe + 4, src_len); - - return 0; -} - -static void* psf_file_fopen(const char* uri) -{ - kodi::vfs::CFile* file = new kodi::vfs::CFile; - if (!file->OpenFile(uri, 0)) + static int sdsf_load(void* context, + const uint8_t* exe, + size_t exe_size, + const uint8_t* reserved, + size_t reserved_size) { - delete file; - return nullptr; - } - - return file; -} - -static size_t psf_file_fread(void* buffer, size_t size, size_t count, void* handle) -{ - kodi::vfs::CFile* file = static_cast(handle); - return file->Read(buffer, size*count); -} - -static int psf_file_fseek(void* handle, int64_t offset, int whence) -{ - kodi::vfs::CFile* file = static_cast(handle); - return file->Seek(offset, whence) > -1 ? 0 : -1; -} - -static int psf_file_fclose(void* handle ) -{ - delete static_cast(handle); + if (exe_size < 4) + return -1; - return 0; -} + sdsf_load_state* state = static_cast(context); -static long psf_file_ftell(void* handle) -{ - kodi::vfs::CFile* file = static_cast(handle); - return file->GetPosition(); -} + std::vector& dst = state->state; -const psf_file_callbacks psf_file_system = -{ - "\\/", - psf_file_fopen, - psf_file_fread, - psf_file_fseek, - psf_file_fclose, - psf_file_ftell -}; + if (dst.size() < 4) + { + dst.resize(exe_size); + memcpy(&dst[0], exe, exe_size); + return 0; + } -#define BORK_TIME 0xC0CAC01A + uint32_t dst_start = get_le32(&dst[0]); + uint32_t src_start = get_le32(exe); + dst_start &= 0x7FFFFF; + src_start &= 0x7FFFFF; + size_t dst_len = dst.size() - 4; + size_t src_len = exe_size - 4; + if (dst_len > 0x800000) + dst_len = 0x800000; + if (src_len > 0x800000) + src_len = 0x800000; -static unsigned long parse_time_crap(const char* input) -{ - unsigned long value = 0; - unsigned long multiplier = 1000; - const char* ptr = input; - unsigned long colon_count = 0; - - while (*ptr && ((*ptr >= '0' && *ptr <= '9') || *ptr == ':')) - { - colon_count += *ptr == ':'; - ++ptr; - } - if (colon_count > 2) - return BORK_TIME; - if (*ptr && *ptr != '.' && *ptr != ',') - return BORK_TIME; - if (*ptr) - ++ptr; - while (*ptr && *ptr >= '0' && *ptr <= '9') - ++ptr; - if (*ptr) - return BORK_TIME; - - ptr = strrchr(input, ':'); - if (!ptr) - ptr = input; - for (;;) - { - char* end; - if (ptr != input) - ++ptr; - if (multiplier == 1000) + if (src_start < dst_start) { - double temp = std::stod(ptr); - if (temp >= 60.0) - return BORK_TIME; - value = (long)(temp * 1000.0f); + size_t diff = dst_start - src_start; + dst.resize(dst_len + 4 + diff); + memmove(&dst[0] + 4 + diff, &dst[0] + 4, dst_len); + memset(&dst[0] + 4, 0, diff); + dst_len += diff; + dst_start = src_start; + *(uint32_t*)(&dst[0]) = get_le32(&dst_start); } - else + if ((src_start + src_len) > (dst_start + dst_len)) { - unsigned long temp = strtoul(ptr, &end, 10); - if (temp >= 60 && multiplier < 3600000) - return BORK_TIME; - value += temp * multiplier; - } - if (ptr == input) - break; - ptr -= 2; - while (ptr > input && *ptr != ':') - --ptr; - multiplier *= 60; - } + size_t diff = (src_start + src_len) - (dst_start + dst_len); + dst.resize(dst_len + 4 + diff); + memset(&dst[0] + 4 + dst_len, 0, diff); + dst_len += diff; + } - return value; -} + memcpy(&dst[0] + 4 + (src_start - dst_start), exe + 4, src_len); -static int psf_info_meta(void* context, const char* name, const char* value) -{ - psf_info_meta_state* state = static_cast(context); + return 0; + } - if (!strcasecmp(name, "artist") && state->artist.empty()) + static void* psf_file_fopen(void* context, const char* uri) { - state->artist = value; + kodi::vfs::CFile* file = new kodi::vfs::CFile; + if (!file->OpenFile(uri, 0)) + { + delete file; + return nullptr; + } + + return file; } - else if (!strcasecmp(name, "game")) + + static size_t psf_file_fread(void* buffer, size_t size, size_t count, void* handle) { - state->artist = value; + kodi::vfs::CFile* file = static_cast(handle); + return file->Read(buffer, size * count); } - else if (!strcasecmp(name, "title")) + + static int psf_file_fseek(void* handle, int64_t offset, int whence) { - state->title = value; + kodi::vfs::CFile* file = static_cast(handle); + return file->Seek(offset, whence) > -1 ? 0 : -1; } - else if (!strcasecmp(name, "year")) + + static int psf_file_fclose(void* handle) { - state->year = value; + delete static_cast(handle); + + return 0; } - else if (!strcasecmp(name, "replaygain_")) + + static long psf_file_ftell(void* handle) { - state->replaygain = value; + kodi::vfs::CFile* file = static_cast(handle); + return file->GetPosition(); } - else if (!strcasecmp(name, "length")) + + const psf_file_callbacks psf_file_system = {"\\/", nullptr, psf_file_fopen, + psf_file_fread, psf_file_fseek, psf_file_fclose, + psf_file_ftell}; + +#define BORK_TIME 0xC0CAC01A + + static unsigned long parse_time_crap(const char* input) { - int temp = parse_time_crap(value); - if (temp != BORK_TIME) + unsigned long value = 0; + unsigned long multiplier = 1000; + const char* ptr = input; + unsigned long colon_count = 0; + + while (*ptr && ((*ptr >= '0' && *ptr <= '9') || *ptr == ':')) { - state->tagSongMs = temp; + colon_count += *ptr == ':'; + ++ptr; } - } - else if (!strcasecmp(name, "fade")) - { - int temp = parse_time_crap(value); - if (temp != BORK_TIME) + if (colon_count > 2) + return BORK_TIME; + if (*ptr && *ptr != '.' && *ptr != ',') + return BORK_TIME; + if (*ptr) + ++ptr; + while (*ptr && *ptr >= '0' && *ptr <= '9') + ++ptr; + if (*ptr) + return BORK_TIME; + + ptr = strrchr(input, ':'); + if (!ptr) + ptr = input; + for (;;) { - state->tagFadeMs = temp; + char* end; + if (ptr != input) + ++ptr; + if (multiplier == 1000) + { + double temp = std::stod(ptr); + if (temp >= 60.0) + return BORK_TIME; + value = (long)(temp * 1000.0f); + } + else + { + unsigned long temp = strtoul(ptr, &end, 10); + if (temp >= 60 && multiplier < 3600000) + return BORK_TIME; + value += temp * multiplier; + } + if (ptr == input) + break; + ptr -= 2; + while (ptr > input && *ptr != ':') + --ptr; + multiplier *= 60; } + + return value; } - else if (!strcasecmp(name, "utf8")) - { - state->utf8 = true; - } - else if (!strcasecmp(name, "_lib")) - { - // Unused, checked to prevent on next error - } - else if (name[0] == '_') + + static int psf_info_meta(void* context, const char* name, const char* value) { - kodi::Log(ADDON_LOG_WARNING, "Unsupported tag found: '%s', required to play file", name); - return -1; - } + psf_info_meta_state* state = static_cast(context); - return 0; -} + if (!strcasecmp(name, "artist") && state->artist.empty()) + { + state->artist = value; + } + else if (!strcasecmp(name, "game")) + { + state->game = value; + } + else if (!strcasecmp(name, "title")) + { + state->title = value; + } + else if (!strcasecmp(name, "year")) + { + state->year = value; + } + else if (!strcasecmp(name, "genre")) + { + state->genre = value; + } + else if (!strcasecmp(name, "comment")) + { + state->comment = value; + } + else if (!strcasecmp(name, "replaygain_")) + { + state->replaygain = value; + } + else if (!strcasecmp(name, "length")) + { + int temp = parse_time_crap(value); + if (temp != BORK_TIME) + { + state->tagSongMs = temp; + } + } + else if (!strcasecmp(name, "fade")) + { + int temp = parse_time_crap(value); + if (temp != BORK_TIME) + { + state->tagFadeMs = temp; + } + } + else if (!strcasecmp(name, "utf8")) + { + state->utf8 = true; + } + else if (!strcasecmp(name, "_lib")) + { + // Unused, checked to prevent on next error + } + else if (name[0] == '_') + { + kodi::Log(ADDON_LOG_WARNING, "Unsupported tag found: '%s', required to play file", name); + return -1; + } + + return 0; + } } // extern "C" //------------------------------------------------------------------------------ -CSSFCodec::CSSFCodec(KODI_HANDLE instance) : CInstanceAudioDecoder(instance) +CSSFCodec::CSSFCodec(KODI_HANDLE instance, const std::string& version) + : CInstanceAudioDecoder(instance, version) { - } CSSFCodec::~CSSFCodec() @@ -278,17 +270,19 @@ yam_unprepare_dynacode(yam); } -bool CSSFCodec::Init(const std::string& filename, unsigned int filecache, - int& channels, int& samplerate, - int& bitspersample, int64_t& totaltime, - int& bitrate, AEDataFormat& format, - std::vector& channellist) +bool CSSFCodec::Init(const std::string& filename, + unsigned int filecache, + int& channels, + int& samplerate, + int& bitspersample, + int64_t& totaltime, + int& bitrate, + AudioEngineDataFormat& format, + std::vector& channellist) { m_path = filename; - m_xsfVersion = psf_load(m_path.c_str(), &psf_file_system, 0, - nullptr, nullptr, - nullptr, nullptr, 0, - SSFPrintMessage, this); + m_xsfVersion = psf_load(m_path.c_str(), &psf_file_system, 0, nullptr, nullptr, nullptr, nullptr, + 0, SSFPrintMessage, this); if (m_xsfVersion <= 0 || (m_xsfVersion != 0x11 && m_xsfVersion != 0x12)) { kodi::Log(ADDON_LOG_ERROR, "%s: Not a SSF or PSF file '%s'", __func__, m_path.c_str()); @@ -296,10 +290,8 @@ } psf_info_meta_state info_state; - int ret = psf_load(m_path.c_str(), &psf_file_system, m_xsfVersion, - nullptr, nullptr, - psf_info_meta, &info_state, 0, - SSFPrintMessage, this); + int ret = psf_load(m_path.c_str(), &psf_file_system, m_xsfVersion, nullptr, nullptr, + psf_info_meta, &info_state, 0, SSFPrintMessage, this); if (ret <= 0) { kodi::Log(ADDON_LOG_ERROR, "%s: Failed to load tags from '%s'", __func__, m_path.c_str()); @@ -326,8 +318,8 @@ return false; totaltime = m_songLength / m_cfgDefaultSampleRate * 1000 + m_tagFadeMs; - format = AE_FMT_S16NE; - channellist = { AE_CH_FL, AE_CH_FR }; + format = AUDIOENGINE_FMT_S16NE; + channellist = {AUDIOENGINE_CH_FL, AUDIOENGINE_CH_FR}; channels = 2; bitspersample = 16; bitrate = 0.0; @@ -388,7 +380,7 @@ } else { - void * satsound = sega_get_satsound_state(pEmu); + void* satsound = sega_get_satsound_state(pEmu); yam = satsound_get_yam_state(satsound); } if (yam) @@ -396,10 +388,8 @@ } sdsf_load_state state; - int ret = psf_load(m_path.c_str(), &psf_file_system, m_xsfVersion, - sdsf_load, &state, - nullptr, nullptr, 0, - SSFPrintMessage, this); + int ret = psf_load(m_path.c_str(), &psf_file_system, m_xsfVersion, sdsf_load, &state, nullptr, + nullptr, 0, SSFPrintMessage, this); if (ret < 0) { kodi::Log(ADDON_LOG_ERROR, "%s: Invalid SSF/DSF from '%s'", __func__, m_path.c_str()); @@ -409,7 +399,7 @@ uint32_t start = get_le32(state.state.data()); size_t length = state.state.size(); size_t max_length = (m_xsfVersion == 0x12) ? 0x800000 : 0x80000; - if ((start + (length-4)) > max_length) + if ((start + (length - 4)) > max_length) { length = max_length - start + 4; } @@ -439,7 +429,7 @@ if (skip_howmany > 8192) skip_howmany = 8192; m_sampleBuffer.resize(skip_howmany * 2); - int rtn = sega_execute(pEmu, 0x7FFFFFFF, m_sampleBuffer.data(), & skip_howmany); + int rtn = sega_execute(pEmu, 0x7FFFFFFF, m_sampleBuffer.data(), &skip_howmany); if (rtn < 0) { kodi::Log(ADDON_LOG_ERROR, "%s: Failed to call 'sega_execute'", __func__); @@ -482,7 +472,9 @@ if (m_eof && !m_silenceTestBuffer.data_available()) return 1; - if (m_noLoop && m_tagSongMs && (m_posDelta + mul_div(m_dataWritten, 1000, m_cfgDefaultSampleRate)) >= m_tagSongMs + m_tagFadeMs ) + if (m_noLoop && m_tagSongMs && + (m_posDelta + mul_div(m_dataWritten, 1000, m_cfgDefaultSampleRate)) >= + m_tagSongMs + m_tagFadeMs) return -1; unsigned int written = 0; @@ -522,7 +514,8 @@ samples_to_render = free_space; if (samples_to_render > usedSize) samples_to_render = usedSize; - int err = sega_execute(m_segaState.data(), 0x7FFFFFFF, m_sampleBuffer.data(), &samples_to_render); + int err = sega_execute(m_segaState.data(), 0x7FFFFFFF, m_sampleBuffer.data(), + &samples_to_render); if (err < 0 || !samples_to_render) { kodi::Log(ADDON_LOG_ERROR, "%s: Execution halted with an error", __func__); @@ -557,7 +550,7 @@ else { written = samples; - int err = sega_execute(m_segaState.data(), 0x7FFFFFFF, m_sampleBuffer.data(), & written ); + int err = sega_execute(m_segaState.data(), 0x7FFFFFFF, m_sampleBuffer.data(), &written); if (err < 0 || !written) { kodi::Log(ADDON_LOG_ERROR, "%s: Execution halted with an error", __func__); @@ -612,7 +605,8 @@ double p_seconds = double(time) / 1000.0; m_eof = false; - double buffered_time = (double)(m_silenceTestBuffer.data_available() / 2) / double(m_cfgDefaultSampleRate); + double buffered_time = + (double)(m_silenceTestBuffer.data_available() / 2) / double(m_cfgDefaultSampleRate); m_xsfEmuPosition += buffered_time; @@ -622,7 +616,8 @@ { Load(); } - unsigned int howmany = (int)(time_to_samples(p_seconds - m_xsfEmuPosition, m_cfgDefaultSampleRate)); + unsigned int howmany = + (int)(time_to_samples(p_seconds - m_xsfEmuPosition, m_cfgDefaultSampleRate)); // more abortable, and emu doesn't like doing huge numbers of samples per call anyway void* pEmu = m_segaState.data(); @@ -632,7 +627,7 @@ if (todo > 2048) todo = 2048; int rtn = sega_execute(pEmu, 0x7FFFFFFF, 0, &todo); - if (rtn < 0 || ! todo) + if (rtn < 0 || !todo) { m_eof = true; return -1; @@ -649,13 +644,10 @@ return time; } -bool CSSFCodec::ReadTag(const std::string& file, std::string& title, - std::string& artist, int& length) +bool CSSFCodec::ReadTag(const std::string& filename, kodi::addon::AudioDecoderInfoTag& tag) { - int xsfVersion = psf_load(file.c_str(), &psf_file_system, 0, - nullptr, nullptr, - nullptr, nullptr, 0, - SSFPrintMessage, this); + int xsfVersion = psf_load(filename.c_str(), &psf_file_system, 0, nullptr, nullptr, nullptr, + nullptr, 0, SSFPrintMessage, this); if (xsfVersion <= 0 || (xsfVersion != 0x11 && xsfVersion != 0x12)) { kodi::Log(ADDON_LOG_ERROR, "%s: Not a SSF or PSF file '%s'", __func__, m_path.c_str()); @@ -663,15 +655,24 @@ } psf_info_meta_state info_state; - if (psf_load(file.c_str(), &psf_file_system, xsfVersion, nullptr, nullptr, psf_info_meta, &info_state, 0, SSFPrintMessage, this) <= 0) + if (psf_load(filename.c_str(), &psf_file_system, xsfVersion, nullptr, nullptr, psf_info_meta, + &info_state, 0, SSFPrintMessage, this) <= 0) { - kodi::Log(ADDON_LOG_ERROR, "%s: Failed to load %s information from '%s'", __func__, xsfVersion == 0x11 ? "SSF" : "DSF", file.c_str()); + kodi::Log(ADDON_LOG_ERROR, "%s: Failed to load %s information from '%s'", __func__, + xsfVersion == 0x11 ? "SSF" : "DSF", filename.c_str()); return false; } - title = info_state.title; - artist = info_state.artist; - length = (info_state.tagSongMs+info_state.tagFadeMs)/1000; + tag.SetTitle(info_state.title); + if (!info_state.artist.empty()) + tag.SetArtist(info_state.artist); + else + tag.SetArtist(info_state.game); + tag.SetAlbum(info_state.game); + tag.SetGenre(info_state.genre); + tag.SetReleaseDate(info_state.year); + tag.SetComment(info_state.comment); + tag.SetDuration((info_state.tagSongMs + info_state.tagFadeMs) / 1000); return true; } @@ -687,9 +688,13 @@ { 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 { - addonInstance = new CSSFCodec(instance); + addonInstance = new CSSFCodec(instance, version); return ADDON_STATUS_OK; } virtual ~CMyAddon() = default; diff -Nru kodi-audiodecoder-ssf-2.0.2/src/SSFCodec.h kodi-audiodecoder-ssf-3.0.0/src/SSFCodec.h --- kodi-audiodecoder-ssf-2.0.2/src/SSFCodec.h 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/src/SSFCodec.h 2013-05-31 22:59:22.000000000 +0000 @@ -1,40 +1,26 @@ /* - * Copyright (C) 2014-2020 Arne Morten Kvarving - * Copyright (C) 2019-2020 Team Kodi - * - * 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) 2014-2020 Arne Morten Kvarving + * Copyright (C) 2019-2020 Team Kodi (https://kodi.tv) * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSE.md for more information. */ #pragma once #include "CircularBuffer.h" - -#include -#include +#include "dcsound.h" +#include "psflib.h" +#include "satsound.h" +#include "sega.h" +#include "yam.h" #include -#include +#include +#include #include #include - -#include "sega.h" -#include "dcsound.h" -#include "satsound.h" -#include "yam.h" -#include "psflib.h" +#include struct sdsf_load_state { @@ -45,8 +31,11 @@ { std::string title; std::string artist; + std::string game; + std::string genre; std::string year; std::string replaygain; + std::string comment; bool utf8 = false; @@ -57,18 +46,21 @@ class ATTRIBUTE_HIDDEN CSSFCodec : public kodi::addon::CInstanceAudioDecoder { public: - CSSFCodec(KODI_HANDLE instance); + CSSFCodec(KODI_HANDLE instance, const std::string& version); ~CSSFCodec() override; - bool Init(const std::string& filename, unsigned int filecache, - int& channels, int& samplerate, - int& bitspersample, int64_t& totaltime, - int& bitrate, AEDataFormat& format, - std::vector& channellist) override; + bool Init(const std::string& filename, + unsigned int filecache, + int& channels, + int& samplerate, + int& bitspersample, + int64_t& totaltime, + int& bitrate, + AudioEngineDataFormat& format, + std::vector& channellist) override; int ReadPCM(uint8_t* buffer, int size, int& actualsize) override; int64_t Seek(int64_t time) override; - bool ReadTag(const std::string& file, std::string& title, - std::string& artist, int& length) override; + bool ReadTag(const std::string& filename, kodi::addon::AudioDecoderInfoTag& tag) override; private: static void SSFPrintMessage(void* context, const char* message); @@ -85,8 +77,8 @@ inline void calcfade() { - m_songLength = mul_div(m_tagSongMs-m_posDelta,44100,1000); - m_fadeLength = mul_div(m_tagFadeMs,44100,1000); + m_songLength = mul_div(m_tagSongMs - m_posDelta, 44100, 1000); + m_fadeLength = mul_div(m_tagFadeMs, 44100, 1000); } inline int mul_div(int number, int numerator, int denominator) @@ -94,7 +86,7 @@ long long ret = number; ret *= numerator; ret /= denominator; - return (int) ret; + return (int)ret; } int m_cfgDefaultSampleRate = 44100; @@ -130,4 +122,3 @@ int m_tagSongMs; int m_tagFadeMs; }; - diff -Nru kodi-audiodecoder-ssf-2.0.2/.travis.yml kodi-audiodecoder-ssf-3.0.0/.travis.yml --- kodi-audiodecoder-ssf-2.0.2/.travis.yml 2020-02-02 22:13:45.000000000 +0000 +++ kodi-audiodecoder-ssf-3.0.0/.travis.yml 2013-05-31 22:59:22.000000000 +0000 @@ -3,8 +3,8 @@ # # 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: @@ -21,19 +21,33 @@ dist: xenial sudo: required compiler: clang + - os: linux + dist: bionic + sudo: required + compiler: gcc + env: DEBIAN_BUILD=true - os: osx - osx_image: xcode9.4 + osx_image: xcode10.2 + +before_install: + - 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 Leia --depth=1 https://github.com/xbmc/xbmc.git - - cd ${app_id} && mkdir build && cd build - - mkdir -p definition/${app_id} - - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt - - 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 + - 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