diff options
| author | Max Kellermann <max@musicpd.org> | 2018-08-17 20:02:27 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-08-17 20:02:27 +0200 |
| commit | 1ba35e1fd4871f2430d7f3bf5a799f2ad39f73ab (patch) | |
| tree | 6a18adeae28bf65cc94aa1c08087db2e84fbee10 /src | |
| parent | 4ba3812baf7ec552e7b17b275380b57a51e10f52 (diff) | |
| parent | 98afae2520fbe5a322f803335b3142612fda4762 (diff) | |
Merge tag 'v0.20.21'
release v0.20.21
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/plugins/FileInputPlugin.cxx | 3 | ||||
| -rw-r--r-- | src/playlist/cue/CueParser.cxx | 1 | ||||
| -rw-r--r-- | src/system/EPollFD.cxx | 15 |
3 files changed, 1 insertions, 18 deletions
diff --git a/src/input/plugins/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx index 380cacfce..545906d49 100644 --- a/src/input/plugins/FileInputPlugin.cxx +++ b/src/input/plugins/FileInputPlugin.cxx @@ -64,13 +64,10 @@ OpenFileInputStream(Path path, Mutex &mutex) throw FormatRuntimeError("Not a regular file: %s", path.c_str()); -#if !defined(__BIONIC__) || __ANDROID_API__ >= 21 - /* posix_fadvise() requires Android API 21 */ #ifdef POSIX_FADV_SEQUENTIAL posix_fadvise(reader.GetFD().Get(), (off_t)0, info.GetSize(), POSIX_FADV_SEQUENTIAL); #endif -#endif return std::make_unique<FileInputStream>(path.ToUTF8Throw().c_str(), std::move(reader), info.GetSize(), diff --git a/src/playlist/cue/CueParser.cxx b/src/playlist/cue/CueParser.cxx index 2bd1aa4b0..38f0529a2 100644 --- a/src/playlist/cue/CueParser.cxx +++ b/src/playlist/cue/CueParser.cxx @@ -202,6 +202,7 @@ CueParser::Feed2(char *p) noexcept return; if (strcmp(type, "WAVE") != 0 && + strcmp(type, "FLAC") != 0 && /* non-standard */ strcmp(type, "MP3") != 0 && strcmp(type, "AIFF") != 0) { state = IGNORE_FILE; diff --git a/src/system/EPollFD.cxx b/src/system/EPollFD.cxx index d22d3836b..a119ab05e 100644 --- a/src/system/EPollFD.cxx +++ b/src/system/EPollFD.cxx @@ -22,21 +22,6 @@ #include "EPollFD.hxx" #include "Error.hxx" -#if defined(__BIONIC__) && __ANDROID_API__ < 21 - -#include <sys/syscall.h> -#include <fcntl.h> - -#define EPOLL_CLOEXEC O_CLOEXEC - -static inline int -epoll_create1(int flags) noexcept -{ - return syscall(__NR_epoll_create1, flags); -} - -#endif - EPollFD::EPollFD() :fd(::epoll_create1(EPOLL_CLOEXEC)) { |