diff options
| -rwxr-xr-x | watrack_mpd/globals.h | 2 | ||||
| -rwxr-xr-x | watrack_mpd/init.c | 5 | ||||
| -rw-r--r-- | watrack_mpd/m_music.h | 4 | ||||
| -rwxr-xr-x | watrack_mpd/main.c | 38 | ||||
| -rwxr-xr-x | watrack_mpd/utilities.c | 8 |
5 files changed, 33 insertions, 24 deletions
diff --git a/watrack_mpd/globals.h b/watrack_mpd/globals.h index 4744088..a54e840 100755 --- a/watrack_mpd/globals.h +++ b/watrack_mpd/globals.h @@ -1,6 +1,8 @@ #ifndef GLOBALS_H
#define GLOBALS_H
HANDLE ghNetlibUser;
+HANDLE ghConnection;
HANDLE ghPacketReciever;
HANDLE ghRecieverThread;
+BOOL bWatrackService;
#endif
diff --git a/watrack_mpd/init.c b/watrack_mpd/init.c index d61c5bd..d1fe8fe 100755 --- a/watrack_mpd/init.c +++ b/watrack_mpd/init.c @@ -76,7 +76,7 @@ int __declspec(dllexport) Load(PLUGINLINK *link) return 0;
}
-
+extern void RegisterPlayer();
static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
{
NETLIBUSER nlu = {0};
@@ -85,10 +85,9 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) nlu.szDescriptiveName = "Watrack MPD connection";
nlu.szSettingsModule = PLUGIN_NAME;
ghNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
-
-
if (ServiceExists("WATrack/Player"))
bWatrackService = TRUE;
+ RegisterPlayer();
return 0;
}
diff --git a/watrack_mpd/m_music.h b/watrack_mpd/m_music.h index 7ddb065..45be781 100644 --- a/watrack_mpd/m_music.h +++ b/watrack_mpd/m_music.h @@ -293,10 +293,10 @@ int tStatusProc(); typedef int (__cdecl *LPINITPROC)();
typedef int (__cdecl *LPDEINITPROC)();
-typedef int (__cdecl *LPSTATUSPROC)(HWND);
+typedef int (__cdecl *LPSTATUSPROC)(HWND wnd);
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 *LPGETSTATUSPROC) (HWND wnd); //is it correct ?
typedef int (__cdecl *LPINFOPROC)(LPSONGINFO Info, int flags);
typedef int (__cdecl *LPCOMMANDPROC)(HWND wnd, int command, int value);
diff --git a/watrack_mpd/main.c b/watrack_mpd/main.c index 108db8b..2904918 100755 --- a/watrack_mpd/main.c +++ b/watrack_mpd/main.c @@ -21,15 +21,18 @@ LPINITPROC Init()
{
+ return 0;
}
LPDEINITPROC DeInit()
{
+ return 0;
}
LPCHECKPROC CheckPlayer(HWND wnd, int flags)
{
}
LPGETSTATUSPROC GetStatus()
{
+ return 0;
}
LPNAMEPROC GetFileName(HWND wnd, int flags)
{
@@ -44,20 +47,25 @@ 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);
+ if(!bWatrackService)
+ return;
+ else //для красоты
+ {
+ 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);
+ }
}
DWORD __stdcall Reciever(LPVOID lp)
@@ -67,7 +75,7 @@ DWORD __stdcall Reciever(LPVOID lp) nloc.flags = 0;
nloc.szHost = (char*)mir_u2a(UniGetContactSettingUtf(NULL, szModuleName, "Host", _T("127.0.0.1")));
nloc.wPort = DBGetContactSettingWord(NULL, szModuleName, "Port", 6600);
- NetLib_CreateConnection(ghNetlibUser, &nloc);
+ ghConnection = NetLib_CreateConnection(ghNetlibUser, &nloc);
ghPacketReciever = CreatePacketReciever();
return 0;
diff --git a/watrack_mpd/utilities.c b/watrack_mpd/utilities.c index a01450c..53092fd 100755 --- a/watrack_mpd/utilities.c +++ b/watrack_mpd/utilities.c @@ -114,7 +114,7 @@ int Send(char* data) nlb.buf = data;
nlb.flags = MSG_DUMPASTEXT;
nlb.len = strlen(data)+1;
- return CallService(MS_NETLIB_SEND,(WPARAM)ghNetlibUser,(LPARAM)&nlb);
+ return CallService(MS_NETLIB_SEND,(WPARAM)ghConnection,(LPARAM)&nlb);
}
int Recv(char *buf)
@@ -123,11 +123,11 @@ int Recv(char *buf) nlb.buf = buf;
nlb.flags = MSG_DUMPASTEXT;
nlb.len = strlen(buf)+1;
- return CallService(MS_NETLIB_RECV,(WPARAM)ghNetlibUser,(LPARAM)&nlb);
+ return CallService(MS_NETLIB_RECV,(WPARAM)ghConnection,(LPARAM)&nlb);
}
HANDLE CreatePacketReciever()
{
- return (HANDLE)CallService(MS_NETLIB_RECV,(WPARAM)ghNetlibUser,(LPARAM)4096);
+ return (HANDLE)CallService(MS_NETLIB_RECV,(WPARAM)ghConnection,(LPARAM)8192);
}
NETLIBPACKETRECVER *RecivePackets(int bytesUsed)
@@ -150,7 +150,7 @@ HANDLE NetLib_CreateConnection(HANDLE hUser, NETLIBOPENCONNECTION* nloc) //from if (!hConnection && (GetLastError() == 87))
{ // this ensures, an old Miranda will be able to connect also
nloc->cbSize = NETLIBOPENCONNECTION_V1_SIZE;
- hConnection = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hUser, (LPARAM)nloc);
+ hConnection = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hConnection, (LPARAM)nloc);
}
return hConnection;
}
|