aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavilla <davilla@svn>2010-02-21 01:11:20 +0000
committerdavilla <davilla@svn>2010-02-21 01:11:20 +0000
commit1a08822aac81a93d0f0fde9e62fff19bd328cd7b (patch)
tree8d6e397033ef026a6a14f0b6a118088b5db8fd5d
parent204f1a0eb06834ff8a24cfd7a194b44c89d18ff4 (diff)
fixed, not present under ubuntu 8.04 (hardy) and we don't use them anyway
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28015 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
-rw-r--r--xbmc/cores/paplayer/DllModplug.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/xbmc/cores/paplayer/DllModplug.h b/xbmc/cores/paplayer/DllModplug.h
index 0d5f633714..4cd2c7f642 100644
--- a/xbmc/cores/paplayer/DllModplug.h
+++ b/xbmc/cores/paplayer/DllModplug.h
@@ -45,6 +45,7 @@ public:
virtual void ModPlug_Seek(ModPlugFile* file, int millisecond)=0;
virtual void ModPlug_GetSettings(ModPlug_Settings* settings)=0;
virtual void ModPlug_SetSettings(const ModPlug_Settings* settings)=0;
+/* These don't exist in libmodplug under Ubuntu 8.04 (Hardy), libmodplug does not have versioning but we don't use them anyway
virtual unsigned int ModPlug_GetMasterVolume(ModPlugFile* file)=0;
virtual void ModPlug_SetMasterVolume(ModPlugFile* file,unsigned int cvol)=0;
virtual int ModPlug_GetCurrentSpeed(ModPlugFile* file)=0;
@@ -62,6 +63,7 @@ public:
virtual unsigned int ModPlug_NumChannels(ModPlugFile* file)=0;
virtual unsigned int ModPlug_SampleName(ModPlugFile* file, unsigned int qual, char* buff)=0;
virtual unsigned int ModPlug_InstrumentName(ModPlugFile* file, unsigned int qual, char* buff)=0;
+*/
};
class DllModplug : public DllDynamic, DllModplugInterface
@@ -75,6 +77,7 @@ class DllModplug : public DllDynamic, DllModplugInterface
DEFINE_METHOD2(void, ModPlug_Seek, (ModPlugFile* p1, int p2))
DEFINE_METHOD1(void, ModPlug_GetSettings, (ModPlug_Settings* p1))
DEFINE_METHOD1(void, ModPlug_SetSettings, (const ModPlug_Settings* p1))
+/*
DEFINE_METHOD1(unsigned int, ModPlug_GetMasterVolume, (ModPlugFile* p1))
DEFINE_METHOD2(void, ModPlug_SetMasterVolume, (ModPlugFile* p1, unsigned int p2))
DEFINE_METHOD1(int, ModPlug_GetCurrentSpeed, (ModPlugFile* p1))
@@ -92,6 +95,7 @@ class DllModplug : public DllDynamic, DllModplugInterface
DEFINE_METHOD1(unsigned int, ModPlug_NumChannels, (ModPlugFile* p1))
DEFINE_METHOD3(unsigned int, ModPlug_SampleName, (ModPlugFile* p1, unsigned int p2, char* p3))
DEFINE_METHOD3(unsigned int, ModPlug_InstrumentName, (ModPlugFile* p1, unsigned int p2, char* p3))
+*/
BEGIN_METHOD_RESOLVE()
RESOLVE_METHOD(ModPlug_Load)
RESOLVE_METHOD(ModPlug_Unload)
@@ -101,6 +105,7 @@ class DllModplug : public DllDynamic, DllModplugInterface
RESOLVE_METHOD(ModPlug_Seek)
RESOLVE_METHOD(ModPlug_GetSettings)
RESOLVE_METHOD(ModPlug_SetSettings)
+/*
RESOLVE_METHOD(ModPlug_GetMasterVolume)
RESOLVE_METHOD(ModPlug_SetMasterVolume)
RESOLVE_METHOD(ModPlug_GetCurrentSpeed)
@@ -118,6 +123,7 @@ class DllModplug : public DllDynamic, DllModplugInterface
RESOLVE_METHOD(ModPlug_NumChannels)
RESOLVE_METHOD(ModPlug_SampleName)
RESOLVE_METHOD(ModPlug_InstrumentName)
+*/
END_METHOD_RESOLVE()
};