From ec7b7cf1c956bf17b60d788d73530fcbd12bf51f Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Wed, 31 Dec 2014 22:11:10 +0000 Subject: temporary revert git-svn-id: http://svn.miranda-ng.org/main/trunk@11705 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Watrack/lastfm/i_last_api.inc | 26 +++++++++++++------------- plugins/Watrack/lastfm/i_last_dlg.inc | 12 ++++++------ 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/Watrack/lastfm') diff --git a/plugins/Watrack/lastfm/i_last_api.inc b/plugins/Watrack/lastfm/i_last_api.inc index 3f02458c52..b43ba0703c 100644 --- a/plugins/Watrack/lastfm/i_last_api.inc +++ b/plugins/Watrack/lastfm/i_last_api.inc @@ -8,7 +8,7 @@ const const defreq = 'http://post.audioscrobbler.com/?hs=true&p=1.2.1&c=&v=&u=&t=&a='; -function GetMD5Str(const digest:TMD5Hash; buf:pAnsiChar):PAnsiChar; +function GetMD5Str(digest:TMD5Hash; buf:pAnsiChar):PAnsiChar; begin buf[00]:=HexDigitChrLo[digest[00] shr 4]; buf[01]:=HexDigitChrLo[digest[00] and $0F]; buf[02]:=HexDigitChrLo[digest[01] shr 4]; buf[03]:=HexDigitChrLo[digest[01] and $0F]; @@ -86,7 +86,7 @@ begin end; end; -function Encode(dst,src:pAnsiChar):PAnsiChar; +function encode(dst,src:pAnsiChar):PAnsiChar; begin while src^<>#0 do begin @@ -121,12 +121,12 @@ begin pc:=StrCopyE(pc,'s='); pc:=StrCopyE(pc,session_id); //'?s=' pc:=StrCopyE(pc,'&a='); if si^.artist=nil then pc:=StrCopyE(pc,'Unknown') - else pc:=Encode(pc,si^.artist); + else pc:=encode(pc,si^.artist); pc:=StrCopyE(pc,'&t='); if si^.title =nil then pc:=StrCopyE(pc,'Unknown') - else pc:=Encode(pc,si^.title); + else pc:=encode(pc,si^.title); pc:=StrCopyE(pc,'&l='); if si^.total>0 then pc:=StrCopyE(pc,IntToStr(buf,si^.total)); - pc:=StrCopyE(pc,'&b='); pc:=Encode(pc,si^.album); + pc:=StrCopyE(pc,'&b='); pc:=encode(pc,si^.album); pc:=StrCopyE(pc,'&n='); if si^.track<>0 then {pc:=}StrCopyE(pc,IntToStr(buf,si^.track)); @@ -160,10 +160,10 @@ begin pc:=StrCopyE(pc,'s=' ); pc:=StrCopyE(pc,session_id); pc:=StrCopyE(pc,'&a[0]='); if si^.artist=nil then pc:=StrCopyE(pc,'Unknown') - else pc:=Encode(pc,si^.artist); + else pc:=encode(pc,si^.artist); pc:=StrCopyE(pc,'&t[0]='); if si^.title =nil then pc:=StrCopyE(pc,'Unknown') - else pc:=Encode(pc,si^.title); + else pc:=encode(pc,si^.title); pc:=StrCopyE(pc,'&i[0]='); pc:=StrCopyE(pc,timestamp); pc:=StrCopyE(pc,'&r[0]=&m[0]='); pc:=StrCopyE(pc,'&l[0]='); @@ -176,7 +176,7 @@ begin begin pc:=StrCopyE(pc,'&o[0]=R'); end; - pc:=StrCopyE(pc,'&b[0]='); pc:=Encode(pc,si^.album); + pc:=StrCopyE(pc,'&b[0]='); pc:=encode(pc,si^.album); pc:=StrCopyE(pc,'&n[0]='); if si^.track<>0 then {pc:=}StrCopyE(pc,IntToStr(buf,si^.track)); @@ -225,13 +225,13 @@ end; var xmlparser:TXML_API_W; -function FixInfo(Info:pWideChar):pWideChar; +function FixInfo(info:pWideChar):pWideChar; var pc,ppc:pWideChar; cnt:cardinal; need:boolean; begin - pc:=Info; + pc:=info; cnt:=0; need:=false; while pc^<>#0 do @@ -248,8 +248,8 @@ begin end; if need then begin - mGetMem(result,(StrLenW(Info)+1+cnt)*SizeOf(WideChar)); - pc:=Info; + mGetMem(result,(StrLenW(info)+1+cnt)*SizeOf(WideChar)); + pc:=info; ppc:=result; while pc^<>#0 do begin @@ -265,7 +265,7 @@ begin ppc^:=#0; end else - StrDupW(result,Info); + StrDupW(result,info); end; function GetArtistInfo(var data:tLastFMInfo;lang:integer):int; diff --git a/plugins/Watrack/lastfm/i_last_dlg.inc b/plugins/Watrack/lastfm/i_last_dlg.inc index 44beb5bdf7..ee1f96092f 100644 --- a/plugins/Watrack/lastfm/i_last_dlg.inc +++ b/plugins/Watrack/lastfm/i_last_dlg.inc @@ -18,13 +18,13 @@ const (code:'es' ; name: 'Spanish' ;) ); -procedure ClearInfo(Dlg:HWND); +procedure ClearInfo(dlg:HWND); begin - SetDlgItemTextW(Dlg,IDC_DATA_ARTIST,''); - SetDlgItemTextW(Dlg,IDC_DATA_ALBUM ,''); - SetDlgItemTextW(Dlg,IDC_DATA_TRACK ,''); - SetDlgItemTextW(Dlg,IDC_DATA_TAGS ,''); - SetDlgItemTextW(Dlg,IDC_DATA_INFO ,''); + SetDlgItemTextW(dlg,IDC_DATA_ARTIST,''); + SetDlgItemTextW(dlg,IDC_DATA_ALBUM ,''); + SetDlgItemTextW(dlg,IDC_DATA_TRACK ,''); + SetDlgItemTextW(dlg,IDC_DATA_TAGS ,''); + SetDlgItemTextW(dlg,IDC_DATA_INFO ,''); end; procedure ClearData(var data:tLastFMInfo); -- cgit v1.2.3