Miranda API update

Watrack refactoring, API changes

git-svn-id: http://svn.miranda-ng.org/main/trunk@9068 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

11 files changed, 36 insertions, 36 deletions

diff --git a/plugins/Watrack/players/pl_apollo.pas b/plugins/Watrack/players/pl_apollo.pas
index 1658f48b1d..9d73749eda 100644
--- a/plugins/Watrack/players/pl_apollo.pas
+++ b/plugins/Watrack/players/pl_apollo.pas
@@ -66,7 +66,7 @@ var
   tmpwnd:HWND;

   ps:array [0..255] of AnsiChar;

 begin

-  if GetStatus(wnd)<>WAT_MES_STOPPED then

+  if GetStatus(wnd)<>WAT_PLS_STOPPED then

   begin

     tmpwnd:=SendMessage(wnd,WM_APOLLO_COMMAND,APOLLO_GETCURRENTLYPLAYEDFILENAME,0);

     ps[0]:=#0;

@@ -209,7 +209,7 @@ begin
   begin

     with SongInfo do

     begin

-      if (status<>WAT_MES_STOPPED) and

+      if (status<>WAT_PLS_STOPPED) and

          (mfile<>nil) and (StrPosW(mfile,'://')<>nil) and (album=nil) then

         album:=GetRemoteTitle(plwnd);

     end;

diff --git a/plugins/Watrack/players/pl_bs.pas b/plugins/Watrack/players/pl_bs.pas
index efcd6c26d4..b3f6ef2b28 100644
--- a/plugins/Watrack/players/pl_bs.pas
+++ b/plugins/Watrack/players/pl_bs.pas
@@ -194,7 +194,7 @@ begin
     if (flags and WAT_OPT_CHANGES)<>0 then

     begin

       volume:=GetVolume(plwnd);

-      if status<>WAT_MES_STOPPED then

+      if status<>WAT_PLS_STOPPED then

         time:=GetElapsedTime(plwnd);

     end

     else

diff --git a/plugins/Watrack/players/pl_cowon.pas b/plugins/Watrack/players/pl_cowon.pas
index fb2d985038..0ac7027426 100644
--- a/plugins/Watrack/players/pl_cowon.pas
+++ b/plugins/Watrack/players/pl_cowon.pas
@@ -195,11 +195,11 @@ function GetStatus(wnd:HWND):integer; cdecl;
 begin

   result:=SendMessage(wnd,WM_REMOCON_GETSTATUS,0,GET_STATUS_STATUS);

   case result of

-    MCI_MODE_STOP : result:=WAT_MES_STOPPED;

-    MCI_MODE_PAUSE: result:=WAT_MES_PAUSED;

-    MCI_MODE_PLAY : result:=WAT_MES_PLAYING;

+    MCI_MODE_STOP : result:=WAT_PLS_STOPPED;

+    MCI_MODE_PAUSE: result:=WAT_PLS_PAUSED;

+    MCI_MODE_PLAY : result:=WAT_PLS_PLAYING;

   else

-    result:=WAT_MES_UNKNOWN;

+    result:=WAT_PLS_UNKNOWN;

   end;

 end;

 

@@ -317,7 +317,7 @@ begin
     begin

       wndtext:=GetWndText;

       volume :=GetVolume(plwnd);

-      if status<>WAT_MES_STOPPED then

+      if status<>WAT_PLS_STOPPED then

 //        if time=0 then

           time:=GetElapsedTime(plwnd);

     end

diff --git a/plugins/Watrack/players/pl_foobar.pas b/plugins/Watrack/players/pl_foobar.pas
index 7802440ad6..d2a8343c0b 100644
--- a/plugins/Watrack/players/pl_foobar.pas
+++ b/plugins/Watrack/players/pl_foobar.pas
@@ -13,12 +13,12 @@ uses {$IFDEF KOL_MCK}err,{$ENDIF}
   {$IFDEF KOL_MCK}

   ,kolcomobj

   {$ELSE}

-  ,mComObj

+  ,ComObj

   {$ENDIF}

 ;

 

 const

-  COMName:PAnsiChar = 'Foobar2000.Application.0.7';

+  COMName:PWideChar = 'Foobar2000.Application.0.7';

 const

   dummywnd  = 'uninteresting';

 const

@@ -38,7 +38,7 @@ const
 var

   WinampWindow:HWND;

 

-function proc(awnd:hwnd;param:pdword):boolean; stdcall;

+function proc(awnd:HWND;param:pdword):boolean; stdcall;

 var

   s:array [0..255] of AnsiChar;

 begin

@@ -258,23 +258,23 @@ var
   winampwnd:HWND;

 begin

   try

-    result:=WAT_MES_STOPPED;

+    result:=WAT_PLS_STOPPED;

     v:=GetActiveOleObject(COMName);

     tmp:=v.Playback.IsPaused;

     if tmp then

-      result:=WAT_MES_PAUSED

+      result:=WAT_PLS_PAUSED

     else

     begin

       tmp:=v.Playback.IsPlaying;

       if tmp then

-        result:=WAT_MES_PLAYING;

+        result:=WAT_PLS_PLAYING;

     end;

   except

     winampwnd:=WinampFindWindow(wnd);

     if winampwnd<>0 then

       result:=WinampGetStatus(winampwnd)

     else

-      result:=WAT_MES_UNKNOWN;

+      result:=WAT_PLS_UNKNOWN;

   end;

   v:=null;

 end;

@@ -430,7 +430,7 @@ begin
       else if (flags and WAT_OPT_CHANGES)<>0 then

       begin

         volume:=GetVolume(v);

-        if status<>WAT_MES_STOPPED then

+        if status<>WAT_PLS_STOPPED then

           time:=GetElapsedTime(v);

       end

       else

diff --git a/plugins/Watrack/players/pl_itunes.pas b/plugins/Watrack/players/pl_itunes.pas
index d3f5bbc546..9fb13eefa3 100644
--- a/plugins/Watrack/players/pl_itunes.pas
+++ b/plugins/Watrack/players/pl_itunes.pas
@@ -12,7 +12,7 @@ uses windows,common,srv_player,wat_api
   {$IFDEF KOL_MCK}

   ,kolcomobj

   {$ELSE}

-  ,mComObj

+  ,ComObj

   {$ENDIF}

 ;

 

@@ -99,11 +99,11 @@ begin
     v:=CreateOleObject(COMName);

     tmp:=v.PlayerState;

     if tmp=1 then

-      result:=WAT_MES_PLAYING

+      result:=WAT_PLS_PLAYING

     else

-      result:=WAT_MES_STOPPED;

+      result:=WAT_PLS_STOPPED;

   except

-    result:=WAT_MES_UNKNOWN;

+    result:=WAT_PLS_UNKNOWN;

   end;

   v:=Null;

 end;

@@ -316,7 +316,7 @@ begin
       else if (flags and WAT_OPT_CHANGES)<>0 then

       begin

         volume:=GetVolume(v);

-        if status<>WAT_MES_STOPPED then

+        if status<>WAT_PLS_STOPPED then

           time:=GetElapsedTime(v);

       end

       else

diff --git a/plugins/Watrack/players/pl_lastfm.pas b/plugins/Watrack/players/pl_lastfm.pas
index 56ed3c7d4b..5735789b4a 100644
--- a/plugins/Watrack/players/pl_lastfm.pas
+++ b/plugins/Watrack/players/pl_lastfm.pas
@@ -76,9 +76,9 @@ var
 begin

   txt:=GetWndText(wnd);

   if StrCmpW(txt,LFMText,Length(LFMText))<>0 then

-    result:=WAT_MES_PLAYING

+    result:=WAT_PLS_PLAYING

   else

-    result:=WAT_MES_STOPPED;

+    result:=WAT_PLS_STOPPED;

   mFreeMem(txt);

 end;

 

diff --git a/plugins/Watrack/players/pl_mmonkey.pas b/plugins/Watrack/players/pl_mmonkey.pas
index bf96543478..fbfa54a05f 100644
--- a/plugins/Watrack/players/pl_mmonkey.pas
+++ b/plugins/Watrack/players/pl_mmonkey.pas
@@ -12,12 +12,12 @@ uses windows,messages,winampapi,common,srv_player,wat_api
   {$IFDEF KOL_MCK}

   ,kolcomobj

   {$ELSE}

-  ,mComObj

+  ,ComObj

   {$ENDIF}

 ;

 

 const

-  COMName:PAnsiChar = 'SongsDB.SDBApplication';

+  COMName:PWideChar = 'SongsDB.SDBApplication';

 

 const

   WM_WA_IPC      = WM_USER;

diff --git a/plugins/Watrack/players/pl_mradio.pas b/plugins/Watrack/players/pl_mradio.pas
index b694fb912c..779d0cf13d 100644
--- a/plugins/Watrack/players/pl_mradio.pas
+++ b/plugins/Watrack/players/pl_mradio.pas
@@ -217,19 +217,19 @@ function GetStatus:integer; cdecl;
 begin

   if CurrentStation<>0 then

   begin

-    result:=WAT_MES_PLAYING;

+    result:=WAT_PLS_PLAYING;

     case CallService(MS_RADIO_COMMAND,MRC_STATUS,RD_STATUS_GET) of

-      RD_STATUS_PAUSED : result:=WAT_MES_PAUSED;

+      RD_STATUS_PAUSED : result:=WAT_PLS_PAUSED;

       RD_STATUS_STOPPED: begin

-        result:=WAT_MES_STOPPED;

+        result:=WAT_PLS_STOPPED;

         mFreeMem(prevfile);

       end;

       RD_STATUS_NOSTATION,

-      RD_STATUS_ABORT  : result:=WAT_MES_UNKNOWN;

+      RD_STATUS_ABORT  : result:=WAT_PLS_UNKNOWN;

     end;

   end

   else

-    result:=WAT_MES_STOPPED;

+    result:=WAT_PLS_STOPPED;

 end;

 

 function GetInfo(var SongInfo:tSongInfo;flags:integer):integer;cdecl;

@@ -260,7 +260,7 @@ begin
         isRemote:=StrPosW(mfile,'://')<>nil;

         if (prevfile=nil) or isRemote or (StrCmpW(prevfile,mfile)<>0) then

         begin

-          ClearTrackInfo(SongInfo,false);

+          ClearTrackInfo(SongInfo);

           mFreeMem(prevfile);

           StrDupW(prevfile,mfile);

 

diff --git a/plugins/Watrack/players/pl_vlc.pas b/plugins/Watrack/players/pl_vlc.pas
index f9bf7f0342..1a8f3185f1 100644
--- a/plugins/Watrack/players/pl_vlc.pas
+++ b/plugins/Watrack/players/pl_vlc.pas
@@ -12,7 +12,7 @@ uses windows,common,srv_player,wat_api,syswin,wrapper
   {$IFDEF KOL_MCK}

   ,kolcomobj

   {$ELSE}

-  ,mComObj

+  ,ComObj

   {$ENDIF}

 ;

 

@@ -160,9 +160,9 @@ begin
     v:=CreateOleObject(COMName);

     tmp:=v.Playing;

     if tmp then

-      result:=WAT_MES_PLAYING

+      result:=WAT_PLS_PLAYING

     else

-      result:=WAT_MES_STOPPED;

+      result:=WAT_PLS_STOPPED;

   except

     result:=inherited GetStatus;

   end;

diff --git a/plugins/Watrack/players/pl_winamp.pas b/plugins/Watrack/players/pl_winamp.pas
index e107cb81f6..1b68759ab2 100644
--- a/plugins/Watrack/players/pl_winamp.pas
+++ b/plugins/Watrack/players/pl_winamp.pas
@@ -101,7 +101,7 @@ begin
   result:=nil;

   if (flags and WAT_OPT_IMPLANTANT)<>0 then

   begin

-    if SendMessage(wnd,WM_WA_IPC,0,IPC_ISPLAYING)<>WAT_MES_STOPPED then

+    if SendMessage(wnd,WM_WA_IPC,0,IPC_ISPLAYING)<>WAT_PLS_STOPPED then

     begin

       fpos :=SendMessage(wnd,WM_USER,0   ,IPC_GETLISTPOS);

       fname:=SendMessage(wnd,WM_USER,fpos,IPC_GETPLAYLISTFILE);

diff --git a/plugins/Watrack/players/pl_wmp.pas b/plugins/Watrack/players/pl_wmp.pas
index 41a8ad98fa..971cb28ac6 100644
--- a/plugins/Watrack/players/pl_wmp.pas
+++ b/plugins/Watrack/players/pl_wmp.pas
@@ -12,7 +12,7 @@ uses windows,common,messages,srv_player,wat_api
   {$IFDEF KOL_MCK}

   ,kolcomobj

   {$ELSE}

-  ,mComObj

+  ,ComObj

   {$ENDIF}

 ;