diff --git a/.gitignore b/.gitignore index b0092cb..7a7ab17 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,42 @@ # build artifacts build/ +audioencoder.*/addon.xml + +# Debian build files debian/changelog debian/files -audioencoder.lame/addon.xml -debian/kodi-audioencoder-lame-dbg.debhelper.log -debian/kodi-audioencoder-lame-dbg.substvars -debian/kodi-audioencoder-lame-dbg/ -debian/kodi-audioencoder-lame.debhelper.log -debian/kodi-audioencoder-lame.postinst.debhelper -debian/kodi-audioencoder-lame.postrm.debhelper -debian/kodi-audioencoder-lame.substvars -debian/kodi-audioencoder-lame/ +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/ -# Eclipse/CDT -.cproject -.project -.settings/ +# 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 --git a/audioencoder.lame/addon.xml.in b/audioencoder.lame/addon.xml.in index f226f04..59d1d29 100644 --- a/audioencoder.lame/addon.xml.in +++ b/audioencoder.lame/addon.xml.in @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ @@ -10,7 +10,7 @@ extension=".mp3" library_@PLATFORM@="@LIBRARY_FILENAME@"/> - Lame MP3 Audio Encoder + LAME is a high quality MPEG Audio Layer III (MP3) It use LAME, the high quality MPEG Audio Layer III (MP3) encoder licensed under the LGPL. @PLATFORM@ diff --git a/audioencoder.lame/resources/language/English/strings.po b/audioencoder.lame/resources/language/resource.language.en_gb/strings.po similarity index 86% rename from audioencoder.lame/resources/language/English/strings.po rename to audioencoder.lame/resources/language/resource.language.en_gb/strings.po index 63ae145..9057c5d 100644 --- a/audioencoder.lame/resources/language/English/strings.po +++ b/audioencoder.lame/resources/language/resource.language.en_gb/strings.po @@ -17,25 +17,33 @@ msgid "Preset" msgstr "" msgctxt "#30001" -msgid "Medium" +msgid "Enables some preconfigured settings" msgstr "" msgctxt "#30002" -msgid "Standard" +msgid "Medium" msgstr "" msgctxt "#30003" -msgid "Extreme" +msgid "Standard" msgstr "" msgctxt "#30004" -msgid "Constant bitrate" +msgid "Extreme" msgstr "" msgctxt "#30005" -msgid "Bitrate" +msgid "Constant bitrate" msgstr "" msgctxt "#30006" +msgid "Bitrate" +msgstr "" + +msgctxt "#30007" +msgid "The bitrate to be used" +msgstr "" + +msgctxt "#30008" msgid "{0:d} kHz" msgstr "" diff --git a/audioencoder.lame/resources/settings.xml b/audioencoder.lame/resources/settings.xml index 654c7e4..678fcaf 100644 --- a/audioencoder.lame/resources/settings.xml +++ b/audioencoder.lame/resources/settings.xml @@ -2,19 +2,19 @@
- + 0 - - - - + + + + - + 192 3 @@ -25,7 +25,7 @@ 320 - 30006 + 30008 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 55452ec..0000000 --- a/debian/changelog +++ /dev/null @@ -1,7 +0,0 @@ -kodi-audioencoder-lame (1.0.0-1~trusty) trusty; urgency=low - - [ wsnipex ] - * initial release - - -- wsnipex Sat, 17 May 2014 11:40:22 +0100 - diff --git a/depends/common/lame/01-field-width-fix.patch b/depends/common/lame/01-field-width-fix.patch index 8812966..2fde09e 100644 --- a/depends/common/lame/01-field-width-fix.patch +++ b/depends/common/lame/01-field-width-fix.patch @@ -6,7 +6,7 @@ Applied-Upstream: commit:1.282 --- a/frontend/parse.c +++ b/frontend/parse.c -@@ -372,11 +372,11 @@ +@@ -402,11 +402,11 @@ lame_version_print(FILE * const fp) const char *b = get_lame_os_bitness(); const char *v = get_lame_version(); const char *u = get_lame_url(); diff --git a/depends/common/lame/03-privacy-breach.patch b/depends/common/lame/02-privacy-breach.patch similarity index 86% rename from depends/common/lame/03-privacy-breach.patch rename to depends/common/lame/02-privacy-breach.patch index c490428..26c6a02 100644 --- a/depends/common/lame/03-privacy-breach.patch +++ b/depends/common/lame/02-privacy-breach.patch @@ -2,8 +2,8 @@ Description: Fix privacy-breach lintian error Author: Sebastian Ramacher Last-Update: 2014-08-30 ---- lame-3.99.5+repack1.orig/doc/html/about.html -+++ lame-3.99.5+repack1/doc/html/about.html +--- a/doc/html/about.html ++++ b/doc/html/about.html @@ -116,9 +116,9 @@ MPEG2 sample rates are 16Khz, 22.05Khz a - \ No newline at end of file + ---- lame-3.99.5+repack1.orig/doc/html/list.html -+++ lame-3.99.5+repack1/doc/html/list.html +--- a/doc/html/list.html ++++ b/doc/html/list.html @@ -47,9 +47,9 @@