diff options
| author | dartraiden <wowemuh@gmail.com> | 2019-01-17 16:39:57 +0300 |
|---|---|---|
| committer | dartraiden <wowemuh@gmail.com> | 2019-01-17 16:39:57 +0300 |
| commit | 7623a366aeedaffb50057fc7ae01ad47925bb7fd (patch) | |
| tree | f60e0655e3dbfa5a202f6d2c2f87afc714532012 /plugins/BASS_interface/src | |
| parent | 4c2abf44d864a6140ad26f0453c783892b4d46ff (diff) | |
BASS interface: pick up Miranda-specific commits
Diffstat (limited to 'plugins/BASS_interface/src')
| -rw-r--r-- | plugins/BASS_interface/src/Bass.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/BASS_interface/src/Bass.h b/plugins/BASS_interface/src/Bass.h index 8ddf76603c..e264d33219 100644 --- a/plugins/BASS_interface/src/Bass.h +++ b/plugins/BASS_interface/src/Bass.h @@ -55,7 +55,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 @@ -365,7 +365,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; @@ -1019,9 +1019,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); @@ -1114,7 +1114,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); } |