From 981906ecd1b25012ca5aeafb678f6ec4a42aa9a2 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 3 Jan 2013 10:58:39 +0100 Subject: output_print: convert to C++ --- Makefile.am | 3 +-- src/OutputCommands.cxx | 2 +- src/OutputPrint.cxx | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/OutputPrint.hxx | 33 +++++++++++++++++++++++++++++++++ src/output_print.c | 45 --------------------------------------------- src/output_print.h | 33 --------------------------------- 6 files changed, 83 insertions(+), 81 deletions(-) create mode 100644 src/OutputPrint.cxx create mode 100644 src/OutputPrint.hxx delete mode 100644 src/output_print.c delete mode 100644 src/output_print.h diff --git a/Makefile.am b/Makefile.am index 0c1ffe6e9..85077c668 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,7 +56,6 @@ mpd_headers = \ src/output_all.h \ src/output_thread.h \ src/output_control.h \ - src/output_print.h \ src/output_command.h \ src/filter_internal.h \ src/filter_config.h \ @@ -800,7 +799,7 @@ OUTPUT_API_SRC = \ src/output_error.h \ src/output_control.c \ src/OutputState.cxx src/OutputState.hxx \ - src/output_print.c \ + src/OutputPrint.cxx src/OutputPrint.hxx \ src/output_command.c \ src/output_plugin.c src/output_plugin.h \ src/output_finish.c \ diff --git a/src/OutputCommands.cxx b/src/OutputCommands.cxx index 88cb95ac4..235bf976a 100644 --- a/src/OutputCommands.cxx +++ b/src/OutputCommands.cxx @@ -19,12 +19,12 @@ #include "config.h" #include "OutputCommands.hxx" +#include "OutputPrint.hxx" extern "C" { #include "protocol/argparser.h" #include "protocol/result.h" #include "output_command.h" -#include "output_print.h" } #include diff --git a/src/OutputPrint.cxx b/src/OutputPrint.cxx new file mode 100644 index 000000000..aa3c4c043 --- /dev/null +++ b/src/OutputPrint.cxx @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2003-2013 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. + */ + +/* + * Protocol specific code for the audio output library. + * + */ + +#include "config.h" +#include "OutputPrint.hxx" +#include "output_internal.h" + +extern "C" { +#include "output_all.h" +#include "client.h" +} + +void +printAudioDevices(struct client *client) +{ + const unsigned n = audio_output_count(); + + for (unsigned i = 0; i < n; ++i) { + const struct audio_output *ao = audio_output_get(i); + + client_printf(client, + "outputid: %i\n" + "outputname: %s\n" + "outputenabled: %i\n", + i, ao->name, ao->enabled); + } +} diff --git a/src/OutputPrint.hxx b/src/OutputPrint.hxx new file mode 100644 index 000000000..5be7fe79a --- /dev/null +++ b/src/OutputPrint.hxx @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2003-2013 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. + */ + +/* + * Protocol specific code for the audio output library. + * + */ + +#ifndef MPD_OUTPUT_PRINT_HXX +#define MPD_OUTPUT_PRINT_HXX + +struct client; + +void +printAudioDevices(struct client *client); + +#endif diff --git a/src/output_print.c b/src/output_print.c deleted file mode 100644 index 483648ca2..000000000 --- a/src/output_print.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (C) 2003-2011 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. - */ - -/* - * Protocol specific code for the audio output library. - * - */ - -#include "config.h" -#include "output_print.h" -#include "output_internal.h" -#include "output_all.h" -#include "client.h" - -void -printAudioDevices(struct client *client) -{ - unsigned n = audio_output_count(); - - for (unsigned i = 0; i < n; ++i) { - const struct audio_output *ao = audio_output_get(i); - - client_printf(client, - "outputid: %i\n" - "outputname: %s\n" - "outputenabled: %i\n", - i, ao->name, ao->enabled); - } -} diff --git a/src/output_print.h b/src/output_print.h deleted file mode 100644 index e02f4e9f5..000000000 --- a/src/output_print.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2003-2011 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. - */ - -/* - * Protocol specific code for the audio output library. - * - */ - -#ifndef OUTPUT_PRINT_H -#define OUTPUT_PRINT_H - -struct client; - -void -printAudioDevices(struct client *client); - -#endif -- cgit v1.2.3