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

tag_rva2: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-07-26 12:09:17 +02:00
parent c8054e569a
commit 1fcf35ad3b
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.am
View File

@ -93,7 +93,6 @@ mpd_headers = \
src/tag_table.h \ src/tag_table.h \
src/tag_ape.h \ src/tag_ape.h \
src/tag_id3.h \ src/tag_id3.h \
src/tag_rva2.h \
src/Timer.hxx \ src/Timer.hxx \
src/mpd_error.h src/mpd_error.h
@ -441,7 +440,7 @@ libtag_a_SOURCES =\
if HAVE_ID3TAG if HAVE_ID3TAG
libtag_a_SOURCES += \ libtag_a_SOURCES += \
src/tag_id3.c \ src/tag_id3.c \
src/tag_rva2.c \ src/TagRva2.cxx src/TagRva2.hxx \
src/riff.c src/aiff.c src/riff.c src/aiff.c
endif endif
@ -1189,11 +1188,11 @@ if HAVE_ID3TAG
test_dump_rva2_LDADD = \ test_dump_rva2_LDADD = \
$(ID3TAG_LIBS) \ $(ID3TAG_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
test_dump_rva2_SOURCES = test/dump_rva2.c \ test_dump_rva2_SOURCES = test/dump_rva2.cxx \
src/riff.c src/aiff.c \ src/riff.c src/aiff.c \
src/tag_handler.c \ src/tag_handler.c \
src/tag_id3.c \ src/tag_id3.c \
src/tag_rva2.c src/TagRva2.cxx
endif endif
test_run_filter_LDADD = \ test_run_filter_LDADD = \

8
src/tag_rva2.c → src/TagRva2.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,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "tag_rva2.h" #include "TagRva2.hxx"
#include "replay_gain_info.h" #include "replay_gain_info.h"
#include <stdint.h> #include <stdint.h>
@ -102,7 +102,7 @@ rva2_apply_frame(struct replay_gain_info *replay_gain_info,
const id3_byte_t *data = const id3_byte_t *data =
id3_field_getbinarydata(id3_frame_field(frame, 1), &length); id3_field_getbinarydata(id3_frame_field(frame, 1), &length);
if (id == NULL || data == NULL) if (id == nullptr || data == nullptr)
return false; return false;
/* /*
@ -141,7 +141,7 @@ tag_rva2_parse(struct id3_tag *tag, struct replay_gain_info *replay_gain_info)
track and album gain in separate tags */ track and album gain in separate tags */
const struct id3_frame *frame; const struct id3_frame *frame;
for (unsigned i = 0; for (unsigned i = 0;
(frame = id3_tag_findframe(tag, "RVA2", i)) != NULL; (frame = id3_tag_findframe(tag, "RVA2", i)) != nullptr;
++i) ++i)
if (rva2_apply_frame(replay_gain_info, frame)) if (rva2_apply_frame(replay_gain_info, frame))
found = true; found = true;

6
src/tag_rva2.h → src/TagRva2.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,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_TAG_RVA2_H #ifndef MPD_TAG_RVA2_HXX
#define MPD_TAG_RVA2_H #define MPD_TAG_RVA2_HXX
#include "check.h" #include "check.h"

2
src/decoder/MadDecoderPlugin.cxx
View File

@ -24,9 +24,9 @@
extern "C" { extern "C" {
#include "tag_id3.h" #include "tag_id3.h"
#include "tag_rva2.h"
} }
#include "TagRva2.hxx"
#include "tag_handler.h" #include "tag_handler.h"
#include "audio_check.h" #include "audio_check.h"

6
test/dump_rva2.c → test/dump_rva2.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2012 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,8 +18,10 @@
*/ */
#include "config.h" #include "config.h"
extern "C" {
#include "tag_id3.h" #include "tag_id3.h"
#include "tag_rva2.h" }
#include "TagRva2.hxx"
#include "replay_gain_info.h" #include "replay_gain_info.h"
#include "conf.h" #include "conf.h"
#include "tag.h" #include "tag.h"