Merge branch 'master' into stable

README.md

@@ -119,8 +119,14 @@ You need to make in the any IDE a library project and put into it next files
 
 ### Internal code (src)
 * chips/*       - Various OPL3 chip emulators and commonized interface over them
+* wopl/*        - WOPL bank format library
 * adldata.hh    - bank structures definition
 * adlmidi_private.hpp - header of internal private APIs
+* adlmidi_bankmap.h - MIDI bank hash table
+* adlmidi_bankmap.tcc - MIDI bank hash table (Implementation)
+* adlmidi_cvt.hpp - Instrument conversion template
+* adlmidi_ptr.hpp - Custom implementations of smart pointers for C++98
+* file_reader.hpp - Generic file and memory reader
 
 * adldata.cpp	 - Automatically generated database of FM banks from "fm_banks" directory via "gen_adldata" tool. **Don't build it if you have defined `DISABLE_EMBEDDED_BANKS` macro!**
 * adlmidi.cpp   - code of library
@@ -160,10 +166,10 @@ To build that example you will need to have installed SDL2 library.
 
 # Todo
 * Check out for XG/GS standards to provide a support to use any channels as percussion and also check some of SysEx commands.
-* Add support of MIDI Format 2 files (FL Studio made MIDI-files are wired and opening of those files making lossy of tempo and some meta-information events)
+* Add support of MIDI Format 2 files
 
 # Changelog
-## 1.4.0   <dev>
+## 1.4.0   2018-10-01
  * Implemented a full support for Portamento! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
  * Added support for SysEx event handling! (Thanks to [Jean Pierre Cimalando](https://github.com/jpcima) for a work!)
  * Added support for GS way of custom drum channels (through SysEx events)

include/adlmidi.h

@@ -66,7 +66,7 @@ typedef short           ADL_SInt16;
 
 #ifdef __clang__
 #   if __has_extension(attribute_deprecated_with_message)
-#       define JSONCPP_DEPRECATED(message) __attribute__((deprecated(message)))
+#       define ADLMIDI_DEPRECATED(message) __attribute__((deprecated(message)))
 #   endif
 #elif defined __GNUC__ /* not clang (gcc comes later since clang emulates gcc) */
 #   if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
@@ -743,7 +743,7 @@ extern ADLMIDI_DECLSPEC int adl_setTrackOptions(struct ADL_MIDIPlayer *device, s
  * @param trigger Value of the event which triggered this callback.
  * @param track Identifier of the track which triggered this callback.
  */
-typedef ADLMIDI_DECLSPEC void (*ADL_TriggerHandler)(void *userData, unsigned trigger, size_t track);
+typedef void (*ADL_TriggerHandler)(void *userData, unsigned trigger, size_t track);
 
 /**
  * @brief Defines a handler for callback trigger events