From da87b3fa0479333cfe9505713f6ffaa54b9ba543 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Wed, 31 Dec 2014 17:08:47 +0000 Subject: pascal code: reformat, small fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@11700 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/mRadio/i_tray.inc | 2 +- plugins/mRadio/mradio.dpr | 2 +- plugins/mRadio/rbass.pas | 24 +++++++++++------------- plugins/mRadio/rglobal.pas | 2 -- 4 files changed, 13 insertions(+), 17 deletions(-) (limited to 'plugins/mRadio') diff --git a/plugins/mRadio/i_tray.inc b/plugins/mRadio/i_tray.inc index 75ad569839..468cb47992 100644 --- a/plugins/mRadio/i_tray.inc +++ b/plugins/mRadio/i_tray.inc @@ -131,7 +131,7 @@ begin result:=Service_SetStatus(wParam,lParam); end; -procedure CreateTrayMenu(); +procedure CreateTrayMenu; var mi:TCListMenuItem; playstr:pWideChar; diff --git a/plugins/mRadio/mradio.dpr b/plugins/mRadio/mradio.dpr index de83095d63..e929303b0d 100644 --- a/plugins/mRadio/mradio.dpr +++ b/plugins/mRadio/mradio.dpr @@ -157,7 +157,7 @@ begin result:=0; end; -function Load(): int; cdecl; +function Load: int; cdecl; var desc:TPROTOCOLDESCRIPTOR; begin diff --git a/plugins/mRadio/rbass.pas b/plugins/mRadio/rbass.pas index dcf90f118d..41516866ce 100644 --- a/plugins/mRadio/rbass.pas +++ b/plugins/mRadio/rbass.pas @@ -133,9 +133,7 @@ begin end; end; - - -procedure MyStopBASS; +procedure MyStopBass; begin if BassStatus=rbs_null then exit; @@ -169,11 +167,11 @@ begin end; end; -procedure MyFreeBASS; +procedure MyFreeBass; begin if BassStatus=rbs_init then begin - MyStopBASS; + MyStopBass; BASS_Free; BassStatus:=rbs_load; @@ -188,7 +186,7 @@ begin mFreeMem(StationHeader); mFreeMem(ActiveURL); DBDeleteSetting(ActiveContact,strCList,optStatusMsg); - MyStopBASS; + MyStopBass; end; function GetDeviceNumber:integer; @@ -214,7 +212,7 @@ begin until false; end; -function MyInitBASS:bool; +function MyInitBass:bool; var num:integer; begin @@ -278,7 +276,7 @@ end; procedure MyUnloadBass; begin - MyFreeBASS; + MyFreeBass; if BassStatus=rbs_load then begin mFreeMem(proxy); @@ -290,7 +288,7 @@ begin end; end; -function MyLoadBASS:bool; +function MyLoadBass:bool; var pc,custom:PWideChar; basspath:PWideChar; @@ -1146,7 +1144,7 @@ function ConstructFilter:pointer; var pc:pWideChar; ph:PDWord; - Info:PBASS_PLUGININFO; + info:PBASS_PLUGININFO; i:integer; full:array [0..511] of WideChar; tmpbuf1,tmpbuf2:array [0..127] of WideChar; @@ -1169,10 +1167,10 @@ begin begin while ph^<>0 do begin - Info:=BASS_PluginGetInfo(ph^); - for i:=0 to Info^.formatc-1 do + info:=BASS_PluginGetInfo(ph^); + for i:=0 to info^.formatc-1 do //!! need to translate Ansi -> wide - with Info^.Formats[i] do + with info^.Formats[i] do begin pc:=MakeFilter(pc,FastAnsiToWideBuf(name,tmpbuf1),full,FastAnsiToWideBuf(exts,tmpbuf2)); end; diff --git a/plugins/mRadio/rglobal.pas b/plugins/mRadio/rglobal.pas index 04c36e8696..07f3978dda 100644 --- a/plugins/mRadio/rglobal.pas +++ b/plugins/mRadio/rglobal.pas @@ -9,8 +9,6 @@ uses m_api, playlist; -{$include m_radio.inc} - const cPluginName = 'mRadio'; const -- cgit v1.2.3