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

volume: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-07 08:59:11 +01:00
parent 804900df36
commit 9f4b906e6c
7 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -152,7 +152,6 @@ mpd_headers = \
src/uri.h \ src/uri.h \
src/utils.h \ src/utils.h \
src/string_util.h \ src/string_util.h \
src/volume.h \
src/zeroconf.h src/zeroconf-internal.h \ src/zeroconf.h src/zeroconf-internal.h \
src/timer.h \ src/timer.h \
src/archive_api.h \ src/archive_api.h \
@ -306,7 +305,7 @@ src_mpd_SOURCES = \
src/uri.c \ src/uri.c \
src/utils.c \ src/utils.c \
src/string_util.c \ src/string_util.c \
src/volume.c \ src/Volume.cxx src/Volume.hxx \
src/SongFilter.cxx src/SongFilter.hxx \ src/SongFilter.cxx src/SongFilter.hxx \
src/PlaylistFile.cxx src/PlaylistFile.hxx \ src/PlaylistFile.cxx src/PlaylistFile.hxx \
src/timer.c src/timer.c

2
src/Main.cxx
View File

@ -34,6 +34,7 @@
#include "Client.hxx" #include "Client.hxx"
#include "AllCommands.hxx" #include "AllCommands.hxx"
#include "Partition.hxx" #include "Partition.hxx"
#include "Volume.hxx"
extern "C" { extern "C" {
#include "daemon.h" #include "daemon.h"
@ -45,7 +46,6 @@ extern "C" {
#include "sig_handlers.h" #include "sig_handlers.h"
#include "audio_config.h" #include "audio_config.h"
#include "output_all.h" #include "output_all.h"
#include "volume.h"
#include "log.h" #include "log.h"
#include "pcm_resample.h" #include "pcm_resample.h"
#include "replay_gain_config.h" #include "replay_gain_config.h"

2
src/OtherCommands.cxx
View File

@ -32,10 +32,10 @@
#include "protocol/ArgParser.hxx" #include "protocol/ArgParser.hxx"
#include "protocol/Result.hxx" #include "protocol/Result.hxx"
#include "ls.hxx" #include "ls.hxx"
#include "Volume.hxx"
extern "C" { extern "C" {
#include "uri.h" #include "uri.h"
#include "volume.h"
#include "stats.h" #include "stats.h"
} }

2
src/PlayerCommands.cxx
View File

@ -24,12 +24,12 @@
#include "PlaylistPrint.hxx" #include "PlaylistPrint.hxx"
#include "UpdateGlue.hxx" #include "UpdateGlue.hxx"
#include "ClientInternal.hxx" #include "ClientInternal.hxx"
#include "Volume.hxx"
#include "protocol/Result.hxx" #include "protocol/Result.hxx"
#include "protocol/ArgParser.hxx" #include "protocol/ArgParser.hxx"
extern "C" { extern "C" {
#include "audio_format.h" #include "audio_format.h"
#include "volume.h"
#include "replay_gain_config.h" #include "replay_gain_config.h"
#include "output_all.h" #include "output_all.h"
} }

5
src/StateFile.cxx
View File

@ -23,10 +23,7 @@
#include "PlaylistState.hxx" #include "PlaylistState.hxx"
#include "TextFile.hxx" #include "TextFile.hxx"
#include "Partition.hxx" #include "Partition.hxx"
#include "Volume.hxx"
extern "C" {
#include "volume.h"
}
#include <glib.h> #include <glib.h>
#include <assert.h> #include <assert.h>

7
src/volume.c → src/Volume.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 * 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
@ -18,10 +18,13 @@
*/ */
#include "config.h" #include "config.h"
#include "volume.h" #include "Volume.hxx"
extern "C" {
#include "idle.h" #include "idle.h"
#include "mixer_all.h" #include "mixer_all.h"
#include "event_pipe.h" #include "event_pipe.h"
}
#include <glib.h> #include <glib.h>

7
src/volume.h → src/Volume.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 * 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
@ -17,10 +17,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_VOLUME_H #ifndef MPD_VOLUME_HXX
#define MPD_VOLUME_H #define MPD_VOLUME_HXX
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
void volume_init(void); void volume_init(void);