output_print: convert to C++

This commit is contained in:
Max Kellermann 2013-01-03 10:58:39 +01:00
parent 90fe4c5124
commit 981906ecd1
4 changed files with 11 additions and 9 deletions

View File

@ -56,7 +56,6 @@ mpd_headers = \
src/output_all.h \ src/output_all.h \
src/output_thread.h \ src/output_thread.h \
src/output_control.h \ src/output_control.h \
src/output_print.h \
src/output_command.h \ src/output_command.h \
src/filter_internal.h \ src/filter_internal.h \
src/filter_config.h \ src/filter_config.h \
@ -800,7 +799,7 @@ OUTPUT_API_SRC = \
src/output_error.h \ src/output_error.h \
src/output_control.c \ src/output_control.c \
src/OutputState.cxx src/OutputState.hxx \ src/OutputState.cxx src/OutputState.hxx \
src/output_print.c \ src/OutputPrint.cxx src/OutputPrint.hxx \
src/output_command.c \ src/output_command.c \
src/output_plugin.c src/output_plugin.h \ src/output_plugin.c src/output_plugin.h \
src/output_finish.c \ src/output_finish.c \

View File

@ -19,12 +19,12 @@
#include "config.h" #include "config.h"
#include "OutputCommands.hxx" #include "OutputCommands.hxx"
#include "OutputPrint.hxx"
extern "C" { extern "C" {
#include "protocol/argparser.h" #include "protocol/argparser.h"
#include "protocol/result.h" #include "protocol/result.h"
#include "output_command.h" #include "output_command.h"
#include "output_print.h"
} }
#include <string.h> #include <string.h>

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -23,15 +23,18 @@
*/ */
#include "config.h" #include "config.h"
#include "output_print.h" #include "OutputPrint.hxx"
#include "output_internal.h" #include "output_internal.h"
extern "C" {
#include "output_all.h" #include "output_all.h"
#include "client.h" #include "client.h"
}
void void
printAudioDevices(struct client *client) printAudioDevices(struct client *client)
{ {
unsigned n = audio_output_count(); const unsigned n = audio_output_count();
for (unsigned i = 0; i < n; ++i) { for (unsigned i = 0; i < n; ++i) {
const struct audio_output *ao = audio_output_get(i); const struct audio_output *ao = audio_output_get(i);

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -22,8 +22,8 @@
* *
*/ */
#ifndef OUTPUT_PRINT_H #ifndef MPD_OUTPUT_PRINT_HXX
#define OUTPUT_PRINT_H #define MPD_OUTPUT_PRINT_HXX
struct client; struct client;