output plugins: don't include gcc.h
Use GLib's G_GNUC_UNUSED instead of gcc.h's mpd_unused.
This commit is contained in:
parent
0734acf392
commit
7dfe301b54
@ -119,8 +119,8 @@ alsa_configure(AlsaData *ad, ConfigParam *param)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *alsa_initDriver(mpd_unused struct audio_output *ao,
|
static void *alsa_initDriver(G_GNUC_UNUSED struct audio_output *ao,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
ConfigParam * param)
|
ConfigParam * param)
|
||||||
{
|
{
|
||||||
/* no need for pthread_once thread-safety when reading config */
|
/* no need for pthread_once thread-safety when reading config */
|
||||||
|
@ -75,7 +75,7 @@ static void audioOutputAo_error(const char *msg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void *audioOutputAo_initDriver(struct audio_output *ao,
|
static void *audioOutputAo_initDriver(struct audio_output *ao,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
ConfigParam * param)
|
ConfigParam * param)
|
||||||
{
|
{
|
||||||
ao_info *ai;
|
ao_info *ai;
|
||||||
@ -176,7 +176,7 @@ static void audioOutputAo_finishDriver(void *data)
|
|||||||
ao_shutdown();
|
ao_shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void audioOutputAo_dropBufferedAudio(mpd_unused void *data)
|
static void audioOutputAo_dropBufferedAudio(G_GNUC_UNUSED void *data)
|
||||||
{
|
{
|
||||||
/* not supported by libao */
|
/* not supported by libao */
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,8 @@
|
|||||||
#include "../utils.h"
|
#include "../utils.h"
|
||||||
#include "../timer.h"
|
#include "../timer.h"
|
||||||
|
|
||||||
|
#include <glib.h>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
@ -155,8 +157,8 @@ static bool openFifo(FifoData *fd)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *fifo_initDriver(mpd_unused struct audio_output *ao,
|
static void *fifo_initDriver(G_GNUC_UNUSED struct audio_output *ao,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
ConfigParam *param)
|
ConfigParam *param)
|
||||||
{
|
{
|
||||||
FifoData *fd;
|
FifoData *fd;
|
||||||
|
@ -117,7 +117,7 @@ mpd_jack_finish(void *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
mpd_jack_srate(mpd_unused jack_nframes_t rate, void *data)
|
mpd_jack_srate(G_GNUC_UNUSED jack_nframes_t rate, void *data)
|
||||||
{
|
{
|
||||||
struct jack_data *jd = (struct jack_data *)data;
|
struct jack_data *jd = (struct jack_data *)data;
|
||||||
struct audio_format *audioFormat = jd->audio_format;
|
struct audio_format *audioFormat = jd->audio_format;
|
||||||
@ -186,7 +186,7 @@ mpd_jack_error(const char *msg)
|
|||||||
|
|
||||||
static void *
|
static void *
|
||||||
mpd_jack_init(struct audio_output *ao,
|
mpd_jack_init(struct audio_output *ao,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
ConfigParam *param)
|
ConfigParam *param)
|
||||||
{
|
{
|
||||||
struct jack_data *jd;
|
struct jack_data *jd;
|
||||||
@ -356,13 +356,13 @@ mpd_jack_open(void *data, struct audio_format *audio_format)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
mpd_jack_close(mpd_unused void *data)
|
mpd_jack_close(G_GNUC_UNUSED void *data)
|
||||||
{
|
{
|
||||||
/*mpd_jack_finish(audioOutput);*/
|
/*mpd_jack_finish(audioOutput);*/
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
mpd_jack_cancel (mpd_unused void *data)
|
mpd_jack_cancel (G_GNUC_UNUSED void *data)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
#include "../output_api.h"
|
#include "../output_api.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
@ -103,9 +104,9 @@ static bool mvp_testDefault(void)
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *mvp_initDriver(mpd_unused struct audio_output *audio_output,
|
static void *mvp_initDriver(G_GNUC_UNUSED struct audio_output *audio_output,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
mpd_unused ConfigParam *param)
|
G_GNUC_UNUSED ConfigParam *param)
|
||||||
{
|
{
|
||||||
MvpData *md = g_new(MvpData, 1);
|
MvpData *md = g_new(MvpData, 1);
|
||||||
md->audio_output = audio_output;
|
md->audio_output = audio_output;
|
||||||
|
@ -23,6 +23,7 @@
|
|||||||
#include "../mixer.h"
|
#include "../mixer.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
@ -386,8 +387,8 @@ static void *oss_open_default(ConfigParam *param)
|
|||||||
return NULL; /* some compilers can be dumb... */
|
return NULL; /* some compilers can be dumb... */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void *oss_initDriver(mpd_unused struct audio_output *audioOutput,
|
static void *oss_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
ConfigParam * param)
|
ConfigParam * param)
|
||||||
{
|
{
|
||||||
if (param) {
|
if (param) {
|
||||||
|
@ -81,9 +81,9 @@ static bool osx_testDefault(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
osx_initDriver(mpd_unused struct audio_output *audioOutput,
|
osx_initDriver(G_GNUC_UNUSED struct audio_output *audioOutput,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
mpd_unused ConfigParam * param)
|
G_GNUC_UNUSED ConfigParam * param)
|
||||||
{
|
{
|
||||||
return newOsxData();
|
return newOsxData();
|
||||||
}
|
}
|
||||||
@ -133,9 +133,10 @@ static void osx_closeDevice(void *data)
|
|||||||
|
|
||||||
static OSStatus
|
static OSStatus
|
||||||
osx_render(void *vdata,
|
osx_render(void *vdata,
|
||||||
mpd_unused AudioUnitRenderActionFlags * ioActionFlags,
|
G_GNUC_UNUSED AudioUnitRenderActionFlags * ioActionFlags,
|
||||||
mpd_unused const AudioTimeStamp * inTimeStamp,
|
G_GNUC_UNUSED const AudioTimeStamp * inTimeStamp,
|
||||||
mpd_unused UInt32 inBusNumber, mpd_unused UInt32 inNumberFrames,
|
G_GNUC_UNUSED UInt32 inBusNumber,
|
||||||
|
G_GNUC_UNUSED UInt32 inNumberFrames,
|
||||||
AudioBufferList * bufferList)
|
AudioBufferList * bufferList)
|
||||||
{
|
{
|
||||||
OsxData *od = (OsxData *) vdata;
|
OsxData *od = (OsxData *) vdata;
|
||||||
|
@ -54,7 +54,7 @@ static void pulse_free_data(struct pulse_data *pd)
|
|||||||
|
|
||||||
static void *
|
static void *
|
||||||
pulse_init(struct audio_output *ao,
|
pulse_init(struct audio_output *ao,
|
||||||
mpd_unused const struct audio_format *audio_format,
|
G_GNUC_UNUSED const struct audio_format *audio_format,
|
||||||
ConfigParam *param)
|
ConfigParam *param)
|
||||||
{
|
{
|
||||||
BlockParam *server = NULL;
|
BlockParam *server = NULL;
|
||||||
|
@ -222,8 +222,8 @@ static int shout_ogg_encoder_init_encoder(struct shout_data *sd)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int shout_ogg_encoder_send_metadata(struct shout_data *sd,
|
static int shout_ogg_encoder_send_metadata(struct shout_data *sd,
|
||||||
mpd_unused char * song,
|
G_GNUC_UNUSED char * song,
|
||||||
mpd_unused size_t size)
|
G_GNUC_UNUSED size_t size)
|
||||||
{
|
{
|
||||||
struct ogg_vorbis_data *od = (struct ogg_vorbis_data *)sd->encoder_data;
|
struct ogg_vorbis_data *od = (struct ogg_vorbis_data *)sd->encoder_data;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user