diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-03 10:58:39 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-03 10:58:39 +0100 |
| commit | 981906ecd1b25012ca5aeafb678f6ec4a42aa9a2 (patch) | |
| tree | a13a0023c2af2d7086045c54764889f05dd422de /src | |
| parent | 90fe4c5124e3fd335f05804d3cc47ba996e62b14 (diff) | |
output_print: convert to C++
Diffstat (limited to 'src')
| -rw-r--r-- | src/OutputCommands.cxx | 2 | ||||
| -rw-r--r-- | src/OutputPrint.cxx (renamed from src/output_print.c) | 9 | ||||
| -rw-r--r-- | src/OutputPrint.hxx (renamed from src/output_print.h) | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/OutputCommands.cxx b/src/OutputCommands.cxx index 88cb95ac..235bf976 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 <string.h> diff --git a/src/output_print.c b/src/OutputPrint.cxx index 483648ca..aa3c4c04 100644 --- a/src/output_print.c +++ b/src/OutputPrint.cxx @@ -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 * * This program is free software; you can redistribute it and/or modify @@ -23,15 +23,18 @@ */ #include "config.h" -#include "output_print.h" +#include "OutputPrint.hxx" #include "output_internal.h" + +extern "C" { #include "output_all.h" #include "client.h" +} void printAudioDevices(struct client *client) { - unsigned n = audio_output_count(); + const unsigned n = audio_output_count(); for (unsigned i = 0; i < n; ++i) { const struct audio_output *ao = audio_output_get(i); diff --git a/src/output_print.h b/src/OutputPrint.hxx index e02f4e9f..5be7fe79 100644 --- a/src/output_print.h +++ b/src/OutputPrint.hxx @@ -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 * * This program is free software; you can redistribute it and/or modify @@ -22,8 +22,8 @@ * */ -#ifndef OUTPUT_PRINT_H -#define OUTPUT_PRINT_H +#ifndef MPD_OUTPUT_PRINT_HXX +#define MPD_OUTPUT_PRINT_HXX struct client; |