decoder/Bridge: add noexcept
This commit is contained in:
parent
94c9fafe16
commit
4650a903b4
@ -83,7 +83,8 @@ private:
|
|||||||
|
|
||||||
/* virtual methods from class DecoderClient */
|
/* virtual methods from class DecoderClient */
|
||||||
InputStreamPtr OpenUri(const char *uri) override;
|
InputStreamPtr OpenUri(const char *uri) override;
|
||||||
size_t Read(InputStream &is, void *buffer, size_t length) override;
|
size_t Read(InputStream &is,
|
||||||
|
void *buffer, size_t length) noexcept override;
|
||||||
|
|
||||||
/* virtual methods from class InputStreamHandler */
|
/* virtual methods from class InputStreamHandler */
|
||||||
void OnInputStreamReady() noexcept override {
|
void OnInputStreamReady() noexcept override {
|
||||||
@ -285,7 +286,8 @@ GetChromaprintCommand::OpenUri(const char *uri2)
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
GetChromaprintCommand::Read(InputStream &is, void *buffer, size_t length)
|
GetChromaprintCommand::Read(InputStream &is,
|
||||||
|
void *buffer, size_t length) noexcept
|
||||||
{
|
{
|
||||||
/* overriding ChromaprintDecoderClient's implementation to
|
/* overriding ChromaprintDecoderClient's implementation to
|
||||||
make it cancellable */
|
make it cancellable */
|
||||||
|
@ -255,7 +255,7 @@ DecoderBridge::UpdateStreamTag(InputStream *is) noexcept
|
|||||||
|
|
||||||
void
|
void
|
||||||
DecoderBridge::Ready(const AudioFormat audio_format,
|
DecoderBridge::Ready(const AudioFormat audio_format,
|
||||||
bool seekable, SignedSongTime duration)
|
bool seekable, SignedSongTime duration) noexcept
|
||||||
{
|
{
|
||||||
assert(convert == nullptr);
|
assert(convert == nullptr);
|
||||||
assert(stream_tag == nullptr);
|
assert(stream_tag == nullptr);
|
||||||
@ -401,7 +401,7 @@ DecoderBridge::OpenUri(const char *uri)
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
DecoderBridge::Read(InputStream &is, void *buffer, size_t length)
|
DecoderBridge::Read(InputStream &is, void *buffer, size_t length) noexcept
|
||||||
try {
|
try {
|
||||||
assert(buffer != nullptr);
|
assert(buffer != nullptr);
|
||||||
assert(dc.state == DecoderState::START ||
|
assert(dc.state == DecoderState::START ||
|
||||||
|
@ -161,14 +161,15 @@ public:
|
|||||||
|
|
||||||
/* virtual methods from DecoderClient */
|
/* virtual methods from DecoderClient */
|
||||||
void Ready(AudioFormat audio_format,
|
void Ready(AudioFormat audio_format,
|
||||||
bool seekable, SignedSongTime duration) override;
|
bool seekable, SignedSongTime duration) noexcept override;
|
||||||
DecoderCommand GetCommand() noexcept override;
|
DecoderCommand GetCommand() noexcept override;
|
||||||
void CommandFinished() noexcept override;
|
void CommandFinished() noexcept override;
|
||||||
SongTime GetSeekTime() noexcept override;
|
SongTime GetSeekTime() noexcept override;
|
||||||
uint64_t GetSeekFrame() noexcept override;
|
uint64_t GetSeekFrame() noexcept override;
|
||||||
void SeekError() noexcept override;
|
void SeekError() noexcept override;
|
||||||
InputStreamPtr OpenUri(const char *uri) override;
|
InputStreamPtr OpenUri(const char *uri) override;
|
||||||
size_t Read(InputStream &is, void *buffer, size_t length) override;
|
size_t Read(InputStream &is,
|
||||||
|
void *buffer, size_t length) noexcept override;
|
||||||
void SubmitTimestamp(FloatDuration t) noexcept override;
|
void SubmitTimestamp(FloatDuration t) noexcept override;
|
||||||
DecoderCommand SubmitData(InputStream *is,
|
DecoderCommand SubmitData(InputStream *is,
|
||||||
const void *data, size_t length,
|
const void *data, size_t length,
|
||||||
|
@ -48,7 +48,8 @@ public:
|
|||||||
* unknown
|
* unknown
|
||||||
*/
|
*/
|
||||||
virtual void Ready(AudioFormat audio_format,
|
virtual void Ready(AudioFormat audio_format,
|
||||||
bool seekable, SignedSongTime duration) = 0;
|
bool seekable,
|
||||||
|
SignedSongTime duration) noexcept = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines the pending decoder command.
|
* Determines the pending decoder command.
|
||||||
@ -106,7 +107,8 @@ public:
|
|||||||
* @return the number of bytes read, or 0 if one of the following
|
* @return the number of bytes read, or 0 if one of the following
|
||||||
* occurs: end of file; error; command (like SEEK or STOP).
|
* occurs: end of file; error; command (like SEEK or STOP).
|
||||||
*/
|
*/
|
||||||
virtual size_t Read(InputStream &is, void *buffer, size_t length) = 0;
|
virtual size_t Read(InputStream &is,
|
||||||
|
void *buffer, size_t length) noexcept = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the time stamp for the next data chunk [seconds]. The MPD
|
* Sets the time stamp for the next data chunk [seconds]. The MPD
|
||||||
|
@ -44,7 +44,8 @@ ChromaprintDecoderClient::Finish()
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ChromaprintDecoderClient::Ready(AudioFormat audio_format, bool, SignedSongTime)
|
ChromaprintDecoderClient::Ready(AudioFormat audio_format, bool,
|
||||||
|
SignedSongTime) noexcept
|
||||||
{
|
{
|
||||||
/* feed the first two minutes into libchromaprint */
|
/* feed the first two minutes into libchromaprint */
|
||||||
remaining_bytes = audio_format.TimeToSize(std::chrono::minutes(2));
|
remaining_bytes = audio_format.TimeToSize(std::chrono::minutes(2));
|
||||||
@ -87,7 +88,8 @@ ChromaprintDecoderClient::SubmitData(InputStream *,
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
ChromaprintDecoderClient::Read(InputStream &is, void *buffer, size_t length)
|
ChromaprintDecoderClient::Read(InputStream &is,
|
||||||
|
void *buffer, size_t length) noexcept
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
return is.LockRead(buffer, length);
|
return is.LockRead(buffer, length);
|
||||||
|
@ -68,7 +68,7 @@ public:
|
|||||||
|
|
||||||
/* virtual methods from DecoderClient */
|
/* virtual methods from DecoderClient */
|
||||||
void Ready(AudioFormat audio_format,
|
void Ready(AudioFormat audio_format,
|
||||||
bool seekable, SignedSongTime duration) override;
|
bool seekable, SignedSongTime duration) noexcept override;
|
||||||
|
|
||||||
DecoderCommand GetCommand() noexcept override {
|
DecoderCommand GetCommand() noexcept override {
|
||||||
return !error && remaining_bytes > 0
|
return !error && remaining_bytes > 0
|
||||||
@ -90,7 +90,8 @@ public:
|
|||||||
|
|
||||||
//InputStreamPtr OpenUri(const char *) override;
|
//InputStreamPtr OpenUri(const char *) override;
|
||||||
|
|
||||||
size_t Read(InputStream &is, void *buffer, size_t length) override;
|
size_t Read(InputStream &is,
|
||||||
|
void *buffer, size_t length) noexcept override;
|
||||||
|
|
||||||
void SubmitTimestamp(FloatDuration) noexcept override {}
|
void SubmitTimestamp(FloatDuration) noexcept override {}
|
||||||
DecoderCommand SubmitData(InputStream *is,
|
DecoderCommand SubmitData(InputStream *is,
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
void
|
void
|
||||||
DumpDecoderClient::Ready(const AudioFormat audio_format,
|
DumpDecoderClient::Ready(const AudioFormat audio_format,
|
||||||
gcc_unused bool seekable,
|
gcc_unused bool seekable,
|
||||||
SignedSongTime duration)
|
SignedSongTime duration) noexcept
|
||||||
{
|
{
|
||||||
assert(!initialized);
|
assert(!initialized);
|
||||||
assert(audio_format.IsValid());
|
assert(audio_format.IsValid());
|
||||||
@ -76,7 +76,7 @@ DumpDecoderClient::OpenUri(const char *uri)
|
|||||||
}
|
}
|
||||||
|
|
||||||
size_t
|
size_t
|
||||||
DumpDecoderClient::Read(InputStream &is, void *buffer, size_t length)
|
DumpDecoderClient::Read(InputStream &is, void *buffer, size_t length) noexcept
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
return is.LockRead(buffer, length);
|
return is.LockRead(buffer, length);
|
||||||
|
@ -41,14 +41,15 @@ public:
|
|||||||
|
|
||||||
/* virtual methods from DecoderClient */
|
/* virtual methods from DecoderClient */
|
||||||
void Ready(AudioFormat audio_format,
|
void Ready(AudioFormat audio_format,
|
||||||
bool seekable, SignedSongTime duration) override;
|
bool seekable, SignedSongTime duration) noexcept override;
|
||||||
DecoderCommand GetCommand() noexcept override;
|
DecoderCommand GetCommand() noexcept override;
|
||||||
void CommandFinished() noexcept override;
|
void CommandFinished() noexcept override;
|
||||||
SongTime GetSeekTime() noexcept override;
|
SongTime GetSeekTime() noexcept override;
|
||||||
uint64_t GetSeekFrame() noexcept override;
|
uint64_t GetSeekFrame() noexcept override;
|
||||||
void SeekError() noexcept override;
|
void SeekError() noexcept override;
|
||||||
InputStreamPtr OpenUri(const char *uri) override;
|
InputStreamPtr OpenUri(const char *uri) override;
|
||||||
size_t Read(InputStream &is, void *buffer, size_t length) override;
|
size_t Read(InputStream &is,
|
||||||
|
void *buffer, size_t length) noexcept override;
|
||||||
void SubmitTimestamp(FloatDuration t) noexcept override;
|
void SubmitTimestamp(FloatDuration t) noexcept override;
|
||||||
DecoderCommand SubmitData(InputStream *is,
|
DecoderCommand SubmitData(InputStream *is,
|
||||||
const void *data, size_t length,
|
const void *data, size_t length,
|
||||||
|
Loading…
Reference in New Issue
Block a user