From cc1de3f1023ee0ffbde87cf56cb381d1d29ffef3 Mon Sep 17 00:00:00 2001 From: Eric Fry Date: Sat, 1 Aug 2020 22:39:25 +1000 Subject: [PATCH] AUDIO: Removed standard headers from soundfont2 code. Updated license comment. --- audio/soundfont/common.h | 2 +- audio/soundfont/rawfile.cpp | 2 +- audio/soundfont/rawfile.h | 4 +--- audio/soundfont/rifffile.cpp | 2 +- audio/soundfont/rifffile.h | 4 +--- audio/soundfont/sf2file.cpp | 3 +-- audio/soundfont/sf2file.h | 4 ++-- audio/soundfont/synthfile.cpp | 2 +- audio/soundfont/synthfile.h | 2 +- audio/soundfont/vab/psxspu.cpp | 2 +- audio/soundfont/vab/psxspu.h | 2 +- audio/soundfont/vab/vab.cpp | 2 +- audio/soundfont/vab/vab.h | 2 +- audio/soundfont/vgmcoll.cpp | 2 +- audio/soundfont/vgmcoll.h | 2 +- audio/soundfont/vgminstrset.cpp | 2 +- audio/soundfont/vgminstrset.h | 2 +- audio/soundfont/vgmitem.cpp | 2 +- audio/soundfont/vgmitem.h | 2 +- audio/soundfont/vgmsamp.cpp | 2 +- audio/soundfont/vgmsamp.h | 2 +- 21 files changed, 22 insertions(+), 27 deletions(-) diff --git a/audio/soundfont/common.h b/audio/soundfont/common.h index a227067b9c6..4f84a39831c 100644 --- a/audio/soundfont/common.h +++ b/audio/soundfont/common.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_COMMON_H #define AUDIO_SOUNDFONT_COMMON_H diff --git a/audio/soundfont/rawfile.cpp b/audio/soundfont/rawfile.cpp index fed43e11ae1..724d394c759 100644 --- a/audio/soundfont/rawfile.cpp +++ b/audio/soundfont/rawfile.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "common/memstream.h" diff --git a/audio/soundfont/rawfile.h b/audio/soundfont/rawfile.h index a382f5007fd..7d7fd8a3861 100644 --- a/audio/soundfont/rawfile.h +++ b/audio/soundfont/rawfile.h @@ -22,14 +22,12 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_RAWFILE_H #define AUDIO_SOUNDFONT_RAWFILE_H -#include -#include #include "common/stream.h" #include "common/str.h" diff --git a/audio/soundfont/rifffile.cpp b/audio/soundfont/rifffile.cpp index 3c59cc243f7..8b7553a7f68 100644 --- a/audio/soundfont/rifffile.cpp +++ b/audio/soundfont/rifffile.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "rifffile.h" diff --git a/audio/soundfont/rifffile.h b/audio/soundfont/rifffile.h index 97dddb32fed..54e2c2c1eb8 100644 --- a/audio/soundfont/rifffile.h +++ b/audio/soundfont/rifffile.h @@ -22,13 +22,11 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_RIFFFILE_H #define AUDIO_SOUNDFONT_RIFFFILE_H -#include -#include #include "common/scummsys.h" #include "common/list.h" #include "common/str.h" diff --git a/audio/soundfont/sf2file.cpp b/audio/soundfont/sf2file.cpp index 37720d2dbac..3752aff9d2b 100644 --- a/audio/soundfont/sf2file.cpp +++ b/audio/soundfont/sf2file.cpp @@ -22,10 +22,9 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ -#include #include "common/scummsys.h" #include "common/str.h" #include "sf2file.h" diff --git a/audio/soundfont/sf2file.h b/audio/soundfont/sf2file.h index d406e551fb6..879bb351944 100644 --- a/audio/soundfont/sf2file.h +++ b/audio/soundfont/sf2file.h @@ -22,12 +22,12 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_SF2FILE_H #define AUDIO_SOUNDFONT_SF2FILE_H -#include +#include "common/endian.h" #include "common/scummsys.h" #include "common/array.h" #include "common/str.h" diff --git a/audio/soundfont/synthfile.cpp b/audio/soundfont/synthfile.cpp index 92562806faf..be68c63a4f2 100644 --- a/audio/soundfont/synthfile.cpp +++ b/audio/soundfont/synthfile.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "synthfile.h" diff --git a/audio/soundfont/synthfile.h b/audio/soundfont/synthfile.h index 78edccd9fe5..51b3688069d 100644 --- a/audio/soundfont/synthfile.h +++ b/audio/soundfont/synthfile.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_SYNTHFILE_H #define AUDIO_SOUNDFONT_SYNTHFILE_H diff --git a/audio/soundfont/vab/psxspu.cpp b/audio/soundfont/vab/psxspu.cpp index dc239bb6179..faddb78db08 100644 --- a/audio/soundfont/vab/psxspu.cpp +++ b/audio/soundfont/vab/psxspu.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "common/debug.h" diff --git a/audio/soundfont/vab/psxspu.h b/audio/soundfont/vab/psxspu.h index afbd757d5c3..b46f278dd4c 100644 --- a/audio/soundfont/vab/psxspu.h +++ b/audio/soundfont/vab/psxspu.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_PSXSPU_H #define AUDIO_SOUNDFONT_PSXSPU_H diff --git a/audio/soundfont/vab/vab.cpp b/audio/soundfont/vab/vab.cpp index 7aec6672308..9f5e64045a0 100644 --- a/audio/soundfont/vab/vab.cpp +++ b/audio/soundfont/vab/vab.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "common/debug.h" diff --git a/audio/soundfont/vab/vab.h b/audio/soundfont/vab/vab.h index 562e2a49670..f0bfa7ed16f 100644 --- a/audio/soundfont/vab/vab.h +++ b/audio/soundfont/vab/vab.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_VAB_H #define AUDIO_SOUNDFONT_VAB_H diff --git a/audio/soundfont/vgmcoll.cpp b/audio/soundfont/vgmcoll.cpp index d60cf901d54..5b0ea942592 100644 --- a/audio/soundfont/vgmcoll.cpp +++ b/audio/soundfont/vgmcoll.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "common/debug.h" diff --git a/audio/soundfont/vgmcoll.h b/audio/soundfont/vgmcoll.h index 4fa0c3c117a..4374bf1f313 100644 --- a/audio/soundfont/vgmcoll.h +++ b/audio/soundfont/vgmcoll.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_VGMCOLL_H #define AUDIO_SOUNDFONT_VGMCOLL_H diff --git a/audio/soundfont/vgminstrset.cpp b/audio/soundfont/vgminstrset.cpp index 22edad6eb04..285da44ea9a 100644 --- a/audio/soundfont/vgminstrset.cpp +++ b/audio/soundfont/vgminstrset.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "common.h" diff --git a/audio/soundfont/vgminstrset.h b/audio/soundfont/vgminstrset.h index 36b769b5c67..0e47a215a20 100644 --- a/audio/soundfont/vgminstrset.h +++ b/audio/soundfont/vgminstrset.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_VGMINSTRSET_H #define AUDIO_SOUNDFONT_VGMINSTRSET_H diff --git a/audio/soundfont/vgmitem.cpp b/audio/soundfont/vgmitem.cpp index 713266eaa0d..8bad149a23b 100644 --- a/audio/soundfont/vgmitem.cpp +++ b/audio/soundfont/vgmitem.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "common.h" diff --git a/audio/soundfont/vgmitem.h b/audio/soundfont/vgmitem.h index b37c9267bc2..dd9c1780260 100644 --- a/audio/soundfont/vgmitem.h +++ b/audio/soundfont/vgmitem.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_VGMITEM_H #define AUDIO_SOUNDFONT_VGMITEM_H diff --git a/audio/soundfont/vgmsamp.cpp b/audio/soundfont/vgmsamp.cpp index 5d950989cf7..d84a111e8e6 100644 --- a/audio/soundfont/vgmsamp.cpp +++ b/audio/soundfont/vgmsamp.cpp @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #include "vgmsamp.h" diff --git a/audio/soundfont/vgmsamp.h b/audio/soundfont/vgmsamp.h index 599b52a97e1..3859d65bb49 100644 --- a/audio/soundfont/vgmsamp.h +++ b/audio/soundfont/vgmsamp.h @@ -22,7 +22,7 @@ /* * VGMTrans (c) 2002-2019 * Licensed under the zlib license, - * refer to the included LICENSE.txt file + * refer to the included VGMTrans_LICENSE.txt file */ #ifndef AUDIO_SOUNDFONT_VGMSAMP_H #define AUDIO_SOUNDFONT_VGMSAMP_H