From 523946a503e7fdb5f62aea1fba28400cb1872c95 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 28 Feb 2013 18:05:34 +0000 Subject: added precompiled header added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3807 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ListeningTo/listeningto_10.vcxproj | 55 ++++++++++++++++------ plugins/ListeningTo/listeningto_10.vcxproj.filters | 9 ++++ plugins/ListeningTo/listeningto_11.vcxproj | 55 ++++++++++++++++------ plugins/ListeningTo/listeningto_11.vcxproj.filters | 9 ++++ plugins/ListeningTo/res/Version.rc | 38 +++++++++++++++ plugins/ListeningTo/res/resource.rc | 15 ++---- plugins/ListeningTo/src/Version.h | 14 ++++++ plugins/ListeningTo/src/commons.h | 50 +++++++++----------- plugins/ListeningTo/src/listeningto.cpp | 35 ++++---------- plugins/ListeningTo/src/music.cpp | 3 -- plugins/ListeningTo/src/options.cpp | 1 - plugins/ListeningTo/src/players/foobar.cpp | 3 +- plugins/ListeningTo/src/players/generic.cpp | 7 +-- plugins/ListeningTo/src/players/itunes.cpp | 6 +-- plugins/ListeningTo/src/players/mradio.cpp | 4 +- plugins/ListeningTo/src/players/player.cpp | 6 +-- plugins/ListeningTo/src/players/watrack.cpp | 4 +- plugins/ListeningTo/src/players/winamp.cpp | 4 +- plugins/ListeningTo/src/players/wmp.cpp | 5 +- plugins/ListeningTo/src/stdafx.cpp | 18 +++++++ 20 files changed, 213 insertions(+), 128 deletions(-) create mode 100644 plugins/ListeningTo/res/Version.rc create mode 100644 plugins/ListeningTo/src/Version.h create mode 100644 plugins/ListeningTo/src/stdafx.cpp (limited to 'plugins/ListeningTo') diff --git a/plugins/ListeningTo/listeningto_10.vcxproj b/plugins/ListeningTo/listeningto_10.vcxproj index 4464b6b9f4..c4fdb64d55 100644 --- a/plugins/ListeningTo/listeningto_10.vcxproj +++ b/plugins/ListeningTo/listeningto_10.vcxproj @@ -78,7 +78,8 @@ Level3 EditAndContinue EnableFastChecks - false + Use + commons.h _DEBUG;%(PreprocessorDefinitions) @@ -101,7 +102,8 @@ MultiThreadedDebugDLL Level3 EnableFastChecks - false + Use + commons.h _DEBUG;%(PreprocessorDefinitions) @@ -126,7 +128,8 @@ true Level3 Size - false + Use + commons.h NDEBUG;%(PreprocessorDefinitions) @@ -154,7 +157,8 @@ true Level3 Size - false + Use + commons.h NDEBUG;%(PreprocessorDefinitions) @@ -175,8 +179,8 @@ - + @@ -188,23 +192,46 @@ + + - + + NotUsing + - - - - - - - - + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + Create + diff --git a/plugins/ListeningTo/listeningto_10.vcxproj.filters b/plugins/ListeningTo/listeningto_10.vcxproj.filters index 10a77c6931..4b43925365 100644 --- a/plugins/ListeningTo/listeningto_10.vcxproj.filters +++ b/plugins/ListeningTo/listeningto_10.vcxproj.filters @@ -63,11 +63,17 @@ Players + + Header Files + Resource Files + + Resource Files + @@ -106,5 +112,8 @@ Players + + Source Files + \ No newline at end of file diff --git a/plugins/ListeningTo/listeningto_11.vcxproj b/plugins/ListeningTo/listeningto_11.vcxproj index e0c234e75d..6d31187d42 100644 --- a/plugins/ListeningTo/listeningto_11.vcxproj +++ b/plugins/ListeningTo/listeningto_11.vcxproj @@ -82,7 +82,8 @@ Level3 EditAndContinue EnableFastChecks - false + Use + commons.h _DEBUG;%(PreprocessorDefinitions) @@ -105,7 +106,8 @@ MultiThreadedDebugDLL Level3 EnableFastChecks - false + Use + commons.h _DEBUG;%(PreprocessorDefinitions) @@ -130,7 +132,8 @@ true Level3 Size - false + Use + commons.h NDEBUG;%(PreprocessorDefinitions) @@ -158,7 +161,8 @@ true Level3 Size - false + Use + commons.h NDEBUG;%(PreprocessorDefinitions) @@ -179,8 +183,8 @@ - + @@ -192,23 +196,46 @@ + + - + + NotUsing + - - - - - - - - + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + ..\commons.h + + + Create + diff --git a/plugins/ListeningTo/listeningto_11.vcxproj.filters b/plugins/ListeningTo/listeningto_11.vcxproj.filters index 10a77c6931..4b43925365 100644 --- a/plugins/ListeningTo/listeningto_11.vcxproj.filters +++ b/plugins/ListeningTo/listeningto_11.vcxproj.filters @@ -63,11 +63,17 @@ Players + + Header Files + Resource Files + + Resource Files + @@ -106,5 +112,8 @@ Players + + Source Files + \ No newline at end of file diff --git a/plugins/ListeningTo/res/Version.rc b/plugins/ListeningTo/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/ListeningTo/res/Version.rc @@ -0,0 +1,38 @@ +// Microsoft Visual C++ generated resource script. +// +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#include "afxres.h" +#include "..\src\version.h" + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/plugins/ListeningTo/res/resource.rc b/plugins/ListeningTo/res/resource.rc index 7c3b904bec..a51672d49d 100644 --- a/plugins/ListeningTo/res/resource.rc +++ b/plugins/ListeningTo/res/resource.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "winresrc.h" +#include "winres.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -149,17 +149,8 @@ END // remains consistent on all systems. IDI_LISTENINGTO ICON "listening_to.ico" IDI_LISTENINGOFF ICON "listening_off.ico" -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// English (Canada) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN -#pragma code_page(1252) - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // @@ -173,7 +164,7 @@ END 2 TEXTINCLUDE BEGIN - "#include ""winresrc.h""\r\n" + "#include ""winres.h""\r\n" "\0" END @@ -185,7 +176,7 @@ END #endif // APSTUDIO_INVOKED -#endif // English (Canada) resources +#endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/ListeningTo/src/Version.h b/plugins/ListeningTo/src/Version.h new file mode 100644 index 0000000000..623eb4d3d7 --- /dev/null +++ b/plugins/ListeningTo/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 3 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 0 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "ListeningTo" +#define __FILENAME "ListeningTo.dll" +#define __DESCRIPTION "Handles listening information to/for contacts." +#define __AUTHOR "Ricardo Pescuma Domenecci" +#define __AUTHOREMAIL "" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2006-2009 Ricardo Pescuma Domenecci" diff --git a/plugins/ListeningTo/src/commons.h b/plugins/ListeningTo/src/commons.h index 4df8c6d1ac..3782d9d328 100644 --- a/plugins/ListeningTo/src/commons.h +++ b/plugins/ListeningTo/src/commons.h @@ -25,56 +25,50 @@ Boston, MA 02111-1307, USA. #define _CRT_NONSTDC_NO_DEPRECATE #include -#include -#include #include #include #include -#include - - - -// Miranda headers -#define MIRANDA_VER 0x0600 #include #include -#include -#include #include -#include -#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include #include -#include #include #include #include +#include +#include +#include +#include +#include +#include -#include "../utils/mir_memory.h" -#include "../utils/mir_options.h" -#include "../utils/mir_buffer.h" -#include "../utils/utf8_helpers.h" +#include "..\utils\mir_options.h" +#include "..\utils\mir_buffer.h" +#include "..\utils\utf8_helpers.h" -#include "m_listeningto.h" #include "music.h" #include "resource.h" #include "options.h" +#include "Version.h" + +// Prototypes /////////////////////////////////////////////////////////////////////////// + +// Service called by the main menu +#define MS_LISTENINGTO_MAINMENU "ListeningTo/MainMenu" + +// Service called by toptoolbar +#define MS_LISTENINGTO_TTB "ListeningTo/TopToolBar" +// Services called by hotkeys +#define MS_LISTENINGTO_HOTKEYS_ENABLE "ListeningTo/HotkeysEnable" +#define MS_LISTENINGTO_HOTKEYS_DISABLE "ListeningTo/HotkeysDisable" +#define MS_LISTENINGTO_HOTKEYS_TOGGLE "ListeningTo/HotkeysToggle" #define MODULE_NAME "ListeningTo" diff --git a/plugins/ListeningTo/src/listeningto.cpp b/plugins/ListeningTo/src/listeningto.cpp index cc978b5336..10f0db11b2 100644 --- a/plugins/ListeningTo/src/listeningto.cpp +++ b/plugins/ListeningTo/src/listeningto.cpp @@ -17,39 +17,24 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "commons.h" - -// Prototypes /////////////////////////////////////////////////////////////////////////// - -// Service called by the main menu -#define MS_LISTENINGTO_MAINMENU "ListeningTo/MainMenu" - -// Service called by toptoolbar -#define MS_LISTENINGTO_TTB "ListeningTo/TopToolBar" - -// Services called by hotkeys -#define MS_LISTENINGTO_HOTKEYS_ENABLE "ListeningTo/HotkeysEnable" -#define MS_LISTENINGTO_HOTKEYS_DISABLE "ListeningTo/HotkeysDisable" -#define MS_LISTENINGTO_HOTKEYS_TOGGLE "ListeningTo/HotkeysToggle" - int hLangpack; PLUGININFOEX pluginInfo={ sizeof(PLUGININFOEX), - "ListeningTo", - PLUGIN_MAKE_VERSION(0,3,0,0), - "Handles listening information to/for contacts.", - "Ricardo Pescuma Domenecci", - "", - "© 2006-2009 Ricardo Pescuma Domenecci", - "http://miranda-ng.org/", - UNICODE_AWARE, //doesn't replace anything built-in - { 0xf981f3f5, 0x35a, 0x444f, { 0x98, 0x92, 0xca, 0x72, 0x2c, 0x19, 0x5a, 0xda } } // {F981F3F5-035A-444f-9892-CA722C195ADA} + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // {F981F3F5-035A-444F-9892-CA722C195ADA} + {0xf981f3f5, 0x35a, 0x444f, {0x98, 0x92, 0xca, 0x72, 0x2c, 0x19, 0x5a, 0xda}} }; - HINSTANCE hInst; static HANDLE hEnableStateChangedEvent; diff --git a/plugins/ListeningTo/src/music.cpp b/plugins/ListeningTo/src/music.cpp index fad6e7131b..261a2a6584 100644 --- a/plugins/ListeningTo/src/music.cpp +++ b/plugins/ListeningTo/src/music.cpp @@ -17,14 +17,11 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "commons.h" - Player *players[NUM_PLAYERS]; static LISTENINGTOINFO current = {0}; - void InitMusic() { players[WATRACK] = new WATrack(); diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp index 149acefc20..d75cc9b9f0 100644 --- a/plugins/ListeningTo/src/options.cpp +++ b/plugins/ListeningTo/src/options.cpp @@ -17,7 +17,6 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - #include "commons.h" // Prototypes ///////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/ListeningTo/src/players/foobar.cpp b/plugins/ListeningTo/src/players/foobar.cpp index 4eca0084b7..3b06d55255 100644 --- a/plugins/ListeningTo/src/players/foobar.cpp +++ b/plugins/ListeningTo/src/players/foobar.cpp @@ -17,8 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "..\\commons.h" +#include "..\commons.h" static TCHAR *wcs[] = { _T("{DA7CD0DE-1602-45e6-89A1-C2CA151E008E}/1"), // Foobar 0.9.1 diff --git a/plugins/ListeningTo/src/players/generic.cpp b/plugins/ListeningTo/src/players/generic.cpp index ebbb1ff2a5..ff2abd3239 100644 --- a/plugins/ListeningTo/src/players/generic.cpp +++ b/plugins/ListeningTo/src/players/generic.cpp @@ -17,19 +17,14 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "..\\commons.h" - +#include "..\commons.h" static LRESULT CALLBACK ReceiverWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); - static UINT hTimer = NULL; GenericPlayer *singleton = NULL; - - int m_log(const TCHAR *function, const TCHAR *fmt, ...) { #if 0 diff --git a/plugins/ListeningTo/src/players/itunes.cpp b/plugins/ListeningTo/src/players/itunes.cpp index 4801b2c78f..c5b1a9d5fd 100644 --- a/plugins/ListeningTo/src/players/itunes.cpp +++ b/plugins/ListeningTo/src/players/itunes.cpp @@ -18,16 +18,12 @@ Boston, MA 02111-1307, USA. */ -#include "..\\commons.h" - - +#include "..\commons.h" extern "C" { #include "iTunesCOMInterface_i.c" } - - ITunes::ITunes() { name = _T("iTunes"); diff --git a/plugins/ListeningTo/src/players/mradio.cpp b/plugins/ListeningTo/src/players/mradio.cpp index 1ef00fb51a..d9f81fecb8 100644 --- a/plugins/ListeningTo/src/players/mradio.cpp +++ b/plugins/ListeningTo/src/players/mradio.cpp @@ -17,8 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "..\\commons.h" +#include "..\commons.h" MRadio::MRadio() { @@ -26,7 +25,6 @@ MRadio::MRadio() needPoll = TRUE; } - void MRadio::EnableDisable() { if (!ServiceExists(MS_RADIO_COMMAND)) diff --git a/plugins/ListeningTo/src/players/player.cpp b/plugins/ListeningTo/src/players/player.cpp index b444422571..61428dce87 100644 --- a/plugins/ListeningTo/src/players/player.cpp +++ b/plugins/ListeningTo/src/players/player.cpp @@ -17,14 +17,10 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "..\\commons.h" - +#include "..\commons.h" extern void HasNewListeningInfo(); - - Player::Player() : name(_T("Player")), enabled(FALSE), needPoll(FALSE) { ZeroMemory(&listening_info, sizeof(listening_info)); diff --git a/plugins/ListeningTo/src/players/watrack.cpp b/plugins/ListeningTo/src/players/watrack.cpp index 790613e856..f7bd7e757c 100644 --- a/plugins/ListeningTo/src/players/watrack.cpp +++ b/plugins/ListeningTo/src/players/watrack.cpp @@ -17,9 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "..\\commons.h" - +#include "..\commons.h" static WATrack *instance = NULL; diff --git a/plugins/ListeningTo/src/players/winamp.cpp b/plugins/ListeningTo/src/players/winamp.cpp index 8579538a43..903acbc675 100644 --- a/plugins/ListeningTo/src/players/winamp.cpp +++ b/plugins/ListeningTo/src/players/winamp.cpp @@ -17,9 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "..\\commons.h" - +#include "..\commons.h" static TCHAR *wcs[] = { _T("Winamp v1.x") diff --git a/plugins/ListeningTo/src/players/wmp.cpp b/plugins/ListeningTo/src/players/wmp.cpp index 5e154576ed..ad3bf87886 100644 --- a/plugins/ListeningTo/src/players/wmp.cpp +++ b/plugins/ListeningTo/src/players/wmp.cpp @@ -17,10 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include "..\\commons.h" - - +#include "..\commons.h" #define WMP_WINDOWCLASS _T("MsnMsgrUIManager") diff --git a/plugins/ListeningTo/src/stdafx.cpp b/plugins/ListeningTo/src/stdafx.cpp new file mode 100644 index 0000000000..550c908371 --- /dev/null +++ b/plugins/ListeningTo/src/stdafx.cpp @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-13 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 "commons.h" \ No newline at end of file -- cgit v1.2.3