Merge tag 'v0.20.8'

.travis.yml

@@ -2,30 +2,35 @@ dist: trusty
 language: cpp
 
 addons:
-    apt:
-        packages:
-            - libcppunit-dev
-            - libboost-dev
+  apt:
+    packages:
+      - libcppunit-dev
+      - libboost-dev
 
 os:
-    - linux
+  - linux
+  - osx
 
-compiler:
-    - gcc
+env:
+  global:
+    - MAKEFLAGS="-j2"
 
 before_install:
   # C++14
-  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-  - sudo apt-get update -qq
+  - test "$TRAVIS_OS_NAME" != "linux" || sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get update -qq
+  - test "$TRAVIS_OS_NAME" != "osx" || brew update
 
 install:
   # C++14
-  - sudo apt-get install -qq g++-5
-  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90
-  - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 90
+  - test "$TRAVIS_OS_NAME" != "linux" || sudo apt-get install -qq g++-5
+  - test "$TRAVIS_OS_NAME" != "osx" || brew install cppunit
 
 script:
-    - ./autogen.sh
-    - ./configure --enable-test
-    - make
-    - make check
+  - OPTIONS="--enable-test"
+  - test "$TRAVIS_OS_NAME" != "linux" || export CC=gcc-5 CXX=g++-5
+  - test "$TRAVIS_OS_NAME" != "osx" || OPTIONS="$OPTIONS --enable-osx"
+  - ./autogen.sh
+  - ./configure --disable-silent-rules --disable-dependency-tracking $OPTIONS
+  - make
+  - make check

NEWS

@@ -9,9 +9,11 @@ ver 0.21 (not yet released)
 * output
   - alsa: non-blocking mode
 
-ver 0.20.8 (not yet released)
+ver 0.20.8 (2017/05/19)
 * output
   - osx: fix build failure due to missing "noexcept"
+* playlist
+  - m3u: support MIME type `audio/mpegurl`
 * fix build failure with GCC 4.x
 
 ver 0.20.7 (2017/05/15)

src/playlist/plugins/ExtM3uPlaylistPlugin.cxx

@@ -146,6 +146,7 @@ static const char *const extm3u_suffixes[] = {
 
 static const char *const extm3u_mime_types[] = {
 	"audio/x-mpegurl",
+	"audio/mpegurl",
 	nullptr
 };
 

src/playlist/plugins/M3uPlaylistPlugin.cxx

@@ -66,6 +66,7 @@ static const char *const m3u_suffixes[] = {
 
 static const char *const m3u_mime_types[] = {
 	"audio/x-mpegurl",
+	"audio/mpegurl",
 	nullptr
 };
 

test/test_byte_reverse.cxx

@@ -49,9 +49,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ByteReverseTest);
 void
 ByteReverseTest::TestByteReverse2()
 {
-	static const char src[] alignas(uint16_t) = "123456";
+	alignas(uint16_t) static const char src[] = "123456";
 	static const char result[] = "214365";
-	static uint8_t dest[ARRAY_SIZE(src)] alignas(uint16_t);
+	alignas(uint16_t)static uint8_t dest[ARRAY_SIZE(src)];
 
 	reverse_bytes(dest, (const uint8_t *)src,
 		      (const uint8_t *)(src + ARRAY_SIZE(src) - 1), 2);
@@ -73,9 +73,9 @@ ByteReverseTest::TestByteReverse3()
 void
 ByteReverseTest::TestByteReverse4()
 {
-	static const char src[] alignas(uint32_t) = "12345678";
+	alignas(uint32_t) static const char src[] = "12345678";
 	static const char result[] = "43218765";
-	static uint8_t dest[ARRAY_SIZE(src)] alignas(uint32_t);
+	alignas(uint32_t) static uint8_t dest[ARRAY_SIZE(src)];
 
 	reverse_bytes(dest, (const uint8_t *)src,
 		      (const uint8_t *)(src + ARRAY_SIZE(src) - 1), 4);