oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branches 'neheb/fwhfggwe', 'neheb/nvm2', 'neheb/nvm22', 'neheb/bvm' and 'neheb/cl2'

Browse Source
This commit is contained in:
Max Kellermann
2020-03-16 17:25:50 +01:00
parent 77c6c3fabf 7f10e7a610 e25a3d17e7 88d56c01e7 97425d56e7
commit 256cfc545d
116 changed files with 253 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/input/IcyInputStream.hxx
View File

@@ -58,7 +58,7 @@ public:
*/
IcyInputStream(InputStreamPtr _input,
std::shared_ptr<IcyMetaDataParser> _parser);
virtual ~IcyInputStream() noexcept;
~IcyInputStream() noexcept override;
IcyInputStream(const IcyInputStream &) = delete;
IcyInputStream &operator=(const IcyInputStream &) = delete;

2
src/input/InputStream.cxx
View File

@@ -69,7 +69,7 @@ InputStream::CheapSeeking() const noexcept
}
void
InputStream::Seek(std::unique_lock<Mutex> &, gcc_unused offset_type new_offset)
InputStream::Seek(std::unique_lock<Mutex> &, [[maybe_unused]] offset_type new_offset)
{
throw std::runtime_error("Seeking is not implemented");
}

2
src/input/ProxyInputStream.hxx
View File

@@ -52,7 +52,7 @@ public:
Mutex &_mutex) noexcept
:InputStream(_uri, _mutex) {}
virtual ~ProxyInputStream() noexcept;
~ProxyInputStream() noexcept override;
ProxyInputStream(const ProxyInputStream &) = delete;
ProxyInputStream &operator=(const ProxyInputStream &) = delete;

4
src/input/plugins/AlsaInputPlugin.cxx
View File

@@ -110,7 +110,7 @@ protected:
InvalidateSockets();
}
void DoSeek(gcc_unused offset_type new_offset) override {
void DoSeek([[maybe_unused]] offset_type new_offset) override {
/* unreachable because seekable==false */
SeekDone();
}
@@ -289,7 +289,7 @@ AlsaInputStream::Recover(int err)
if (err == -EAGAIN)
return 0;
/* fall-through to snd_pcm_prepare: */
#if GCC_CHECK_VERSION(7,0)
#if CLANG_OR_GCC_VERSION(7,0)
[[fallthrough]];
#endif
case SND_PCM_STATE_OPEN: