Skip to content

Commit

Permalink
Merge pull request #14 from AlwinEsch/Matrix-change
Browse files Browse the repository at this point in the history
[Matrix] API related update and improvements
  • Loading branch information
AlwinEsch authored Aug 5, 2020
2 parents 9d95007 + 89f748d commit cb8d7a8
Show file tree
Hide file tree
Showing 16 changed files with 582 additions and 309 deletions.
88 changes: 88 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -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
...
32 changes: 23 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ language: cpp
#
# 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:
Expand All @@ -21,19 +21,33 @@ matrix:
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 [[ $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 ${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
4 changes: 3 additions & 1 deletion audiodecoder.ssf/addon.xml.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon
id="audiodecoder.ssf"
version="2.2.2"
version="3.0.0"
name="SSF/DSF Audio Decoder"
provider-name="spiff">
<requires>@ADDON_DEPENDS@</requires>
Expand All @@ -12,7 +12,9 @@
tags="true"
library_@PLATFORM@="@LIBRARY_FILENAME@"/>
<extension point="xbmc.addon.metadata">
<summary lang="de_DE">Sega SSF/DSF Audio Decoder</summary>
<summary lang="en_GB">Sega SSF/DSF Audio Decoder</summary>
<description lang="de_DE">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.</description>
<description lang="en_GB">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.</description>
<platform>@PLATFORM@</platform>
<license>GPL-2.0-or-later</license>
Expand Down
109 changes: 109 additions & 0 deletions audiodecoder.ssf/resources/language/resource.language.de_de/strings.po
Original file line number Diff line number Diff line change
@@ -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."
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -33,7 +45,7 @@ msgid "Default fade out time"
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"
Expand All @@ -49,23 +61,23 @@ msgid "Suppress opening silence"
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"
msgid "Suppress end silence"
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"
msgid "Second of silence to check"
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"
Expand All @@ -77,21 +89,21 @@ msgid "Direct output"
msgstr ""

msgctxt "#30016"
msgid "Enable direct (dry) output"
msgid "Enable direct (dry) output."
msgstr ""

msgctxt "#30017"
msgid "DSP emulation"
msgstr ""

msgctxt "#30018"
msgid "Enable DSP emulation (for reverb, etc.)"
msgid "Enable DSP emulation (for reverb, etc.)."
msgstr ""

msgctxt "#30019"
msgid "Dynamic recompiler"
msgstr ""

msgctxt "#30020"
msgid "Emulate DSP using dynamic recompiler"
msgid "Emulate DSP using dynamic recompiler."
msgstr ""
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev,
zlib1g-dev
Standards-Version: 4.1.2
Section: libs
Homepage: http://kodi.tv
Homepage: https://kodi.tv

Package: kodi-audiodecoder-ssf
Section: libs
Expand Down
7 changes: 2 additions & 5 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit cb8d7a8

Please sign in to comment.