diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-07-31 00:13:00 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-07-31 00:13:00 +0300 |
| commit | 652d90bc7bcd0929e20bc32699042e012a103787 (patch) | |
| tree | 492574af03cedb1d52ded0423b5993a8f0b43dfd /src | |
| parent | 6d48a253fe63b5e18ee03dd8c1f090323182f219 (diff) | |
| parent | 712caa418c79c9977d2e6ba5f7cf10b285d6a94c (diff) | |
| download | libADLMIDI-652d90bc7bcd0929e20bc32699042e012a103787.tar.gz libADLMIDI-652d90bc7bcd0929e20bc32699042e012a103787.tar.bz2 libADLMIDI-652d90bc7bcd0929e20bc32699042e012a103787.zip | |
Merge branch 'master' into fullpan
Diffstat (limited to 'src')
| -rw-r--r-- | src/adlmidi.cpp | 5 | ||||
| -rw-r--r-- | src/adlmidi_private.hpp | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/adlmidi.cpp b/src/adlmidi.cpp index 09cf7ea..4f6044b 100644 --- a/src/adlmidi.cpp +++ b/src/adlmidi.cpp @@ -670,11 +670,6 @@ ADLMIDI_EXPORT const char *adl_errorInfo(struct ADL_MIDIPlayer *device) return play->getErrorString().c_str(); } -ADLMIDI_EXPORT const char *adl_getMusicTitle(struct ADL_MIDIPlayer *device) -{ - return adl_metaMusicTitle(device); -} - ADLMIDI_EXPORT void adl_reset(struct ADL_MIDIPlayer *device) { if(!device) diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index b9228dc..8c219b9 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -28,7 +28,7 @@ #ifndef ADLMIDI_EXPORT # if defined (_WIN32) && defined(ADLMIDI_BUILD_DLL) # define ADLMIDI_EXPORT __declspec(dllexport) -# elif defined (LIBADLMIDI_VISIBILITY) +# elif defined (LIBADLMIDI_VISIBILITY) && defined (__GNUC__) # define ADLMIDI_EXPORT __attribute__((visibility ("default"))) # else # define ADLMIDI_EXPORT |