modified: watrack_mpd/commonheaders.h

	modified:   watrack_mpd/init.c
	modified:   watrack_mpd/m_music.h
	modified:   watrack_mpd/main.c
	modified:   watrack_mpd/main.h
	modified:   watrack_mpd/utilities.c

6 files changed, 67 insertions, 23 deletions

diff --git a/watrack_mpd/commonheaders.h b/watrack_mpd/commonheaders.h
index f898428..81ccc20 100755
--- a/watrack_mpd/commonheaders.h
+++ b/watrack_mpd/commonheaders.h
@@ -22,11 +22,12 @@
 

 

 #include <newpluginapi.h>

-#include <m_clist.h>

-#include <m_skin.h>

-#include <m_database.h>

-#include <m_protosvc.h>

-#include <m_protocols.h>

+#include <m_netlib.h>

+//#include <m_clist.h>

+//#include <m_skin.h>

+//#include <m_database.h>

+//#include <m_protosvc.h>

+//#include <m_protocols.h>

 #include <m_system.h>

 #include <m_options.h>

 #include <m_langpack.h>

diff --git a/watrack_mpd/init.c b/watrack_mpd/init.c
index e59127d..f244efd 100755
--- a/watrack_mpd/init.c
+++ b/watrack_mpd/init.c
@@ -21,14 +21,15 @@
 

 HINSTANCE hInst;

 PLUGINLINK *pluginLink;

-static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam);

+BOOL bWatrackService = FALSE;

+static int OnModulesLoaded(WPARAM wParam,LPARAM lParam);

 extern char *date();

 

 

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

 	0,

-	PLUGIN_MAKE_VERSION(0,0,0,6),

+	PLUGIN_MAKE_VERSION(0,0,0,1),

 	"Music Player Daemon support for watrack",

 	"sss, others..",

 	"sss123next@list.ru",

@@ -36,7 +37,7 @@ PLUGININFOEX pluginInfo={
 	"http://sss.chaoslab.ru:81/tracker/mim_plugs/",

 	1,		//unicode

 	0,		//doesn't replace anything built-in

-   { 0x420ccb93, 0x589f, 0x40e5, { 0x80, 0xa1, 0x91, 0xdb, 0x18, 0xf1, 0xc5, 0xbd } }

+    { 0x692e87d0, 0x6c71, 0x4cdc, { 0x9e, 0x36, 0x2b, 0x2d, 0x69, 0xfb, 0xdc, 0x4c } }

 

 };

 

@@ -69,14 +70,17 @@ __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
 int __declspec(dllexport) Load(PLUGINLINK *link)

 {

 	pluginLink=link;

-	HookEvent(ME_SYSTEM_MODULESLOADED, OnSystemModulesLoaded);

-	mir_getMMI(&mmi);

-	mir_getUTFI(&utfi);

+	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);

+//	mir_getMMI(&mmi);

+//	mir_getUTFI(&utfi);

 	return 0;

 }

 

-static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam)

+

+static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)

 {

+	if (ServiceExists("WATrack/Player"))

+		bWatrackService = TRUE;

 	return 0;

 }

 

diff --git a/watrack_mpd/m_music.h b/watrack_mpd/m_music.h
index 1afd9fc..7ddb065 100644
--- a/watrack_mpd/m_music.h
+++ b/watrack_mpd/m_music.h
@@ -296,6 +296,7 @@ typedef int (__cdecl *LPDEINITPROC)();
 typedef int (__cdecl *LPSTATUSPROC)(HWND);

 typedef wchar_t (__cdecl *LPNAMEPROC)(HWND wnd, int flags);

 typedef HWND (__cdecl *LPCHECKPROC)(HWND wnd, int flags);

+typedef int (__cdecl *LPGETSTATUSPROC) (); //is it correct ?

 typedef int (__cdecl *LPINFOPROC)(LPSONGINFO Info, int flags);

 typedef int (__cdecl *LPCOMMANDPROC)(HWND wnd, int command, int value);

 

@@ -306,7 +307,7 @@ typedef struct tPlayerCell {
     LPINITPROC      Init;

     LPDEINITPROC    DeInit;

     LPCHECKPROC     Check;     // check player 

-//    LPGETSTATUSPROC GetStatus;

+    LPGETSTATUSPROC GetStatus;

     LPNAMEPROC      GetName;   // can be NULL. get media filename

     LPINFOPROC      GetInfo;   // can be NULL. get info from player

     LPCOMMANDPROC   Command;   // can be NULL. send command to player

diff --git a/watrack_mpd/main.c b/watrack_mpd/main.c
index b754f8d..2040ca3 100755
--- a/watrack_mpd/main.c
+++ b/watrack_mpd/main.c
@@ -19,4 +19,42 @@
 

 #include "commonheaders.h"

 

+LPINITPROC Init()

+{

+}

+LPDEINITPROC DeInit()

+{

+}

+LPCHECKPROC CheckPlayer(HWND wnd, int flags)

+{

+}

+LPGETSTATUSPROC GetStatus()

+{

+}

+LPNAMEPROC GetFileName(HWND wnd, int flags)

+{

+}

+LPINFOPROC GetPlayerInfo(LPSONGINFO Info, int flags)

+{

+}

+LPCOMMANDPROC SendCommand(HWND wnd, int command, int value)

+{

+}

 

+void RegisterPlayer()

+{

+	struct tPlayerCell player;

+	player.Desc = "MPD desc";

+//	player.Check = CheckPlayer(;

+	player.Init = Init();

+	player.DeInit = DeInit();

+	player.GetStatus = GetStatus();

+//	player.Command = SendCommand(;

+//	player.flags = ;

+//	player.GetName = GetFileName(;

+//	player.GetInfo = GetPlayerInfo(;

+//	player.Icon =

+	player.Notes = _T("123");

+	player.URL = "http:// ?";

+	CallService(MS_WAT_PLAYER, (WPARAM)0, (LPARAM)&player);

+}

diff --git a/watrack_mpd/main.h b/watrack_mpd/main.h
index 4dffe4c..00fe5e9 100755
--- a/watrack_mpd/main.h
+++ b/watrack_mpd/main.h
@@ -15,8 +15,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 

 

-TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef);

-struct MM_INTERFACE mmi;

-struct UTF8_INTERFACE  utfi;

-const TCHAR *stristr( const TCHAR *str, const TCHAR *substr);

+//TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef);

+//struct MM_INTERFACE mmi;

+//struct UTF8_INTERFACE  utfi;

+//const TCHAR *stristr( const TCHAR *str, const TCHAR *substr);

 

diff --git a/watrack_mpd/utilities.c b/watrack_mpd/utilities.c
index 2a8fe0b..0d5327a 100755
--- a/watrack_mpd/utilities.c
+++ b/watrack_mpd/utilities.c
@@ -17,7 +17,7 @@
 

 #include "commonheaders.h"

 

-HANDLE CreateThreadEx(pThreadFuncEx AFunc, void* arg, DWORD* pThreadID)

+/*HANDLE CreateThreadEx(pThreadFuncEx AFunc, void* arg, DWORD* pThreadID)

 {

   FORK_THREADEX_PARAMS params;

   DWORD dwThreadId;

@@ -32,9 +32,9 @@ HANDLE CreateThreadEx(pThreadFuncEx AFunc, void* arg, DWORD* pThreadID)
     *pThreadID = dwThreadId;

 

   return hThread;

-}

+}*/

 

-TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef)

+/*TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef)

 {

   DBVARIANT dbv = {DBVT_DELETED};

   TCHAR* szRes;

@@ -44,10 +44,10 @@ TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,c
 	  szRes = _tcsdup(dbv.ptszVal);

   DBFreeVariant(&dbv);

   return szRes;

-}

+}*/

 

 // case-insensitive _tcsstr

-#define NEWTSTR_ALLOCA(A) (A==NULL)?NULL:_tcscpy((TCHAR*)alloca(sizeof(TCHAR)*(_tcslen(A)+1)),A)

+/*#define NEWTSTR_ALLOCA(A) (A==NULL)?NULL:_tcscpy((TCHAR*)alloca(sizeof(TCHAR)*(_tcslen(A)+1)),A)

 const TCHAR *stristr( const TCHAR *str, const TCHAR *substr)

 {

 	TCHAR *p;

@@ -59,7 +59,7 @@ const TCHAR *stristr( const TCHAR *str, const TCHAR *substr)
 

 	p = _tcsstr(str_up, substr_up);

 	return p ? (str + (p - str_up)) : NULL;

-}

+}*/

 

 char *date()

 {