diff options
51 files changed, 142 insertions, 47 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 08de929..0396be2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,6 +132,7 @@ option(WITH_ADLMIDI2 "Build also classic ADLMIDI player [EXPERIMENTAL]" O option(WITH_VLC_PLUGIN "Build also a plugin for VLC Media Player" OFF) option(VLC_PLUGIN_NOINSTALL "Don't install VLC plugin into VLC directory" OFF) option(WITH_OLD_UTILS "Build also old utilities" OFF) +option(WITH_MUS2MID "Build a MUS to MIDI converter" OFF) option(WITH_XMI2MID "Build a XMI to MIDI converter" OFF) option(EXAMPLE_SDL2_AUDIO "Build also a simple SDL2 demo MIDI player" OFF) @@ -330,6 +331,10 @@ if(WITH_ADLMIDI2) add_subdirectory(utils/adlmidi-2) endif() +if(WITH_MUS2MID) + add_subdirectory(utils/mus2mid) +endif() + if(WITH_XMI2MID) add_subdirectory(utils/xmi2mid) endif() @@ -418,5 +423,6 @@ message("MIDIPLAY_WAVE_ONLY = ${MIDIPLAY_WAVE_ONLY}") message("WITH_ADLMIDI2 = ${WITH_ADLMIDI2}") message("WITH_VLC_PLUGIN = ${WITH_VLC_PLUGIN}") message("WITH_OLD_UTILS = ${WITH_OLD_UTILS}") +message("WITH_MUS2MID = ${WITH_MUS2MID}") message("WITH_XMI2MID = ${WITH_XMI2MID}") message("EXAMPLE_SDL2_AUDIO = ${EXAMPLE_SDL2_AUDIO}") @@ -3,7 +3,7 @@ libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> -ADLMIDI Library API: Copyright (c) 2015-2018 Vitaly Novichkov <admin@wohlnet.ru> +ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: diff --git a/cmake/openwattcom-dos/custom-h/mymap.h b/cmake/openwattcom-dos/custom-h/mymap.h index f233f54..e7f45c7 100644 --- a/cmake/openwattcom-dos/custom-h/mymap.h +++ b/cmake/openwattcom-dos/custom-h/mymap.h @@ -1,7 +1,7 @@ /* PtrList - A custom STD::Vector implementation. Workaround for OpenWatcom's crashing implementation -Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> +Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/cmake/openwattcom-dos/custom-h/myset.h b/cmake/openwattcom-dos/custom-h/myset.h index 716f6d2..f391867 100644 --- a/cmake/openwattcom-dos/custom-h/myset.h +++ b/cmake/openwattcom-dos/custom-h/myset.h @@ -1,7 +1,7 @@ /* PtrList - A custom STD::Vector implementation. Workaround for OpenWatcom's crashing implementation -Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> +Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/include/adlmidi.h b/include/adlmidi.h index b3652e1..4df321d 100644 --- a/include/adlmidi.h +++ b/include/adlmidi.h @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/include/adlmidi.hpp b/include/adlmidi.hpp index 0144fd2..dda9c78 100644 --- a/include/adlmidi.hpp +++ b/include/adlmidi.hpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adldata.hh b/src/adldata.hh index 6602e1a..7e6e6e6 100644 --- a/src/adldata.hh +++ b/src/adldata.hh @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp index 0426a0f..48c4366 100644 --- a/src/adlmidi.cpp +++ b/src/adlmidi.cpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_bankmap.h b/src/adlmidi_bankmap.h index c4402e9..eb67f6f 100644 --- a/src/adlmidi_bankmap.h +++ b/src/adlmidi_bankmap.h @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_bankmap.tcc b/src/adlmidi_bankmap.tcc index 90d8894..30856a1 100644 --- a/src/adlmidi_bankmap.tcc +++ b/src/adlmidi_bankmap.tcc @@ -2,7 +2,7 @@ * libADLMIDI is a free MIDI to WAV conversion library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2018 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_cvt.hpp b/src/adlmidi_cvt.hpp index 68088e5..cb16eb0 100644 --- a/src/adlmidi_cvt.hpp +++ b/src/adlmidi_cvt.hpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp index 53f2d0c..109b5e8 100644 --- a/src/adlmidi_load.cpp +++ b/src/adlmidi_load.cpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index b8a8cf7..5b81d83 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_midiplay.hpp b/src/adlmidi_midiplay.hpp index 1067252..9cf35b1 100644 --- a/src/adlmidi_midiplay.hpp +++ b/src/adlmidi_midiplay.hpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_opl3.cpp b/src/adlmidi_opl3.cpp index 0df9d4d..59773d3 100644 --- a/src/adlmidi_opl3.cpp +++ b/src/adlmidi_opl3.cpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_opl3.hpp b/src/adlmidi_opl3.hpp index a3e237a..b97b5d3 100644 --- a/src/adlmidi_opl3.hpp +++ b/src/adlmidi_opl3.hpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index 1b65214..1cd57aa 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 0bad970..06f8a9e 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_ptr.hpp b/src/adlmidi_ptr.hpp index 7def439..e9648b4 100644 --- a/src/adlmidi_ptr.hpp +++ b/src/adlmidi_ptr.hpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/adlmidi_sequencer.cpp b/src/adlmidi_sequencer.cpp index d78815f..e6de2b3 100644 --- a/src/adlmidi_sequencer.cpp +++ b/src/adlmidi_sequencer.cpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/chips/common/mutex.hpp b/src/chips/common/mutex.hpp index 53d7b72..60be9ba 100644 --- a/src/chips/common/mutex.hpp +++ b/src/chips/common/mutex.hpp @@ -2,7 +2,7 @@ * libADLMIDI is a free Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/src/chips/dosbox_opl3.cpp b/src/chips/dosbox_opl3.cpp index f192930..cd119d1 100644 --- a/src/chips/dosbox_opl3.cpp +++ b/src/chips/dosbox_opl3.cpp @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/dosbox_opl3.h b/src/chips/dosbox_opl3.h index 765fd40..622b8f0 100644 --- a/src/chips/dosbox_opl3.h +++ b/src/chips/dosbox_opl3.h @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/java_opl3.cpp b/src/chips/java_opl3.cpp index e29c6d0..ec8c6c7 100644 --- a/src/chips/java_opl3.cpp +++ b/src/chips/java_opl3.cpp @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/java_opl3.h b/src/chips/java_opl3.h index 51b5be2..edadd88 100644 --- a/src/chips/java_opl3.h +++ b/src/chips/java_opl3.h @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/nuked_opl3.cpp b/src/chips/nuked_opl3.cpp index 58b3890..ad379eb 100644 --- a/src/chips/nuked_opl3.cpp +++ b/src/chips/nuked_opl3.cpp @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/nuked_opl3.h b/src/chips/nuked_opl3.h index 838631d..d9c0e76 100644 --- a/src/chips/nuked_opl3.h +++ b/src/chips/nuked_opl3.h @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/nuked_opl3_v174.cpp b/src/chips/nuked_opl3_v174.cpp index d2f0fe9..a15e1ef 100644 --- a/src/chips/nuked_opl3_v174.cpp +++ b/src/chips/nuked_opl3_v174.cpp @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/nuked_opl3_v174.h b/src/chips/nuked_opl3_v174.h index 9dcfe8b..bba7afd 100644 --- a/src/chips/nuked_opl3_v174.h +++ b/src/chips/nuked_opl3_v174.h @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/opal_opl3.cpp b/src/chips/opal_opl3.cpp index 4a17c5c..3c1cbb7 100644 --- a/src/chips/opal_opl3.cpp +++ b/src/chips/opal_opl3.cpp @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/opal_opl3.h b/src/chips/opal_opl3.h index 98d4262..ca14f3a 100644 --- a/src/chips/opal_opl3.h +++ b/src/chips/opal_opl3.h @@ -1,7 +1,7 @@ /* * Interfaces over Yamaha OPL3 (YMF262) chip emulators * - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/chips/opl_chip_base.h b/src/chips/opl_chip_base.h index 2dbf726..006e222 100644 --- a/src/chips/opl_chip_base.h +++ b/src/chips/opl_chip_base.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2019 Vitaly Novichkov (Wohlstand) + * Copyright (c) 2017-2020 Vitaly Novichkov (Wohlstand) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/cvt_mus2mid.hpp b/src/cvt_mus2mid.hpp index 7aa355f..4b07b0d 100644 --- a/src/cvt_mus2mid.hpp +++ b/src/cvt_mus2mid.hpp @@ -3,7 +3,7 @@ * * Copyright (C) 2014 Bret Curtis * Copyright (C) WildMIDI Developers 2015-2016 - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/cvt_xmi2mid.hpp b/src/cvt_xmi2mid.hpp index 8f21ac8..d852ca9 100644 --- a/src/cvt_xmi2mid.hpp +++ b/src/cvt_xmi2mid.hpp @@ -4,7 +4,7 @@ * Copyright (C) 2001 Ryan Nunn * Copyright (C) 2014 Bret Curtis * Copyright (C) WildMIDI Developers 2015-2016 - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/file_reader.hpp b/src/file_reader.hpp index d8cab9a..291850c 100644 --- a/src/file_reader.hpp +++ b/src/file_reader.hpp @@ -1,7 +1,7 @@ /* * FileAndMemoryReader - a tiny helper to utify file reading from a disk and memory block * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/src/midi_sequencer.h b/src/midi_sequencer.h index 64f4c47..b9b8982 100644 --- a/src/midi_sequencer.h +++ b/src/midi_sequencer.h @@ -1,7 +1,7 @@ /* * BW_Midi_Sequencer - MIDI Sequencer for C++ * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/src/midi_sequencer.hpp b/src/midi_sequencer.hpp index 6febecc..7ff864c 100644 --- a/src/midi_sequencer.hpp +++ b/src/midi_sequencer.hpp @@ -1,7 +1,7 @@ /* * BW_Midi_Sequencer - MIDI Sequencer for C++ * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/src/midi_sequencer_impl.hpp b/src/midi_sequencer_impl.hpp index 6702f5a..f0ba839 100644 --- a/src/midi_sequencer_impl.hpp +++ b/src/midi_sequencer_impl.hpp @@ -1,7 +1,7 @@ /* * BW_Midi_Sequencer - MIDI Sequencer for C++ * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/src/wopl/wopl_file.c b/src/wopl/wopl_file.c index 9903e72..b712020 100644 --- a/src/wopl/wopl_file.c +++ b/src/wopl/wopl_file.c @@ -1,7 +1,7 @@ /* * Wohlstand's OPL3 Bank File - a bank format to store OPL3 timbre data and setup * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/src/wopl/wopl_file.h b/src/wopl/wopl_file.h index 5333b75..864d333 100644 --- a/src/wopl/wopl_file.h +++ b/src/wopl/wopl_file.h @@ -1,7 +1,7 @@ /* * Wohlstand's OPL3 Bank File - a bank format to store OPL3 timbre data and setup * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/utils/gen_adldata/ini/ini_processing.cpp b/utils/gen_adldata/ini/ini_processing.cpp index d43fb47..4336170 100644 --- a/utils/gen_adldata/ini/ini_processing.cpp +++ b/utils/gen_adldata/ini/ini_processing.cpp @@ -1,7 +1,7 @@ /* * INI Processor - a small library which allows you parsing INI-files * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/utils/gen_adldata/ini/ini_processing.h b/utils/gen_adldata/ini/ini_processing.h index c51f586..bd15e17 100644 --- a/utils/gen_adldata/ini/ini_processing.h +++ b/utils/gen_adldata/ini/ini_processing.h @@ -1,7 +1,7 @@ /* * INI Processor - a small library which allows you parsing INI-files * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/utils/gen_adldata/ini/ini_processing_variant.h b/utils/gen_adldata/ini/ini_processing_variant.h index b89be8b..289ec66 100644 --- a/utils/gen_adldata/ini/ini_processing_variant.h +++ b/utils/gen_adldata/ini/ini_processing_variant.h @@ -1,7 +1,7 @@ /* * INI Processor - a small library which allows you parsing INI-files * - * Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the "Software"), diff --git a/utils/midiplay/adlmidiplay.cpp b/utils/midiplay/adlmidiplay.cpp index bbf1dbf..0cb314e 100644 --- a/utils/midiplay/adlmidiplay.cpp +++ b/utils/midiplay/adlmidiplay.cpp @@ -3,7 +3,7 @@ * a Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/utils/midiplay/audio.h b/utils/midiplay/audio.h index 9e6c2b2..567465a 100644 --- a/utils/midiplay/audio.h +++ b/utils/midiplay/audio.h @@ -3,7 +3,7 @@ * a Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/utils/midiplay/audio_sdl.c b/utils/midiplay/audio_sdl.c index 02a9ee6..bd03d6e 100644 --- a/utils/midiplay/audio_sdl.c +++ b/utils/midiplay/audio_sdl.c @@ -3,7 +3,7 @@ * a Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/utils/midiplay/audio_winmm.c b/utils/midiplay/audio_winmm.c index e0aca93..afe712d 100644 --- a/utils/midiplay/audio_winmm.c +++ b/utils/midiplay/audio_winmm.c @@ -3,7 +3,7 @@ * a Software MIDI synthesizer library with OPL3 emulation * * Original ADLMIDI code: Copyright (c) 2010-2014 Joel Yliluoma <bisqwit@iki.fi> - * ADLMIDI Library API: Copyright (c) 2015-2019 Vitaly Novichkov <admin@wohlnet.ru> + * ADLMIDI Library API: Copyright (c) 2015-2020 Vitaly Novichkov <admin@wohlnet.ru> * * Library is based on the ADLMIDI, a MIDI player for Linux and Windows with OPL3 emulation: * http://iki.fi/bisqwit/source/adlmidi.html diff --git a/utils/mus2mid/CMakeLists.txt b/utils/mus2mid/CMakeLists.txt new file mode 100644 index 0000000..6430dd4 --- /dev/null +++ b/utils/mus2mid/CMakeLists.txt @@ -0,0 +1,7 @@ +add_executable(mus2mid mus2mid.cpp) +# TODO: Use own library +target_include_directories(mus2mid PRIVATE ${PROJECT_SOURCE_DIR}/src) + +install(TARGETS mus2mid + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + diff --git a/utils/mus2mid/mus2mid.cpp b/utils/mus2mid/mus2mid.cpp new file mode 100644 index 0000000..f737f8c --- /dev/null +++ b/utils/mus2mid/mus2mid.cpp @@ -0,0 +1,74 @@ + +#include "cvt_mus2mid.hpp" +#include <stdio.h> +#include <sys/stat.h> +#if !defined(_WIN32) +#include <unistd.h> +#else +#include <io.h> +#define fileno(fd) _fileno(fd) +#define isatty(fd) _isatty(fd) +#endif + +int main(int argc, char *argv[]) +{ + if(argc != 2) + { + fprintf(stderr, "Usage: mus2mid <midi-file>\n"); + return 1; + } + + const char *filename = argv[1]; + + FILE *fh = fopen(filename, "rb"); + if(!fh) + { + fprintf(stderr, "Error opening file.\n"); + return 1; + } + + struct stat st; + if(fstat(fileno(fh), &st) != 0) + { + fprintf(stderr, "Error reading file status.\n"); + return 1; + } + + size_t insize = (size_t)st.st_size; + if(insize > 8 * 1024 * 1024) + { + fprintf(stderr, "File too large.\n"); + return 1; + } + + uint8_t *filedata = new uint8_t[insize]; + if(fread(filedata, 1, insize, fh) != insize) + { + fprintf(stderr, "Error reading file data.\n"); + return 1; + } + + uint8_t *xmidata = NULL; + uint32_t xmisize = 0; + if(Convert_mus2midi(filedata, static_cast<uint32_t>(insize), &xmidata, &xmisize, 0) < 0) + { + fprintf(stderr, "Error converting MUS to SMF.\n"); + return 1; + } + + FILE *out = stdout; + if(isatty(fileno(out))) + { + fprintf(stderr, "Not writing SMF data on the text terminal.\n"); + } + else + { + if (fwrite(xmidata, 1, xmisize, out) != xmisize || fflush(out) != 0) + { + fprintf(stderr, "Error writing SMF data.\n"); + return 1; + } + } + + return 0; +} diff --git a/utils/update-copyright.sh b/utils/update-copyright.sh new file mode 100755 index 0000000..6ff0dee --- /dev/null +++ b/utils/update-copyright.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +find . -type f -exec grep -Il "Copyright" {} \; \ +| grep -v \.git \ +| while read file; \ +do \ + LC_ALL=C sed -b -i "s/\(.*Copyright.*\)[0-9]\{4\}\( *Vitaly Novichkov\)/\1`date +%Y`\2/" "$file"; \ +done diff --git a/utils/vlc_codec/libadlmidi.c b/utils/vlc_codec/libadlmidi.c index 77341b0..3d5e5fe 100644 --- a/utils/vlc_codec/libadlmidi.c +++ b/utils/vlc_codec/libadlmidi.c @@ -1,7 +1,7 @@ /***************************************************************************** * libadlmidi.c: Software MIDI synthesizer using OPL3 Synth emulation ***************************************************************************** - * Copyright © 2015-2018 Vitaly Novichkov + * Copyright © 2015-2020 Vitaly Novichkov * $Id$ * * This program is free software: you can redistribute it and/or modify |