summaryrefslogtreecommitdiff
path: root/plugins/BASS_interface/src/Bass.h
diff options
context:
space:
mode:
authordartraiden <dartraiden@protonmail.com>2019-12-19 01:38:41 +0300
committerdartraiden <dartraiden@protonmail.com>2019-12-28 23:54:14 +0300
commit4e490ac4ac46eea7df6ef8a575c46206916c2164 (patch)
treee01ee02c5e40222bdd4fa47d1725818555337109 /plugins/BASS_interface/src/Bass.h
parentc9aae956257498dc3d933244ff2fb972ca6217a9 (diff)
BASS interface: pick up Miranda-specific commits
Diffstat (limited to 'plugins/BASS_interface/src/Bass.h')
-rw-r--r--plugins/BASS_interface/src/Bass.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/BASS_interface/src/Bass.h b/plugins/BASS_interface/src/Bass.h
index 58ff612861..78f81fe600 100644
--- a/plugins/BASS_interface/src/Bass.h
+++ b/plugins/BASS_interface/src/Bass.h
@@ -57,7 +57,7 @@ typedef DWORD HRECORD; // recording handle
typedef DWORD HSYNC; // synchronizer handle
typedef DWORD HDSP; // DSP handle
typedef DWORD HFX; // DX8 effect handle
-typedef DWORD HPLUGIN; // Plugin handle
+typedef DWORD HSUBPLUGIN; // Plugin handle
// Error codes returned by BASS_ErrorGetCode
#define BASS_OK 0 // all is OK
@@ -379,7 +379,7 @@ typedef struct {
DWORD flags; // BASS_SAMPLE/STREAM/MUSIC/SPEAKER flags
DWORD ctype; // type of channel
DWORD origres; // original resolution
- HPLUGIN plugin; // plugin
+ HSUBPLUGIN plugin; // plugin
HSAMPLE sample; // sample
const char *filename; // filename
} BASS_CHANNELINFO;
@@ -1030,9 +1030,9 @@ BOOL BASSDEF(BASS_IsStarted)();
BOOL BASSDEF(BASS_SetVolume)(float volume);
float BASSDEF(BASS_GetVolume)();
-HPLUGIN BASSDEF(BASS_PluginLoad)(const char *file, DWORD flags);
-BOOL BASSDEF(BASS_PluginFree)(HPLUGIN handle);
-const BASS_PLUGININFO *BASSDEF(BASS_PluginGetInfo)(HPLUGIN handle);
+HSUBPLUGIN BASSDEF(BASS_PluginLoad)(const char *file, DWORD flags);
+BOOL BASSDEF(BASS_PluginFree)(HSUBPLUGIN handle);
+const BASS_PLUGININFO *BASSDEF(BASS_PluginGetInfo)(HSUBPLUGIN handle);
BOOL BASSDEF(BASS_Set3DFactors)(float distf, float rollf, float doppf);
BOOL BASSDEF(BASS_Get3DFactors)(float *distf, float *rollf, float *doppf);
@@ -1125,7 +1125,7 @@ BOOL BASSDEF(BASS_FXSetPriority)(HFX handle, int priority);
}
#if defined(_WIN32) && !defined(NOBASSOVERLOADS)
-static inline HPLUGIN BASS_PluginLoad(const WCHAR *file, DWORD flags)
+static inline HSUBPLUGIN BASS_PluginLoad(const WCHAR *file, DWORD flags)
{
return BASS_PluginLoad((const char*)file, flags|BASS_UNICODE);
}