From 769b537b5e1a99fc53aa7296fd2b21dc77a4071c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 16 Aug 2015 20:33:13 +0000 Subject: name conflicts solved git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BASS_interface/src/Main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/BASS_interface/src') diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 8283ee78ce..4fcefa4b21 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -487,9 +487,9 @@ void DeleteFrame() CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)frame_id, 0); } -void LoadBassLibrary(TCHAR CurrBassPath[MAX_PATH]) +void LoadBassLibrary(const TCHAR *ptszPath) { - hBass = LoadLibrary(CurrBassPath); + hBass = LoadLibrary(ptszPath); if (hBass != NULL) { newBass = (BASS_SetConfig(BASS_CONFIG_DEV_DEFAULT, TRUE) != 0); // will use new "Default" device @@ -506,7 +506,7 @@ void LoadBassLibrary(TCHAR CurrBassPath[MAX_PATH]) sndLimSnd = db_get_b(NULL, ModuleName, OPT_MAXCHAN, MAXCHAN); if (sndLimSnd > MAXCHAN) sndLimSnd = MAXCHAN; - + TimeWrd1 = db_get_w(NULL, ModuleName, OPT_TIME1, 0); TimeWrd2 = db_get_w(NULL, ModuleName, OPT_TIME2, 0); QuietTime = db_get_b(NULL, ModuleName, OPT_QUIETTIME, 0); @@ -537,8 +537,8 @@ int OnFoldersChanged(WPARAM, LPARAM) UnhookEvent(hPlaySound); DeleteFrame(); } - LoadBassLibrary(CurrBassPath); + LoadBassLibrary(CurrBassPath); return 0; } -- cgit v1.2.3