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

shout: removed shout_plugin.h

Browse Source 
There are no plugins left which require shout_plugin.h.  Moved the
struct declaration to shout_plugin.c.
This commit is contained in:
Max Kellermann 2009-02-22 17:52:37 +01:00
parent 1c56edd1c8
commit d50a3d513e
3 changed files with 28 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.am
View File

@ -53,7 +53,6 @@ mpd_headers = \
output_state.h \ output_state.h \
output_print.h \ output_print.h \
output_command.h \ output_command.h \
output/shout_plugin.h \
buffer2array.h \ buffer2array.h \
command.h \ command.h \
idle.h \ idle.h \

29
src/output/shout_plugin.c
View File

@ -16,16 +16,43 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "shout_plugin.h" #include "output_api.h"
#include "encoder_plugin.h" #include "encoder_plugin.h"
#include "encoder_list.h" #include "encoder_list.h"
#include <shout/shout.h>
#include <glib.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "shout"
#define DEFAULT_CONN_TIMEOUT 2 #define DEFAULT_CONN_TIMEOUT 2
struct shout_buffer {
unsigned char data[32768];
size_t len;
};
struct shout_data {
struct audio_output *audio_output;
shout_t *shout_conn;
shout_metadata_t *shout_meta;
struct encoder *encoder;
float quality;
int bitrate;
int timeout;
struct shout_buffer buf;
};
static int shout_init_count; static int shout_init_count;
static const struct encoder_plugin * static const struct encoder_plugin *

52
src/output/shout_plugin.h
View File

@ -1,52 +0,0 @@
/* the Music Player Daemon (MPD)
* Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef MPD_SHOUT_PLUGIN_H
#define MPD_SHOUT_PLUGIN_H
#include "../output_api.h"
#include "../conf.h"
#include <shout/shout.h>
#include <glib.h>
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "shout"
struct shout_buffer {
unsigned char data[32768];
size_t len;
};
struct shout_data {
struct audio_output *audio_output;
shout_t *shout_conn;
shout_metadata_t *shout_meta;
struct encoder *encoder;
float quality;
int bitrate;
int timeout;
struct shout_buffer buf;
};
#endif