custom base64 functions removed from all pascal plugins

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

2 files changed, 6 insertions, 5 deletions

diff --git a/plugins/Watrack/formats/fmt_ogg.pas b/plugins/Watrack/formats/fmt_ogg.pas
index 4b05b80c2c..2e36f6d8df 100644
--- a/plugins/Watrack/formats/fmt_ogg.pas
+++ b/plugins/Watrack/formats/fmt_ogg.pas
@@ -3,14 +3,14 @@ unit fmt_OGG;
 {$include compilers.inc}

 

 interface

-uses wat_api;

+uses wat_api, m_api;

 

 function ReadOGG(var Info:tSongInfo):boolean; cdecl;

 function ReadSPX(var Info:tSongInfo):boolean; cdecl;

 function ReadfLaC(var Info:tSongInfo):boolean; cdecl;

 

 implementation

-uses windows,common,io,tags,srv_format,base64,utils;

+uses windows,common,io,tags,srv_format,utils;

 

 const

   OGGSign = $5367674F; //OggS

@@ -111,7 +111,8 @@ type
 

 procedure OGGGetComment(ptr:PAnsiChar;size:integer;var Info:tSongInfo);

 var

-  clen,alen,len,values:dword;

+  alen,len,values:dword;

+  clen:int;

   ls:PAnsiChar;

   value:PAnsiChar;

   cover:pByte;

@@ -150,7 +151,7 @@ begin
 

       else if (Info.track=0) and (lstrcmpia(ls,'TRACKNUMBER')=0) then Info.track:=StrToInt(value)

 

-      else if (cover=nil) and (lstrcmpia(ls,'COVERART')=0) then clen:=Base64Decode(value,cover)

+      else if (cover=nil) and (lstrcmpia(ls,'COVERART')=0) then cover:=mir_base64_decode(value,clen)

       else if  lstrcmpia(ls,'COVERARTMIME')=0 then ext:=GetImageType(nil,value);

     end;

     dec(values);

diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas
index 5befc5e2d8..e0e3a94dcf 100644
--- a/plugins/Watrack/proto/proto.pas
+++ b/plugins/Watrack/proto/proto.pas
@@ -257,7 +257,7 @@ begin
         curpos:=nil;

         if DisablePlugin<>dsPermanent then

         begin

-          if CallService(MS_WAT_GETMUSICINFO,0,0)=uint_ptr(WAT_PLS_NOTFOUND) then

+          if CallService(MS_WAT_GETMUSICINFO,0,0)=WAT_PLS_NOTFOUND then

           begin

             s:=#0#0#0'No player found at this time';

             textpos:=s+3;