From 351cdfdfc18c7eaff4d27fb5641c01c5d3fd9e66 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 25 Apr 2015 09:51:20 +0000 Subject: Bass_interface - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13129 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- plugins/BASS_interface/Bass_interface.vcxproj | 28 +++ .../BASS_interface/Bass_interface.vcxproj.filters | 4 + plugins/BASS_interface/Bass_interface_10.vcxproj | 209 -------------------- .../Bass_interface_10.vcxproj.filters | 47 ----- plugins/BASS_interface/Bass_interface_12.vcxproj | 212 --------------------- .../Bass_interface_12.vcxproj.filters | 47 ----- plugins/BASS_interface/src/Bass_interface.h | 36 ---- plugins/BASS_interface/src/Main.cpp | 2 +- plugins/BASS_interface/src/stdafx.cpp | 18 -- plugins/BASS_interface/src/stdafx.cxx | 18 ++ plugins/BASS_interface/src/stdafx.h | 36 ++++ 16 files changed, 92 insertions(+), 575 deletions(-) create mode 100644 plugins/BASS_interface/Bass_interface.vcxproj create mode 100644 plugins/BASS_interface/Bass_interface.vcxproj.filters delete mode 100644 plugins/BASS_interface/Bass_interface_10.vcxproj delete mode 100644 plugins/BASS_interface/Bass_interface_10.vcxproj.filters delete mode 100644 plugins/BASS_interface/Bass_interface_12.vcxproj delete mode 100644 plugins/BASS_interface/Bass_interface_12.vcxproj.filters delete mode 100644 plugins/BASS_interface/src/Bass_interface.h delete mode 100644 plugins/BASS_interface/src/stdafx.cpp create mode 100644 plugins/BASS_interface/src/stdafx.cxx create mode 100644 plugins/BASS_interface/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 77d6742160..0794f985ab 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -327,7 +327,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_10.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface_10.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_blind", "..\plugins\Clist_blind\Clist_blind_10.vcxproj", "{2E15C462-A150-4A37-ACD6-FBAECF1724F5}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index adc5061c39..f74f085829 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -329,7 +329,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_10.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface_10.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_blind", "..\plugins\Clist_blind\Clist_blind_10.vcxproj", "{2E15C462-A150-4A37-ACD6-FBAECF1724F5}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index e328bcdf71..ed5f8c5314 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -359,7 +359,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoRun", "..\plugins\AutoR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoShutdown", "..\plugins\AutoShutdown\shutdown.vcxproj", "{3F8EF54D-0593-4048-B0E5-C938F99B29F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface_10.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index a19e12fa8e..619fbec5ba 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -329,7 +329,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_12.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface_12.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_blind", "..\plugins\Clist_blind\Clist_blind_12.vcxproj", "{2E15C462-A150-4A37-ACD6-FBAECF1724F5}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index 3d5d7c1449..b321e48f9e 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -333,7 +333,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_12.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface_12.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_blind", "..\plugins\Clist_blind\Clist_blind_12.vcxproj", "{2E15C462-A150-4A37-ACD6-FBAECF1724F5}" EndProject diff --git a/plugins/BASS_interface/Bass_interface.vcxproj b/plugins/BASS_interface/Bass_interface.vcxproj new file mode 100644 index 0000000000..c5c5d7aeea --- /dev/null +++ b/plugins/BASS_interface/Bass_interface.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + BASS_interface + {3933E789-D185-41DC-8169-9FF4365B6015} + + + + + \ No newline at end of file diff --git a/plugins/BASS_interface/Bass_interface.vcxproj.filters b/plugins/BASS_interface/Bass_interface.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/BASS_interface/Bass_interface.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/BASS_interface/Bass_interface_10.vcxproj b/plugins/BASS_interface/Bass_interface_10.vcxproj deleted file mode 100644 index 1a041463ca..0000000000 --- a/plugins/BASS_interface/Bass_interface_10.vcxproj +++ /dev/null @@ -1,209 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3933E789-D185-41DC-8169-9FF4365B6015} - BASS_interface - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - 4996;%(DisableSpecificWarnings) - false - Bass_interface.h - Use - - - true - Windows - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin10\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level3 - 4996;%(DisableSpecificWarnings) - false - Use - Bass_interface.h - - - true - Windows - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin10\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - OnlyExplicitInline - false - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Level3 - 4996;%(DisableSpecificWarnings) - false - Use - Bass_interface.h - - - Windows - true - true - $(IntDir)$(TargetName).lib - true - false - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - OnlyExplicitInline - false - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Level3 - 4996;%(DisableSpecificWarnings) - false - Use - Bass_interface.h - - - Windows - true - true - $(IntDir)$(TargetName).lib - true - false - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - - - - Create - - - - - - \ No newline at end of file diff --git a/plugins/BASS_interface/Bass_interface_10.vcxproj.filters b/plugins/BASS_interface/Bass_interface_10.vcxproj.filters deleted file mode 100644 index eab8ca7503..0000000000 --- a/plugins/BASS_interface/Bass_interface_10.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/plugins/BASS_interface/Bass_interface_12.vcxproj b/plugins/BASS_interface/Bass_interface_12.vcxproj deleted file mode 100644 index cb5af91ac6..0000000000 --- a/plugins/BASS_interface/Bass_interface_12.vcxproj +++ /dev/null @@ -1,212 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {3933E789-D185-41DC-8169-9FF4365B6015} - BASS_interface - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level4 - EditAndContinue - 4996;%(DisableSpecificWarnings) - false - Bass_interface.h - Use - - - true - Windows - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin12\lib - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Level4 - 4996;%(DisableSpecificWarnings) - false - Use - Bass_interface.h - - - true - Windows - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin12\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - OnlyExplicitInline - false - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Level4 - 4996;%(DisableSpecificWarnings) - false - Use - Bass_interface.h - - - Windows - true - true - $(IntDir)$(TargetName).lib - true - false - $(ProfileDir)..\..\bin12\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - Full - OnlyExplicitInline - false - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - true - Fast - Level4 - 4996;%(DisableSpecificWarnings) - false - Use - Bass_interface.h - - - Windows - true - true - $(IntDir)$(TargetName).lib - true - false - $(ProfileDir)..\..\bin12\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - - - - - - - - - - - - - - Create - - - - - - \ No newline at end of file diff --git a/plugins/BASS_interface/Bass_interface_12.vcxproj.filters b/plugins/BASS_interface/Bass_interface_12.vcxproj.filters deleted file mode 100644 index eab8ca7503..0000000000 --- a/plugins/BASS_interface/Bass_interface_12.vcxproj.filters +++ /dev/null @@ -1,47 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/plugins/BASS_interface/src/Bass_interface.h b/plugins/BASS_interface/src/Bass_interface.h deleted file mode 100644 index 09821041cd..0000000000 --- a/plugins/BASS_interface/src/Bass_interface.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright (C) 2010, 2011 tico-tico -*/ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "resource.h" -#include "version.h" - -#define ModuleName LPGEN("Bass Interface") - -#define OPT_VOLUME "Volume" -#define OPT_BASSPATH "PathToDll" -#define OPT_MAXCHAN "MaxChannels" -#define OPT_OUTDEVICE "OutDevice" -#define OPT_QUIETTIME "QuietTime" -#define OPT_TIME1 "Time1" -#define OPT_TIME2 "Time2" -#define OPT_STATUS "StatMask" -#define OPT_PREVIEW "Preview" diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index f8bfc9bbdf..ecb89e663d 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -2,7 +2,7 @@ Copyright (C) 2010, 2011 tico-tico */ -#include "bass_interface.h" +#include "stdafx.h" #define BASSDEF(f) (WINAPI *f) #include "bass.h" diff --git a/plugins/BASS_interface/src/stdafx.cpp b/plugins/BASS_interface/src/stdafx.cpp deleted file mode 100644 index c152821f7d..0000000000 --- a/plugins/BASS_interface/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "Bass_interface.h" \ No newline at end of file diff --git a/plugins/BASS_interface/src/stdafx.cxx b/plugins/BASS_interface/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/BASS_interface/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/BASS_interface/src/stdafx.h b/plugins/BASS_interface/src/stdafx.h new file mode 100644 index 0000000000..09821041cd --- /dev/null +++ b/plugins/BASS_interface/src/stdafx.h @@ -0,0 +1,36 @@ +/* +Copyright (C) 2010, 2011 tico-tico +*/ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "resource.h" +#include "version.h" + +#define ModuleName LPGEN("Bass Interface") + +#define OPT_VOLUME "Volume" +#define OPT_BASSPATH "PathToDll" +#define OPT_MAXCHAN "MaxChannels" +#define OPT_OUTDEVICE "OutDevice" +#define OPT_QUIETTIME "QuietTime" +#define OPT_TIME1 "Time1" +#define OPT_TIME2 "Time2" +#define OPT_STATUS "StatMask" +#define OPT_PREVIEW "Preview" -- cgit v1.2.3