From 176e52e14fd0358a7f26ca8d7b0205244dfde2e7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 23 May 2018 23:29:25 +0300 Subject: no need to initialize pcli variable in each plugin (only in Clist_*) --- plugins/BASS_interface/src/Main.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'plugins/BASS_interface') diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index d1a3f3411d..84123087bc 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -31,7 +31,6 @@ FARPROC WINAPI delayHook(unsigned dliNotify, PDelayLoadInfo dli) extern "C" PfnDliHook __pfnDliNotifyHook2 = delayHook; CMPlugin g_plugin; -CLIST_INTERFACE *pcli; ///////////////////////////////////////////////////////////////////////////////////////// @@ -445,7 +444,7 @@ void CreateFrame() RegisterClass(&wndclass); hwnd_plugin = CreateWindow(L"BassInterfaceFrame", TranslateT("BASS Interface"), - WS_CHILD | WS_CLIPCHILDREN, 0, 0, 10, 10, pcli->hwndContactList, nullptr, g_plugin.getInst(), nullptr); + WS_CHILD | WS_CLIPCHILDREN, 0, 0, 10, 10, g_CLI.hwndContactList, nullptr, g_plugin.getInst(), nullptr); CLISTFrame Frame = { sizeof(CLISTFrame) }; Frame.tname = TranslateT("BASS Interface"); @@ -507,7 +506,7 @@ void LoadBassLibrary(const wchar_t *ptszPath) EnPreview = db_get_b(NULL, MODULENAME, OPT_PREVIEW, 0); StatMask = db_get_w(NULL, MODULENAME, OPT_STATUS, 0x3ff); - BASS_Init(device, 44100, 0, pcli->hwndContactList, nullptr); + BASS_Init(device, 44100, 0, g_CLI.hwndContactList, nullptr); Volume = db_get_b(NULL, MODULENAME, OPT_VOLUME, 33); BASS_SetConfig(BASS_CONFIG_GVOL_STREAM, Volume * 100); @@ -594,8 +593,6 @@ static IconItem iconList[] = extern "C" int __declspec(dllexport) Load(void) { - pcli = Clist_GetInterface(); - HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded); HookEvent(ME_SYSTEM_SHUTDOWN, OnShutdown); HookEvent(ME_DB_CONTACT_SETTINGCHANGED, OnSettingChanged); -- cgit v1.2.3