45 lines
2.6 KiB
Diff
45 lines
2.6 KiB
Diff
|
fix from upstream trunk
|
||
|
|
|
||
|
|
http://xbmc.org/trac/ticket/8185
|
||
|
|
|
||
|
|
Index: trunk/xbmc/cores/paplayer/DllWAVPack.h
|
||
|
|
===================================================================
|
||
|
|
--- trunk/xbmc/cores/paplayer/DllWAVPack.h (revision 22927)
|
||
|
|
+++ trunk/xbmc/cores/paplayer/DllWAVPack.h (revision 25321)
|
||
|
|
@@ -58,7 +58,7 @@
|
||
|
|
virtual int WavpackGetReducedChannels (WavpackContext *wpc)=0;
|
||
|
|
virtual int WavpackGetFloatNormExp (WavpackContext *wpc)=0;
|
||
|
|
- virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])=0;
|
||
|
|
+ virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
|
||
|
|
virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)=0;
|
||
|
|
- virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)=0;
|
||
|
|
+ virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)=0;
|
||
|
|
virtual void WavpackFreeWrapper (WavpackContext *wpc)=0;
|
||
|
|
virtual void WavpackSeekTrailingWrapper (WavpackContext *wpc)=0;
|
||
|
|
@@ -77,5 +77,5 @@
|
||
|
|
virtual int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, uint32_t total_samples)=0;
|
||
|
|
virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)=0;
|
||
|
|
- virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])=0;
|
||
|
|
+ virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
|
||
|
|
virtual int WavpackPackInit (WavpackContext *wpc)=0;
|
||
|
|
virtual int WavpackPackSamples (WavpackContext *wpc, int32_t *sample_buffer, uint32_t sample_count)=0;
|
||
|
|
@@ -133,9 +133,9 @@
|
||
|
|
virtual int WavpackGetFloatNormExp (WavpackContext *wpc)
|
||
|
|
{ return ::WavpackGetFloatNormExp (wpc); }
|
||
|
|
- virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])
|
||
|
|
+ virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])
|
||
|
|
{ return ::WavpackGetMD5Sum (wpc, data); }
|
||
|
|
virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)
|
||
|
|
{ return ::WavpackGetWrapperBytes (wpc); }
|
||
|
|
- virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)
|
||
|
|
+ virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)
|
||
|
|
{ return ::WavpackGetWrapperData (wpc); }
|
||
|
|
virtual void WavpackFreeWrapper (WavpackContext *wpc)
|
||
|
|
@@ -171,5 +171,5 @@
|
||
|
|
virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)
|
||
|
|
{ return ::WavpackAddWrapper (wpc, data, bcount); }
|
||
|
|
- virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])
|
||
|
|
+ virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])
|
||
|
|
{ return ::WavpackStoreMD5Sum (wpc, data); }
|
||
|
|
virtual int WavpackPackInit (WavpackContext *wpc)
|