diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/encoder/ToOutputStream.cxx | 41 | ||||
| -rw-r--r-- | src/encoder/ToOutputStream.hxx | 32 | ||||
| -rw-r--r-- | src/output/plugins/RecorderOutputPlugin.cxx | 19 |
4 files changed, 76 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 74fa0bc1d..7c0e6dfa7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1049,6 +1049,7 @@ libencoder_plugins_a_SOURCES = \ src/encoder/EncoderAPI.hxx \ src/encoder/EncoderInterface.hxx \ src/encoder/EncoderPlugin.hxx \ + src/encoder/ToOutputStream.cxx src/encoder/ToOutputStream.hxx \ src/encoder/plugins/OggStream.hxx \ src/encoder/plugins/NullEncoderPlugin.cxx \ src/encoder/plugins/NullEncoderPlugin.hxx \ diff --git a/src/encoder/ToOutputStream.cxx b/src/encoder/ToOutputStream.cxx new file mode 100644 index 000000000..43345cf70 --- /dev/null +++ b/src/encoder/ToOutputStream.cxx @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2003-2015 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 "ToOutputStream.hxx" +#include "EncoderInterface.hxx" +#include "fs/io/OutputStream.hxx" + +bool +EncoderToOutputStream(OutputStream &os, Encoder &encoder, Error &error) +{ + while (true) { + /* read from the encoder */ + + char buffer[32768]; + size_t nbytes = encoder_read(&encoder, buffer, sizeof(buffer)); + if (nbytes == 0) + return true; + + /* write everything to the stream */ + + if (!os.Write(buffer, nbytes, error)) + return false; + } +} diff --git a/src/encoder/ToOutputStream.hxx b/src/encoder/ToOutputStream.hxx new file mode 100644 index 000000000..e3fb7b908 --- /dev/null +++ b/src/encoder/ToOutputStream.hxx @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2003-2015 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_ENCODER_TO_OUTPUT_STREAM_HXX +#define MPD_ENCODER_TO_OUTPUT_STREAM_HXX + +#include "check.h" + +struct Encoder; +class OutputStream; +class Error; + +bool +EncoderToOutputStream(OutputStream &os, Encoder &encoder, Error &error); + +#endif diff --git a/src/output/plugins/RecorderOutputPlugin.cxx b/src/output/plugins/RecorderOutputPlugin.cxx index 22915e39f..973e60b47 100644 --- a/src/output/plugins/RecorderOutputPlugin.cxx +++ b/src/output/plugins/RecorderOutputPlugin.cxx @@ -21,6 +21,7 @@ #include "RecorderOutputPlugin.hxx" #include "../OutputAPI.hxx" #include "../Wrapper.hxx" +#include "encoder/ToOutputStream.hxx" #include "encoder/EncoderInterface.hxx" #include "encoder/EncoderPlugin.hxx" #include "encoder/EncoderList.hxx" @@ -52,11 +53,6 @@ class RecorderOutput { */ FileOutputStream *file; - /** - * The buffer for encoder_read(). - */ - char buffer[32768]; - RecorderOutput() :base(recorder_output_plugin), encoder(nullptr), @@ -148,18 +144,7 @@ RecorderOutput::EncoderToFile(Error &error) assert(file != nullptr); assert(file->IsDefined()); - while (true) { - /* read from the encoder */ - - size_t size = encoder_read(encoder, buffer, sizeof(buffer)); - if (size == 0) - return true; - - /* write everything into the file */ - - if (!file->Write(buffer, size, error)) - return false; - } + return EncoderToOutputStream(*file, *encoder, error); } inline bool |