input/Reader: new Reader implementation wrapping InputStream
This commit is contained in:
parent
be3359fc67
commit
a7ced00520
@ -1204,6 +1204,7 @@ libinput_a_SOURCES = \
|
||||
src/input/Offset.hxx \
|
||||
src/input/InputStream.cxx src/input/InputStream.hxx \
|
||||
src/input/InputPlugin.hxx \
|
||||
src/input/Reader.cxx src/input/Reader.hxx \
|
||||
src/input/TextInputStream.cxx src/input/TextInputStream.hxx \
|
||||
src/input/ThreadInputStream.cxx src/input/ThreadInputStream.hxx \
|
||||
src/input/AsyncInputStream.cxx src/input/AsyncInputStream.hxx \
|
||||
|
38
src/input/Reader.cxx
Normal file
38
src/input/Reader.cxx
Normal file
@ -0,0 +1,38 @@
|
||||
/*
|
||||
* Copyright 2003-2016 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "Reader.hxx"
|
||||
#include "InputStream.hxx"
|
||||
#include "util/Error.hxx"
|
||||
#include "Log.hxx"
|
||||
|
||||
size_t
|
||||
InputStreamReader::Read(void *data, size_t size)
|
||||
{
|
||||
Error error;
|
||||
size_t nbytes = is.LockRead(data, size, error);
|
||||
assert(nbytes == 0 || !error.IsDefined());
|
||||
assert(nbytes > 0 || error.IsDefined() || is.IsEOF());
|
||||
|
||||
if (gcc_unlikely(nbytes == 0 && error.IsDefined()))
|
||||
LogError(error);
|
||||
|
||||
return nbytes;
|
||||
}
|
45
src/input/Reader.hxx
Normal file
45
src/input/Reader.hxx
Normal file
@ -0,0 +1,45 @@
|
||||
/*
|
||||
* Copyright 2003-2016 The Music Player Daemon Project
|
||||
* http://www.musicpd.org
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#ifndef MPD_INPUT_READER_HXX
|
||||
#define MPD_INPUT_READER_HXX
|
||||
|
||||
#include "check.h"
|
||||
#include "fs/io/Reader.hxx"
|
||||
#include "Compiler.h"
|
||||
|
||||
struct Decoder;
|
||||
class InputStream;
|
||||
|
||||
/**
|
||||
* A #Reader implementation which forwards all read calls to
|
||||
* InputStream::Read() and logs errors.
|
||||
*/
|
||||
class InputStreamReader final : public Reader {
|
||||
InputStream &is;
|
||||
|
||||
public:
|
||||
explicit InputStreamReader(InputStream &_is)
|
||||
:is(_is) {}
|
||||
|
||||
/* virtual methods from class Reader */
|
||||
size_t Read(void *data, size_t size) override;
|
||||
};
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user