From a13e9832e77580956efd6ea9c6ec11bdb4ae2d4b Mon Sep 17 00:00:00 2001 From: Viliam Mateicka Date: Mon, 26 Oct 2009 20:02:34 +0100 Subject: encoder: renaming none_encoder to null_encoder --- src/encoder/none_encoder.c | 124 --------------------------------------------- src/encoder/null_encoder.c | 124 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 src/encoder/none_encoder.c create mode 100644 src/encoder/null_encoder.c (limited to 'src/encoder') diff --git a/src/encoder/none_encoder.c b/src/encoder/none_encoder.c deleted file mode 100644 index a51f4725..00000000 --- a/src/encoder/none_encoder.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2003-2009 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 "encoder_api.h" -#include "encoder_plugin.h" -#include "audio_format.h" - -#include -#include - -#define MAX_BUFFER 32768 - -struct none_encoder { - struct encoder encoder; - - struct audio_format audio_format; - - unsigned char buffer[MAX_BUFFER]; - size_t buffer_length; -}; - -extern const struct encoder_plugin none_encoder_plugin; - -static inline GQuark -none_encoder_quark(void) -{ - return g_quark_from_static_string("none_encoder"); -} - -static struct encoder * -none_encoder_init(G_GNUC_UNUSED const struct config_param *param, - G_GNUC_UNUSED GError **error) -{ - struct none_encoder *encoder; - - encoder = g_new(struct none_encoder, 1); - encoder_struct_init(&encoder->encoder, &none_encoder_plugin); - - return &encoder->encoder; -} - -static void -none_encoder_finish(struct encoder *_encoder) -{ - struct none_encoder *encoder = (struct none_encoder *)_encoder; - - g_free(encoder); -} - -static bool -none_encoder_open(struct encoder *_encoder, struct audio_format *audio_format, - G_GNUC_UNUSED GError **error) -{ - struct none_encoder *encoder = (struct none_encoder *)_encoder; - - encoder->audio_format = *audio_format; - encoder->buffer_length = 0; - - return true; -} - -static void -none_encoder_close(G_GNUC_UNUSED struct encoder *_encoder) -{ -} - -static bool -none_encoder_write(struct encoder *_encoder, - const void *data, size_t length, - G_GNUC_UNUSED GError **error) -{ - struct none_encoder *encoder = (struct none_encoder *)_encoder; - - assert(length + encoder->buffer_length < MAX_BUFFER); - - memcpy(encoder->buffer+encoder->buffer_length, - data, length); - - encoder->buffer_length += length; - return true; -} - -static size_t -none_encoder_read(struct encoder *_encoder, void *dest, size_t length) -{ - struct none_encoder *encoder = (struct none_encoder *)_encoder; - - if (length > encoder->buffer_length) - length = encoder->buffer_length; - - memcpy(dest, encoder->buffer, length); - - encoder->buffer_length -= length; - memmove(encoder->buffer, encoder->buffer + length, - encoder->buffer_length); - - return length; -} - -const struct encoder_plugin none_encoder_plugin = { - .name = "none", - .init = none_encoder_init, - .finish = none_encoder_finish, - .open = none_encoder_open, - .close = none_encoder_close, - .write = none_encoder_write, - .read = none_encoder_read, -}; diff --git a/src/encoder/null_encoder.c b/src/encoder/null_encoder.c new file mode 100644 index 00000000..218a0cb5 --- /dev/null +++ b/src/encoder/null_encoder.c @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2003-2009 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 "encoder_api.h" +#include "encoder_plugin.h" +#include "audio_format.h" + +#include +#include + +#define MAX_BUFFER 32768 + +struct null_encoder { + struct encoder encoder; + + struct audio_format audio_format; + + unsigned char buffer[MAX_BUFFER]; + size_t buffer_length; +}; + +extern const struct encoder_plugin null_encoder_plugin; + +static inline GQuark +null_encoder_quark(void) +{ + return g_quark_from_static_string("null_encoder"); +} + +static struct encoder * +null_encoder_init(G_GNUC_UNUSED const struct config_param *param, + G_GNUC_UNUSED GError **error) +{ + struct null_encoder *encoder; + + encoder = g_new(struct null_encoder, 1); + encoder_struct_init(&encoder->encoder, &null_encoder_plugin); + + return &encoder->encoder; +} + +static void +null_encoder_finish(struct encoder *_encoder) +{ + struct null_encoder *encoder = (struct null_encoder *)_encoder; + + g_free(encoder); +} + +static bool +null_encoder_open(struct encoder *_encoder, struct audio_format *audio_format, + G_GNUC_UNUSED GError **error) +{ + struct null_encoder *encoder = (struct null_encoder *)_encoder; + + encoder->audio_format = *audio_format; + encoder->buffer_length = 0; + + return true; +} + +static void +null_encoder_close(G_GNUC_UNUSED struct encoder *_encoder) +{ +} + +static bool +null_encoder_write(struct encoder *_encoder, + const void *data, size_t length, + G_GNUC_UNUSED GError **error) +{ + struct null_encoder *encoder = (struct null_encoder *)_encoder; + + assert(length + encoder->buffer_length < MAX_BUFFER); + + memcpy(encoder->buffer+encoder->buffer_length, + data, length); + + encoder->buffer_length += length; + return true; +} + +static size_t +null_encoder_read(struct encoder *_encoder, void *dest, size_t length) +{ + struct null_encoder *encoder = (struct null_encoder *)_encoder; + + if (length > encoder->buffer_length) + length = encoder->buffer_length; + + memcpy(dest, encoder->buffer, length); + + encoder->buffer_length -= length; + memmove(encoder->buffer, encoder->buffer + length, + encoder->buffer_length); + + return length; +} + +const struct encoder_plugin null_encoder_plugin = { + .name = "null", + .init = null_encoder_init, + .finish = null_encoder_finish, + .open = null_encoder_open, + .close = null_encoder_close, + .write = null_encoder_write, + .read = null_encoder_read, +}; -- cgit v1.2.3