diff -Nru kodi-audioencoder-wav-2.0.0/appveyor.yml kodi-audioencoder-wav-2.0.3/appveyor.yml
--- kodi-audioencoder-wav-2.0.0/appveyor.yml 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/appveyor.yml 2020-02-06 21:25:23.000000000 +0000
@@ -0,0 +1,33 @@
+version: BuildNr.{build}
+
+image: Visual Studio 2017
+
+shallow_clone: true
+
+clone_folder: c:\projects\audioencoder.wav
+
+environment:
+ app_id: audioencoder.wav
+
+ matrix:
+ - GENERATOR: "Visual Studio 15"
+ CONFIG: Release
+ - GENERATOR: "Visual Studio 15 Win64"
+ CONFIG: Release
+ - GENERATOR: "Visual Studio 15 Win64"
+ CONFIG: Release
+ WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
+ - GENERATOR: "Visual Studio 15 ARM"
+ CONFIG: Release
+ WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
+
+build_script:
+ - cd ..
+ - 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% %APPVEYOR_BUILD_FOLDER% %APPVEYOR_REPO_COMMIT% > definition\%app_id%\%app_id%.txt
+ - cmake -T host=x64 -G "%GENERATOR%" %WINSTORE% -DADDONS_TO_BUILD=%app_id% -DCMAKE_BUILD_TYPE=%CONFIG% -DADDONS_DEFINITION_DIR=%APPVEYOR_BUILD_FOLDER%/build/definition -DADDON_SRC_PREFIX=../.. -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons
+ - cmake --build . --config %CONFIG% --target %app_id%
diff -Nru kodi-audioencoder-wav-2.0.0/audioencoder.wav/addon.xml.in kodi-audioencoder-wav-2.0.3/audioencoder.wav/addon.xml.in
--- kodi-audioencoder-wav-2.0.0/audioencoder.wav/addon.xml.in 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/audioencoder.wav/addon.xml.in 2020-02-06 21:25:23.000000000 +0000
@@ -1,7 +1,7 @@
@ADDON_DEPENDS@
@@ -10,8 +10,13 @@
extension=".wav"
library_@PLATFORM@="@LIBRARY_FILENAME@"/>
- Wav Audio Encoder
+ Waveform Audio File Format Encoder
WAV (Waveform Audio Format) is an uncompressed sound format.
@PLATFORM@
+ GPL-2.0
+
+
+ icon.png
+
diff -Nru kodi-audioencoder-wav-2.0.0/azure-pipelines.yml kodi-audioencoder-wav-2.0.3/azure-pipelines.yml
--- kodi-audioencoder-wav-2.0.0/azure-pipelines.yml 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/azure-pipelines.yml 2020-02-06 21:25:23.000000000 +0000
@@ -0,0 +1,65 @@
+variables:
+ app_id: 'audioencoder.wav'
+
+trigger:
+ branches:
+ include:
+ - Leia
+ - 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.16299.0"
+ ARM64-UWP:
+ GENERATOR: "Visual Studio 15 2017"
+ ARCHITECTURE: ARM64
+ CONFIGURATION: Release
+ WINSTORE: -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION="10.0.16299.0"
+
+ workspace:
+ clean: all
+
+ steps:
+
+ - script: |
+ cd ..
+ git clone --branch Leia --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-audioencoder-wav-2.0.0/CMakeLists.txt kodi-audioencoder-wav-2.0.3/CMakeLists.txt
--- kodi-audioencoder-wav-2.0.0/CMakeLists.txt 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/CMakeLists.txt 2020-02-06 21:25:23.000000000 +0000
@@ -1,11 +1,8 @@
+cmake_minimum_required(VERSION 3.5)
project(audioencoder.wav)
-cmake_minimum_required(VERSION 2.6)
-
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
-enable_language(CXX)
-
find_package(Kodi REQUIRED)
include_directories(${KODI_INCLUDE_DIR}/..) # Hack way with "/..", need bigger Kodi cmake rework to match right include ways (becomes done in future)
diff -Nru kodi-audioencoder-wav-2.0.0/debian/changelog kodi-audioencoder-wav-2.0.3/debian/changelog
--- kodi-audioencoder-wav-2.0.0/debian/changelog 2018-03-12 17:01:14.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/changelog 2014-05-17 10:40:22.000000000 +0000
@@ -1,9 +1,7 @@
-kodi-audioencoder-wav (2.0.0-1~bionic) bionic; urgency=low
+kodi-audioencoder-wav (2.0.3-1~bionic) bionic; urgency=low
- [ xbmc ]
+ [ kodi ]
* autogenerated dummy changelog
- [ wsnipex ]
- * no upstream changelog available
+ -- dummy Sat, 17 May 2014 11:40:22 +0100
- -- wsnipex Mon, 12 Mar 2018 18:01:14 +0100
diff -Nru kodi-audioencoder-wav-2.0.0/debian/changelog.in kodi-audioencoder-wav-2.0.3/debian/changelog.in
--- kodi-audioencoder-wav-2.0.0/debian/changelog.in 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/changelog.in 2014-05-17 10:40:22.000000000 +0000
@@ -1,6 +1,6 @@
kodi-audioencoder-wav (#PACKAGEVERSION#-#TAGREV#~#DIST#) #DIST#; urgency=low
- [ xbmc ]
+ [ kodi ]
* autogenerated dummy changelog
-- dummy Sat, 17 May 2014 11:40:22 +0100
diff -Nru kodi-audioencoder-wav-2.0.0/debian/changelog.tmp kodi-audioencoder-wav-2.0.3/debian/changelog.tmp
--- kodi-audioencoder-wav-2.0.0/debian/changelog.tmp 2018-03-12 17:01:10.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/changelog.tmp 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-kodi-audioencoder-wav (2.0.0-1~#DIST#) #DIST#; urgency=low
-
- [ xbmc ]
- * autogenerated dummy changelog
-
- -- dummy Sat, 17 May 2014 11:40:22 +0100
-
diff -Nru kodi-audioencoder-wav-2.0.0/debian/compat kodi-audioencoder-wav-2.0.3/debian/compat
--- kodi-audioencoder-wav-2.0.0/debian/compat 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/compat 2014-05-17 10:40:22.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru kodi-audioencoder-wav-2.0.0/debian/control kodi-audioencoder-wav-2.0.3/debian/control
--- kodi-audioencoder-wav-2.0.0/debian/control 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/control 2014-05-17 10:40:22.000000000 +0000
@@ -1,8 +1,8 @@
Source: kodi-audioencoder-wav
Priority: extra
-Maintainer: wsnipex
-Build-Depends: debhelper (>= 8.0.0), cmake, kodi-addon-dev
-Standards-Version: 3.9.6
+Maintainer: Nobody
+Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev
+Standards-Version: 4.1.2
Section: libs
Homepage: http://kodi.org
diff -Nru kodi-audioencoder-wav-2.0.0/debian/copyright kodi-audioencoder-wav-2.0.3/debian/copyright
--- kodi-audioencoder-wav-2.0.0/debian/copyright 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/copyright 2014-05-17 10:40:22.000000000 +0000
@@ -3,6 +3,7 @@
Files: *
Copyright: Jonathan Marshall
+ 2013-2020 Team Kodi
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -23,6 +24,7 @@
Files: debian/*
2013 wsnipex
+ 2013-2020 Team Kodi
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff -Nru kodi-audioencoder-wav-2.0.0/debian/kodi-audioencoder-wav.install kodi-audioencoder-wav-2.0.3/debian/kodi-audioencoder-wav.install
--- kodi-audioencoder-wav-2.0.0/debian/kodi-audioencoder-wav.install 2018-03-12 17:01:10.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/kodi-audioencoder-wav.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-wav-2.0.0/debian/source/format kodi-audioencoder-wav-2.0.3/debian/source/format
--- kodi-audioencoder-wav-2.0.0/debian/source/format 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/debian/source/format 2014-05-17 10:40:22.000000000 +0000
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff -Nru kodi-audioencoder-wav-2.0.0/.gitignore kodi-audioencoder-wav-2.0.3/.gitignore
--- kodi-audioencoder-wav-2.0.0/.gitignore 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/.gitignore 2020-02-06 21:25:23.000000000 +0000
@@ -0,0 +1,42 @@
+# 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-wav-2.0.0/Jenkinsfile kodi-audioencoder-wav-2.0.3/Jenkinsfile
--- kodi-audioencoder-wav-2.0.0/Jenkinsfile 1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/Jenkinsfile 2020-02-06 21:25:23.000000000 +0000
@@ -0,0 +1 @@
+buildPlugin(version: "Leia")
diff -Nru kodi-audioencoder-wav-2.0.0/README.md kodi-audioencoder-wav-2.0.3/README.md
--- kodi-audioencoder-wav-2.0.0/README.md 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/README.md 2020-02-06 21:25:23.000000000 +0000
@@ -4,6 +4,7 @@
#### CI Testing
[![Build Status](https://travis-ci.org/xbmc/audioencoder.wav.svg?branch=master)](https://travis-ci.org/xbmc/audioencoder.wav)
+[![Build Status](https://dev.azure.com/teamkodi/binary-addons/_apis/build/status/xbmc.audioencoder.wav?branchName=Leia)](https://dev.azure.com/teamkodi/binary-addons/_build/latest?definitionId=24&branchName=Leia)
[![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
## Build instructions
@@ -14,7 +15,7 @@
### Linux
-1. `git clone https://github.com/xbmc/xbmc.git`
+1. `git clone --branch Leia https://github.com/xbmc/xbmc.git`
2. `git clone https://github.com/audioencoder.wav/audioencoder.wav.git`
3. `cd audioencoder.wav && mkdir build && cd build`
4. `cmake -DADDONS_TO_BUILD=audioencoder.wav -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons`
diff -Nru kodi-audioencoder-wav-2.0.0/src/EncoderWav.cpp kodi-audioencoder-wav-2.0.3/src/EncoderWav.cpp
--- kodi-audioencoder-wav-2.0.0/src/EncoderWav.cpp 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/src/EncoderWav.cpp 2020-02-06 21:25:23.000000000 +0000
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
+ * 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
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
+ * along with Kodi; see the file COPYING. If not, see
* .
*
*/
@@ -42,25 +42,25 @@
}
WAVHDR;
-class CEncoderWav : public kodi::addon::CInstanceAudioEncoder
+class ATTRIBUTE_HIDDEN CEncoderWav : public kodi::addon::CInstanceAudioEncoder
{
public:
CEncoderWav(KODI_HANDLE instance);
- virtual bool 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) override;
+ bool 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) override;
int Encode(int numBytesRead, const uint8_t* stream) override;
- virtual bool Finish() override;
+ bool Finish() override;
private:
WAVHDR m_wav;
@@ -123,11 +123,11 @@
//------------------------------------------------------------------------------
-class CMyAddon : public kodi::addon::CAddonBase
+class ATTRIBUTE_HIDDEN CMyAddon : public kodi::addon::CAddonBase
{
public:
- CMyAddon() { }
- virtual ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) override;
+ CMyAddon() = default;
+ ADDON_STATUS CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance) override;
};
ADDON_STATUS CMyAddon::CreateInstance(int instanceType, std::string instanceID, KODI_HANDLE instance, KODI_HANDLE& addonInstance)
diff -Nru kodi-audioencoder-wav-2.0.0/.travis.yml kodi-audioencoder-wav-2.0.3/.travis.yml
--- kodi-audioencoder-wav-2.0.0/.travis.yml 2017-06-20 04:38:16.000000000 +0000
+++ kodi-audioencoder-wav-2.0.3/.travis.yml 2020-02-06 21:25:23.000000000 +0000
@@ -3,36 +3,26 @@
#
# 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.wav
+ - app_id=audioencoder.wav
matrix:
include:
- os: linux
- dist: trusty
+ dist: xenial
sudo: required
compiler: gcc
- os: linux
- dist: trusty
+ dist: xenial
sudo: required
compiler: clang
- os: osx
- osx_image: xcode7.3
- - os: osx
- osx_image: xcode6.1
-
-#
-# Some of the OS X images don't have cmake, contrary to what people
-# on the Internet say
-#
-before_install:
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
- - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake; fi
+ osx_image: xcode9.4
#
# The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
@@ -40,10 +30,10 @@
#
before_script:
- cd $TRAVIS_BUILD_DIR/..
- - git clone --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
+ - 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
script: make