modified: commonheaders.h

	modified:   m_music.h
	modified:   main.h
	modified:   resource.h
	modified:   watrack_mpd.rc
	new file:   watrack_mpd.sln
	modified:   watrack_mpd.vcproj

7 files changed, 43 insertions, 38 deletions

diff --git a/watrack_mpd/commonheaders.h b/watrack_mpd/commonheaders.h
index 3f9606f..f898428 100755
--- a/watrack_mpd/commonheaders.h
+++ b/watrack_mpd/commonheaders.h
@@ -35,4 +35,4 @@
 

 #include "main.h"

 #include "constants.h"

-#include "m_dos.h"

+#include "m_music.h"

diff --git a/watrack_mpd/m_music.h b/watrack_mpd/m_music.h
index 2a60ded..1afd9fc 100644
--- a/watrack_mpd/m_music.h
+++ b/watrack_mpd/m_music.h
@@ -241,7 +241,7 @@ typedef struct tSongInfo {
 #define WAT_OPT_PLAYERINFO  0x00000004 // song info from player

 #define WAT_OPT_WINAMPAPI   0x00000008 // Winamp API support

 #define WAT_OPT_CHECKTIME   0x00000010 // check file time for changes

-#definr WAT_OPT_VIDEO       0x00000020 // only for format registering used

+#define WAT_OPT_VIDEO       0x00000020 // only for format registering used

 #define WAT_OPT_LAST        0x00000040 // (internal)

 #define WAT_OPT_FIRST       0x00000080 // (internal)

 #define WAT_OPT_TEMPLATE    0x00000100 // (internal)

@@ -287,17 +287,17 @@ typedef struct tMusicFormat {
 

 #define MS_WAT_WINAMPCOMMAND  "WATrack/WinampCommand"

 

-  tInitProc    = function():integer;cdecl;

-  tDeInitProc  = function():integer;cdecl;

-  tStatusProc  = function(wnd:HWND):integer;cdecl;

+int tInitProc();

+int tDeInitProc();

+int tStatusProc();

 

 typedef int (__cdecl *LPINITPROC)();

 typedef int (__cdecl *LPDEINITPROC)();

-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 *LPSTATUSPROC)(HWND);

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

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

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

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

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

 

 typedef struct tPlayerCell {

     char *Desc;

@@ -306,7 +306,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.h b/watrack_mpd/main.h
index fab2245..4dffe4c 100755
--- a/watrack_mpd/main.h
+++ b/watrack_mpd/main.h
@@ -15,21 +15,8 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 

 

-DWORD __stdcall DosFunction(LPVOID lp);

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

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

-int DosOptInit(WPARAM, LPARAM);

-unsigned int MsgRate;

-unsigned int MsgSize;

-unsigned int MsgNumber;

-unsigned int CharCount;

-BOOL CustomMessage;

-BOOL ForOnline;

-BOOL ClientBased;

-TCHAR* MsgText;

 struct MM_INTERFACE mmi;

 struct UTF8_INTERFACE  utfi;

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

-void ModifyMenuOnStart(HANDLE hContact);

-void ModifyMenuOnStop(HANDLE hContact);

 

diff --git a/watrack_mpd/resource.h b/watrack_mpd/resource.h
index b245ff4..5f6d247 100755
--- a/watrack_mpd/resource.h
+++ b/watrack_mpd/resource.h
@@ -1,8 +1,9 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by dos.rc

+// Used by watrack_mpd.rc

 //

 #define IDD_OPT_DOS                     104

+#define IDD_OPT_WA_MPD                  104

 #define IDC_FOR_ONLINE                  1003

 #define IDC_MSG_NUMBER                  1004

 #define IDC_MSG_TEXT                    1005

diff --git a/watrack_mpd/watrack_mpd.rc b/watrack_mpd/watrack_mpd.rc
index df9c41f..8180929 100755
--- a/watrack_mpd/watrack_mpd.rc
+++ b/watrack_mpd/watrack_mpd.rc
@@ -63,24 +63,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 // Dialog

 //

-IDD_OPT_DOS DIALOGEX 0, 0, 268, 214

+

+IDD_OPT_WA_MPD DIALOGEX 0, 0, 268, 214

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 FONT 8, "MS Shell Dlg", 400, 0, 0x0

 BEGIN

-    CONTROL         "Send only to online contacts",IDC_FOR_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,106,106,10

-    EDITTEXT        IDC_MSG_NUMBER,155,13,40,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_MSG_TEXT,109,32,145,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_MSG_RATE,155,58,40,14,ES_AUTOHSCROLL

-    CONTROL         "Send custom message:",IDC_ENABLE_CUSTOM_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,34,98,8

-    LTEXT           "Message rate (ms):",IDC_STATIC,7,61,88,8

-    EDITTEXT        IDC_MSG_SIZE,155,75,40,14,ES_AUTOHSCROLL

-    LTEXT           "Message size (bytes):",IDC_STATIC,7,78,75,8

-    LTEXT           "Number of messgaes (0 for infinite):",IDC_STATIC,7,14,121,8

-    CONTROL         "Client based method",IDC_CLIENT_BASED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,117,81,10

-    LTEXT           "Random characters count:",IDC_STATIC,7,92,110,8

-    EDITTEXT        IDC_CHAR_COUNT,155,91,40,12,ES_AUTOHSCROLL

 END

 

+

 /////////////////////////////////////////////////////////////////////////////

 //

 // DESIGNINFO

@@ -89,7 +79,7 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO 

 BEGIN

-    IDD_OPT_DOS, DIALOG

+    IDD_OPT_WA_MPD, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 261

diff --git a/watrack_mpd/watrack_mpd.sln b/watrack_mpd/watrack_mpd.sln
new file mode 100755
index 0000000..253230d
--- /dev/null
+++ b/watrack_mpd/watrack_mpd.sln
@@ -0,0 +1,23 @@
+

+Microsoft Visual Studio Solution File, Format Version 10.00

+# Visual Studio 2008

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "watrack_mpd", "watrack_mpd.vcproj", "{F29D0C8D-141A-43CF-86B2-34A04653F8D4}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Release Unicode (static)|Win32 = Release Unicode (static)|Win32

+		Release Unicode|Win32 = Release Unicode|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Debug|Win32.Build.0 = Debug|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.ActiveCfg = Release Unicode (static)|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode (static)|Win32.Build.0 = Release Unicode (static)|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{F29D0C8D-141A-43CF-86B2-34A04653F8D4}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/watrack_mpd/watrack_mpd.vcproj b/watrack_mpd/watrack_mpd.vcproj
index 8ec6ac4..3972c1c 100755
--- a/watrack_mpd/watrack_mpd.vcproj
+++ b/watrack_mpd/watrack_mpd.vcproj
@@ -637,6 +637,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\m_music.h"

+				>

+			</File>

+			<File

 				RelativePath=".\main.h"

 				>

 			</File>