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

sig_handlers, log: convert to C++

This commit is contained in:
Max Kellermann 2013-01-09 22:33:06 +01:00
parent d3e1b72d38
commit 8eacd13ce7
7 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -92,7 +92,6 @@ mpd_headers = \
src/icy_server.h \
src/icy_metadata.h \
src/server_socket.h \
src/log.h \
src/ls.h \
src/mixer_api.h \
src/mixer_control.h \
@ -129,7 +128,6 @@ mpd_headers = \
src/replay_gain_config.h \
src/replay_gain_info.h \
src/replay_gain_ape.h \
src/sig_handlers.h \
src/TimePrint.cxx src/TimePrint.hxx \
src/song.h \
src/song_sort.c src/song_sort.h \
@ -240,7 +238,7 @@ src_mpd_SOURCES = \
src/ClientFile.cxx src/ClientFile.hxx \
src/server_socket.c \
src/Listen.cxx src/Listen.hxx \
src/log.c \
src/Log.cxx src/Log.hxx \
src/ls.cxx \
src/io_error.h \
src/io_thread.c src/io_thread.h \
@ -279,7 +277,7 @@ src_mpd_SOURCES = \
src/QueueSave.cxx src/QueueSave.hxx \
src/ReplayGainConfig.cxx \
src/ReplayGainInfo.cxx \
src/sig_handlers.c \
src/SignalHandlers.cxx src/SignalHandlers.hxx \
src/Song.cxx \
src/SongUpdate.cxx \
src/SongPrint.cxx src/SongPrint.hxx \
@ -1118,7 +1116,7 @@ test_run_decoder_LDADD = \
test_run_decoder_SOURCES = test/run_decoder.c \
test/stdbin.h \
src/io_thread.c src/io_thread.h \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
src/ReplayGainInfo.cxx \
src/uri.c \
@ -1140,7 +1138,7 @@ test_read_tags_LDADD = \
$(GLIB_LIBS)
test_read_tags_SOURCES = test/read_tags.c \
src/io_thread.c src/io_thread.h \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
src/ReplayGainInfo.cxx \
src/uri.c \
@ -1263,7 +1261,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
test_run_output_SOURCES = test/run_output.cxx \
test/FakeReplayGainConfig.cxx \
test/stdbin.h \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/io_thread.c src/io_thread.h \
src/audio_check.c \
src/audio_format.c \
@ -1292,7 +1290,7 @@ test_read_mixer_LDADD = \
$(OUTPUT_LIBS) \
$(GLIB_LIBS)
test_read_mixer_SOURCES = test/read_mixer.c \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c src/log.c \
src/conf.c src/tokenizer.c src/utils.c src/string_util.c \
src/mixer_control.c src/mixer_api.c \
src/filter_plugin.c \
src/filter/volume_filter_plugin.c \

6
src/CommandLine.cxx
View File

@ -21,11 +21,7 @@
#include "CommandLine.hxx"
#include "path.h"
#include "ls.hxx"
extern "C" {
#include "log.h"
}
#include "Log.hxx"
#include "conf.h"
#include "decoder_list.h"
#include "decoder_plugin.h"

4
src/log.c → src/Log.cxx
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
*
* This program is free software; you can redistribute it and/or modify
@ -18,7 +18,7 @@
*/
#include "config.h"
#include "log.h"
#include "Log.hxx"
#include "conf.h"
#include "utils.h"
#include "fd_util.h"

6
src/log.h → src/Log.hxx
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
*
* This program is free software; you can redistribute it and/or modify
@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_LOG_H
#define MPD_LOG_H
#ifndef MPD_LOG_HXX
#define MPD_LOG_HXX
#include <glib.h>
#include <stdbool.h>

4
src/Main.cxx
View File

@ -41,15 +41,15 @@
#include "conf.h"
#include "replay_gain_config.h"
#include "Idle.hxx"
#include "SignalHandlers.hxx"
#include "Log.hxx"
extern "C" {
#include "daemon.h"
#include "io_thread.h"
#include "path.h"
#include "stats.h"
#include "sig_handlers.h"
#include "audio_config.h"
#include "log.h"
#include "pcm_resample.h"
#include "decoder_list.h"
#include "input_init.h"

4
src/sig_handlers.c → src/SignalHandlers.cxx
View File

@ -18,11 +18,11 @@
*/
#include "config.h"
#include "sig_handlers.h"
#include "SignalHandlers.hxx"
#ifndef WIN32
#include "log.h"
#include "Log.hxx"
#include "Main.hxx"
#include "event_pipe.h"
#include "mpd_error.h"

6
src/sig_handlers.h → src/SignalHandlers.hxx
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
*
* This program is free software; you can redistribute it and/or modify
@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_SIG_HANDLERS_H
#define MPD_SIG_HANDLERS_H
#ifndef MPD_SIGNAL_HANDLERS_HXX
#define MPD_SIGNAL_HANDLERS_HXX
void initSigHandlers(void);