aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-06-20 06:49:57 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-06-20 06:49:57 +0000
commit30dc47d87a4e4ff591c9eef3f6a18308fa6ba532 (patch)
tree342183ff6ad252a674cc959af76955e7eccc17e6 /src/plugins/Input/wildmidi/decoder_wildmidi.cpp
parent29ba92f7e9ad3d3f397a592f8c2b1770b9fee380 (diff)
downloadqmmp-30dc47d87a4e4ff591c9eef3f6a18308fa6ba532.tar.gz
qmmp-30dc47d87a4e4ff591c9eef3f6a18308fa6ba532.tar.bz2
qmmp-30dc47d87a4e4ff591c9eef3f6a18308fa6ba532.zip
added wildmidi-0.4.0 support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6478 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/wildmidi/decoder_wildmidi.cpp')
-rw-r--r--src/plugins/Input/wildmidi/decoder_wildmidi.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
index 408755a35..ef45482c0 100644
--- a/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
+++ b/src/plugins/Input/wildmidi/decoder_wildmidi.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2012 by Ilya Kotov *
+ * Copyright (C) 2008-2016 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -18,6 +18,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <stdint.h>
#include "wildmidihelper.h"
#include "decoder_wildmidi.h"
@@ -48,7 +49,7 @@ bool DecoderWildMidi::initialize()
return false;
}
WildMidiHelper::instance()->readSettings();
- midi_ptr = WildMidi_Open (m_path.toLocal8Bit());
+ midi_ptr = WildMidi_Open (m_path.toLocal8Bit().constData());
if(!midi_ptr)
{
@@ -84,5 +85,10 @@ int DecoderWildMidi::bitrate()
qint64 DecoderWildMidi::read(unsigned char *data, qint64 size)
{
+#if defined(LIBWILDMIDI_VERSION) && (LIBWILDMIDI_VERSION >= 0x000400)
+ return WildMidi_GetOutput (midi_ptr, (int8_t *)data, size);
+#else
return WildMidi_GetOutput (midi_ptr, (char *)data, size);
+#endif
+
}