Changeset 569


Ignore:
Timestamp:
Mar 26, 2024, 11:37:40 PM (7 months ago)
Author:
chronos
Message:
  • Modified: Removed U prefix from CoolAudio unit names.
Location:
CoolAudio
Files:
4 edited
1 copied
14 moved

Legend:

Unmodified
Added
Removed
  • CoolAudio/CoolAudio.lpk

    r353 r569  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<CONFIG>
    3   <Package Version="4">
     3  <Package Version="5">
    44    <Name Value="CoolAudio"/>
     5    <Type Value="RunAndDesignTime"/>
    56    <Author Value="Chronos"/>
    67    <CompilerOptions>
     
    89      <SearchPaths>
    910        <OtherUnitFiles Value="fmodintf;Systems;Systems/DSP;Systems/FMOD;Systems/MAD;Systems/WinAPI;Systems/mplayer"/>
    10         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
     11        <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)-$(BuildMode)"/>
    1112      </SearchPaths>
     13      <Parsing>
     14        <SyntaxOptions>
     15          <SyntaxMode Value="Delphi"/>
     16          <CStyleOperator Value="False"/>
     17          <AllowLabel Value="False"/>
     18          <CPPInline Value="False"/>
     19        </SyntaxOptions>
     20      </Parsing>
     21      <CodeGeneration>
     22        <Optimizations>
     23          <OptimizationLevel Value="0"/>
     24        </Optimizations>
     25      </CodeGeneration>
    1226      <Linking>
    1327        <Debugging>
     28          <GenerateDebugInfo Value="False"/>
    1429          <DebugInfoType Value="dsStabs"/>
    1530        </Debugging>
    1631      </Linking>
    17       <Other>
    18         <CompilerPath Value="$(CompPath)"/>
    19       </Other>
    2032    </CompilerOptions>
    2133    <Description Value="Features:
    22 - TMediaPlayer for playing sound files using different audio systems 
     34- TMediaPlayer for playing sound files using different audio systems
    2335- TPlayList for song list management"/>
    2436    <License Value="GNU/GPL"/>
    25     <Version Minor="2"/>
    26     <Files Count="10">
     37    <Version Minor="3"/>
     38    <Files Count="11">
    2739      <Item1>
    28         <Filename Value="UCoolAudio.pas"/>
     40        <Filename Value="CoolAudio.pas"/>
    2941        <HasRegisterProc Value="True"/>
    30         <UnitName Value="UCoolAudio"/>
     42        <UnitName Value="CoolAudio"/>
    3143      </Item1>
    3244      <Item2>
    33         <Filename Value="UPlaylist.pas"/>
    34         <UnitName Value="UPlaylist"/>
     45        <Filename Value="Playlist.pas"/>
     46        <UnitName Value="Playlist"/>
    3547      </Item2>
    3648      <Item3>
    37         <Filename Value="Systems/UAudioSystem.pas"/>
    38         <UnitName Value="UAudioSystem"/>
     49        <Filename Value="Systems/AudioSystem.pas"/>
     50        <UnitName Value="AudioSystem"/>
    3951      </Item3>
    4052      <Item4>
    41         <Filename Value="Systems/DSP/UAudioSystemDSP.pas"/>
    42         <UnitName Value="UAudioSystemDSP"/>
     53        <Filename Value="Systems/DSP/AudioSystemDSP.pas"/>
     54        <UnitName Value="AudioSystemDSP"/>
    4355      </Item4>
    4456      <Item5>
    45         <Filename Value="Systems/FMOD/UAudioSystemFMOD.pas"/>
    46         <UnitName Value="UAudioSystemFMOD"/>
     57        <Filename Value="Systems/FMOD/AudioSystemFMOD.pas"/>
     58        <UnitName Value="AudioSystemFMOD"/>
    4759      </Item5>
    4860      <Item6>
    49         <Filename Value="Systems/MAD/UAudioSystemMAD.pas"/>
    50         <UnitName Value="UAudioSystemMAD"/>
     61        <Filename Value="Systems/MAD/AudioSystemMAD.pas"/>
     62        <UnitName Value="AudioSystemMAD"/>
    5163      </Item6>
    5264      <Item7>
    53         <Filename Value="Systems/WinAPI/UAudioSystemWindows.pas"/>
    54         <UnitName Value="UAudioSystemWindows"/>
     65        <Filename Value="Systems/WinAPI/AudioSystemWindows.pas"/>
     66        <UnitName Value="AudioSystemWindows"/>
    5567      </Item7>
    5668      <Item8>
    57         <Filename Value="Systems/mplayer/UAudioSystemMPlayer.pas"/>
    58         <UnitName Value="UAudioSystemMPlayer"/>
     69        <Filename Value="Systems/mplayer/AudioSystemMPlayer.pas"/>
     70        <UnitName Value="AudioSystemMPlayer"/>
    5971      </Item8>
    6072      <Item9>
    61         <Filename Value="Systems/UWavFile.pas"/>
    62         <UnitName Value="UWavFile"/>
     73        <Filename Value="Systems/WavFile.pas"/>
     74        <UnitName Value="WavFile"/>
    6375      </Item9>
    6476      <Item10>
    65         <Filename Value="UCoolAudioConfig.inc"/>
    66         <UnitName Value="UCoolAudioConfig"/>
     77        <Filename Value="CoolAudioConfig.inc"/>
     78        <UnitName Value="CoolAudioConfig"/>
    6779      </Item10>
     80      <Item11>
     81        <Filename Value="CoolAudioPackage.pas"/>
     82        <Type Value="Main Unit"/>
     83        <AddToUsesPkgSection Value="False"/>
     84        <UnitName Value="CoolAudioPackage"/>
     85      </Item11>
    6886    </Files>
    69     <Type Value="RunAndDesignTime"/>
     87    <CompatibilityMode Value="True"/>
    7088    <RequiredPkgs Count="2">
    7189      <Item1>
     
    82100      <Version Value="2"/>
    83101    </PublishOptions>
     102    <CustomOptions Items="ExternHelp" Version="2">
     103      <_ExternHelp Items="Count"/>
     104    </CustomOptions>
    84105  </Package>
    85106</CONFIG>
  • CoolAudio/CoolAudio.pas

    r568 r569  
    1 unit UCoolAudio;
     1unit CoolAudio;
    22
    3 {$I UCoolAudioConfig.inc}
    4 
    5 {$mode Delphi}{$H+}
     3{$I CoolAudioConfig.inc}
    64
    75interface
     
    97uses
    108  Classes, SysUtils,
    11   {$IFDEF AudioSystemWindows}UAudioSystemWindows,{$ENDIF}
    12   {$IFDEF AudioSystemMPlayer}UAudioSystemMPlayer,{$ENDIF}
    13   {$IFDEF AudioSystemFMOD}UAudioSystemFMOD,{$ENDIF}
    14   {$IFDEF AudioSystemMAD}UAudioSystemMAD,{$ENDIF}
    15   {$IFDEF AudioSystemDSP}UAudioSystemDSP,{$ENDIF}
    16   UAudioSystem;
     9  {$IFDEF AudioSystemWindows}AudioSystemWindows,{$ENDIF}
     10  {$IFDEF AudioSystemMPlayer}AudioSystemMPlayer,{$ENDIF}
     11  {$IFDEF AudioSystemFMOD}AudioSystemFMOD,{$ENDIF}
     12  {$IFDEF AudioSystemMAD}AudioSystemMAD,{$ENDIF}
     13  {$IFDEF AudioSystemDSP}AudioSystemDSP,{$ENDIF}
     14  AudioSystem;
    1715
    1816var
     
    2523
    2624uses
    27   UPlayList;
     25  PlayList;
    2826
    2927procedure Register;
     
    4341finalization
    4442
    45 AudioSystemManager.Free;
     43FreeAndNil(AudioSystemManager);
    4644
    4745end.
  • CoolAudio/CoolAudioConfig.inc

    r568 r569  
    11{$IFDEF Linux}
    2   {$DEFINE AudioSystemDSP}
    3   {$DEFINE AudioSystemMAD}
     2//  {$DEFINE AudioSystemDSP}
     3//  {$DEFINE AudioSystemMAD}
    44{$ENDIF}
    55{$IFDEF i386}
  • CoolAudio/CoolAudioPackage.pas

    r568 r569  
    33 }
    44
    5 unit CoolAudio;
     5unit CoolAudioPackage;
    66
     7{$warn 5023 off : no warning about unused units}
    78interface
    89
    910uses
    10   UCoolAudio, UPlaylist, UAudioSystem, UAudioSystemDSP, UAudioSystemFMOD,
    11   UAudioSystemMAD, UAudioSystemWindows, UAudioSystemMPlayer, UWavFile,
     11  CoolAudio, Playlist, AudioSystem, AudioSystemDSP, AudioSystemFMOD,
     12  AudioSystemMAD, AudioSystemWindows, AudioSystemMPlayer, WavFile,
    1213  LazarusPackageIntf;
    1314
     
    1617procedure Register;
    1718begin
    18   RegisterUnit('UCoolAudio', @UCoolAudio.Register);
     19  RegisterUnit('CoolAudio', @CoolAudio.Register);
    1920end;
    2021
  • CoolAudio/Demo/Demo.lpi

    r387 r569  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="UTF-8"?>
    22<CONFIG>
    33  <ProjectOptions>
    4     <Version Value="9"/>
     4    <Version Value="12"/>
    55    <General>
    6       <MainUnit Value="0"/>
     6      <Flags>
     7        <CompatibilityMode Value="True"/>
     8      </Flags>
    79      <ResourceType Value="res"/>
    810      <UseXPManifest Value="True"/>
    911      <Icon Value="0"/>
    10       <ActiveWindowIndexAtStart Value="0"/>
    1112    </General>
    1213    <i18n>
    1314      <EnableI18N LFM="False"/>
    1415    </i18n>
    15     <VersionInfo>
    16       <StringTable ProductVersion=""/>
    17     </VersionInfo>
    1816    <BuildModes Count="1" Active="Default">
    1917      <Item1 Name="Default" Default="True"/>
     
    2119    <PublishOptions>
    2220      <Version Value="2"/>
    23       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
    24       <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
    2521    </PublishOptions>
    2622    <RunParams>
    27       <local>
    28         <FormatVersion Value="1"/>
    29         <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
    30       </local>
     23      <FormatVersion Value="2"/>
     24      <Modes Count="1">
     25        <Mode0 Name="default"/>
     26      </Modes>
    3127    </RunParams>
    3228    <RequiredPackages Count="2">
     
    3834      </Item2>
    3935    </RequiredPackages>
    40     <Units Count="45">
     36    <Units Count="17">
    4137      <Unit0>
    4238        <Filename Value="Demo.lpr"/>
    4339        <IsPartOfProject Value="True"/>
    44         <UnitName Value="Demo"/>
    45         <WindowIndex Value="0"/>
    46         <TopLine Value="1"/>
    47         <CursorPos X="34" Y="10"/>
     40        <EditorIndex Value="3"/>
     41        <CursorPos Y="3"/>
    4842        <UsageCount Value="85"/>
     43        <Loaded Value="True"/>
    4944      </Unit0>
    5045      <Unit1>
    51         <Filename Value="UFormMain.pas"/>
     46        <Filename Value="FormMain.pas"/>
    5247        <IsPartOfProject Value="True"/>
    5348        <ComponentName Value="FormMain"/>
    5449        <HasResources Value="True"/>
    5550        <ResourceBaseClass Value="Form"/>
    56         <UnitName Value="UFormMain"/>
    5751        <IsVisibleTab Value="True"/>
    58         <EditorIndex Value="0"/>
    59         <WindowIndex Value="0"/>
    60         <TopLine Value="128"/>
    61         <CursorPos X="16" Y="134"/>
     52        <TopLine Value="121"/>
     53        <CursorPos X="30" Y="138"/>
    6254        <UsageCount Value="85"/>
    6355        <Loaded Value="True"/>
     
    6557      </Unit1>
    6658      <Unit2>
    67         <Filename Value="../UCoolAudio.pas"/>
    68         <UnitName Value="UCoolAudio"/>
    69         <WindowIndex Value="0"/>
     59        <Filename Value="../CoolAudio.pas"/>
    7060        <TopLine Value="22"/>
    7161        <CursorPos X="34" Y="37"/>
    7262        <UsageCount Value="36"/>
     63        <DefaultSyntaxHighlighter Value="Delphi"/>
    7364      </Unit2>
    7465      <Unit3>
    75         <Filename Value="../Systems/UAudioSystemFMOD.pas"/>
    76         <UnitName Value="UAudioSystemFMOD"/>
    77         <WindowIndex Value="0"/>
     66        <Filename Value="../Systems/AudioSystemFMOD.pas"/>
    7867        <TopLine Value="47"/>
    79         <CursorPos X="1" Y="61"/>
     68        <CursorPos Y="61"/>
    8069        <UsageCount Value="39"/>
     70        <DefaultSyntaxHighlighter Value="Delphi"/>
    8171      </Unit3>
    8272      <Unit4>
    83         <Filename Value="../UPlaylist.pas"/>
    84         <UnitName Value="UPlaylist"/>
    85         <WindowIndex Value="0"/>
     73        <Filename Value="../Playlist.pas"/>
    8674        <TopLine Value="23"/>
    8775        <CursorPos X="31" Y="35"/>
    8876        <UsageCount Value="18"/>
     77        <DefaultSyntaxHighlighter Value="Delphi"/>
    8978      </Unit4>
    9079      <Unit5>
    9180        <Filename Value="../fmodintf/fmoddyn.pas"/>
    92         <UnitName Value="fmoddyn"/>
    93         <WindowIndex Value="0"/>
    9481        <TopLine Value="579"/>
    9582        <CursorPos X="19" Y="593"/>
    9683        <UsageCount Value="34"/>
     84        <DefaultSyntaxHighlighter Value="Delphi"/>
    9785      </Unit5>
    9886      <Unit6>
    9987        <Filename Value="../fmodintf/fmodtypes.pas"/>
    100         <UnitName Value="fmodtypes"/>
    101         <WindowIndex Value="0"/>
    10288        <TopLine Value="158"/>
    10389        <CursorPos X="43" Y="178"/>
    10490        <UsageCount Value="6"/>
     91        <DefaultSyntaxHighlighter Value="Delphi"/>
    10592      </Unit6>
    10693      <Unit7>
    107         <Filename Value="../Systems/UAudioSystemMPlayer.pas"/>
    108         <UnitName Value="UAudioSystemMPlayer"/>
    109         <WindowIndex Value="0"/>
     94        <Filename Value="../Systems/AudioSystemMPlayer.pas"/>
    11095        <TopLine Value="243"/>
    11196        <CursorPos X="114" Y="258"/>
    11297        <UsageCount Value="39"/>
     98        <DefaultSyntaxHighlighter Value="Delphi"/>
    11399      </Unit7>
    114100      <Unit8>
    115         <Filename Value="../CoolAudio.pas"/>
    116         <UnitName Value="CoolAudio"/>
    117         <WindowIndex Value="0"/>
    118         <TopLine Value="1"/>
    119         <CursorPos X="45" Y="19"/>
    120         <UsageCount Value="10"/>
    121       </Unit8>
    122       <Unit9>
    123         <Filename Value="../Systems/UAudioSystem.pas"/>
    124         <UnitName Value="UAudioSystem"/>
    125         <WindowIndex Value="0"/>
     101        <Filename Value="../Systems/AudioSystem.pas"/>
    126102        <TopLine Value="27"/>
    127103        <CursorPos X="15" Y="40"/>
    128104        <UsageCount Value="51"/>
     105        <DefaultSyntaxHighlighter Value="Delphi"/>
     106      </Unit8>
     107      <Unit9>
     108        <Filename Value=""/>
     109        <UsageCount Value="10"/>
     110        <DefaultSyntaxHighlighter Value="None"/>
    129111      </Unit9>
    130112      <Unit10>
    131         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/stdctrls.pp"/>
    132         <UnitName Value="StdCtrls"/>
    133         <WindowIndex Value="0"/>
    134         <TopLine Value="418"/>
    135         <CursorPos X="18" Y="430"/>
    136         <UsageCount Value="6"/>
    137       </Unit10>
    138       <Unit11>
    139         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/controls.pp"/>
    140         <UnitName Value="Controls"/>
    141         <WindowIndex Value="0"/>
    142         <TopLine Value="2427"/>
    143         <CursorPos X="24" Y="2429"/>
    144         <UsageCount Value="8"/>
    145       </Unit11>
    146       <Unit12>
    147         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/lclclasses.pp"/>
    148         <UnitName Value="LCLClasses"/>
    149         <WindowIndex Value="0"/>
    150         <TopLine Value="38"/>
    151         <CursorPos X="32" Y="50"/>
    152         <UsageCount Value="4"/>
    153       </Unit12>
    154       <Unit13>
    155         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/widgetset/wslclclasses.pp"/>
    156         <UnitName Value="WSLCLClasses"/>
    157         <WindowIndex Value="0"/>
    158         <TopLine Value="120"/>
    159         <CursorPos X="16" Y="131"/>
    160         <UsageCount Value="4"/>
    161       </Unit13>
    162       <Unit14>
    163         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/include/buttons.inc"/>
    164         <WindowIndex Value="0"/>
    165         <TopLine Value="26"/>
    166         <CursorPos X="18" Y="28"/>
    167         <UsageCount Value="4"/>
    168       </Unit14>
    169       <Unit15>
    170         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/include/buttoncontrol.inc"/>
    171         <WindowIndex Value="0"/>
    172         <TopLine Value="65"/>
    173         <CursorPos X="17" Y="67"/>
    174         <UsageCount Value="4"/>
    175       </Unit15>
    176       <Unit16>
    177         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/include/control.inc"/>
    178         <WindowIndex Value="0"/>
    179         <TopLine Value="2275"/>
    180         <CursorPos X="1" Y="2287"/>
    181         <UsageCount Value="34"/>
    182       </Unit16>
    183       <Unit17>
    184         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/lcl/include/wincontrol.inc"/>
    185         <WindowIndex Value="0"/>
    186         <TopLine Value="6307"/>
    187         <CursorPos X="17" Y="6320"/>
    188         <UsageCount Value="4"/>
    189       </Unit17>
    190       <Unit18>
    191         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/fpc/2.5.1/source/packages/fcl-process/src/process.pp"/>
    192         <UnitName Value="process"/>
    193         <WindowIndex Value="0"/>
    194         <TopLine Value="13"/>
    195         <CursorPos X="21" Y="26"/>
    196         <UsageCount Value="8"/>
    197       </Unit18>
    198       <Unit19>
    199         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/fpc/2.5.1/source/packages/libogcfpc/src/debug.pp"/>
    200         <UnitName Value="debug"/>
    201         <WindowIndex Value="0"/>
    202         <TopLine Value="1"/>
    203         <CursorPos X="1" Y="1"/>
    204         <UsageCount Value="8"/>
    205       </Unit19>
    206       <Unit20>
    207         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/fpc/2.5.1/source/packages/winunits-base/src/mmsystem.pp"/>
    208         <UnitName Value="mmsystem"/>
    209         <WindowIndex Value="0"/>
    210         <TopLine Value="1781"/>
    211         <CursorPos X="52" Y="1791"/>
    212         <UsageCount Value="36"/>
    213       </Unit20>
    214       <Unit21>
    215         <Filename Value="../Systems/UAudioSystemWindows.pas"/>
    216         <UnitName Value="UAudioSystemWindows"/>
    217         <WindowIndex Value="0"/>
    218         <TopLine Value="212"/>
    219         <CursorPos X="50" Y="224"/>
    220         <UsageCount Value="45"/>
    221       </Unit21>
    222       <Unit22>
    223         <Filename Value="/usr/share/fpcsrc/2.4.2/rtl/objpas/sysutils/sysstrh.inc"/>
    224         <WindowIndex Value="0"/>
    225         <TopLine Value="159"/>
    226         <CursorPos X="10" Y="176"/>
    227         <UsageCount Value="5"/>
    228       </Unit22>
    229       <Unit23>
    230         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/fpc/2.5.1/source/rtl/objpas/sysutils/osutilsh.inc"/>
    231         <WindowIndex Value="0"/>
    232         <TopLine Value="23"/>
    233         <CursorPos X="10" Y="23"/>
    234         <UsageCount Value="35"/>
    235       </Unit23>
    236       <Unit24>
    237         <Filename Value="../../../../Lazarus/0.9.31_2.5.1/fpc/2.5.1/source/rtl/win/wininc/base.inc"/>
    238         <WindowIndex Value="0"/>
    239         <TopLine Value="148"/>
    240         <CursorPos X="6" Y="159"/>
    241         <UsageCount Value="11"/>
    242       </Unit24>
    243       <Unit25>
    244         <Filename Value="UFormPlaylist.pas"/>
     113        <Filename Value="FormPlaylist.pas"/>
    245114        <IsPartOfProject Value="True"/>
    246115        <ComponentName Value="FormPlaylist"/>
    247116        <HasResources Value="True"/>
    248117        <ResourceBaseClass Value="Form"/>
    249         <UnitName Value="UFormPlaylist"/>
    250         <WindowIndex Value="0"/>
    251         <TopLine Value="155"/>
    252         <CursorPos X="28" Y="168"/>
     118        <EditorIndex Value="1"/>
     119        <TopLine Value="133"/>
     120        <CursorPos X="65" Y="156"/>
    253121        <UsageCount Value="25"/>
    254       </Unit25>
    255       <Unit26>
    256         <Filename Value="../Systems/WinAPI/UAudioSystemWindows.pas"/>
    257         <UnitName Value="UAudioSystemWindows"/>
    258         <EditorIndex Value="3"/>
    259         <WindowIndex Value="0"/>
    260         <TopLine Value="21"/>
    261         <CursorPos X="73" Y="43"/>
    262         <UsageCount Value="11"/>
    263         <Loaded Value="True"/>
    264       </Unit26>
    265       <Unit27>
    266         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/include/customform.inc"/>
    267         <WindowIndex Value="0"/>
    268         <TopLine Value="934"/>
    269         <CursorPos X="1" Y="947"/>
    270         <UsageCount Value="10"/>
    271       </Unit27>
    272       <Unit28>
    273         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/include/listitem.inc"/>
    274         <WindowIndex Value="0"/>
    275         <TopLine Value="725"/>
    276         <CursorPos X="1" Y="738"/>
    277         <UsageCount Value="10"/>
    278       </Unit28>
    279       <Unit29>
    280         <Filename Value="../UCoolAudioConfig.inc"/>
    281         <WindowIndex Value="0"/>
    282         <TopLine Value="1"/>
    283         <CursorPos X="1" Y="5"/>
    284         <UsageCount Value="10"/>
    285       </Unit29>
    286       <Unit30>
     122        <Loaded Value="True"/>
     123      </Unit10>
     124      <Unit11>
     125        <Filename Value="../CoolAudioConfig.inc"/>
     126        <CursorPos Y="5"/>
     127        <UsageCount Value="10"/>
     128        <DefaultSyntaxHighlighter Value="Delphi"/>
     129      </Unit11>
     130      <Unit12>
    287131        <Filename Value="../Systems/FMOD/fmoddyn.pas"/>
    288         <UnitName Value="fmoddyn"/>
    289         <WindowIndex Value="0"/>
    290132        <TopLine Value="576"/>
    291133        <CursorPos X="20" Y="594"/>
    292134        <UsageCount Value="10"/>
    293       </Unit30>
    294       <Unit31>
    295         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/stdctrls.pp"/>
    296         <UnitName Value="StdCtrls"/>
    297         <WindowIndex Value="0"/>
    298         <TopLine Value="1081"/>
    299         <CursorPos X="3" Y="1085"/>
    300         <UsageCount Value="10"/>
    301       </Unit31>
    302       <Unit32>
    303         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/include/buttons.inc"/>
    304         <WindowIndex Value="0"/>
    305         <TopLine Value="280"/>
    306         <CursorPos X="3" Y="285"/>
    307         <UsageCount Value="10"/>
    308       </Unit32>
    309       <Unit33>
    310         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/include/buttoncontrol.inc"/>
    311         <WindowIndex Value="0"/>
    312         <TopLine Value="59"/>
    313         <CursorPos X="3" Y="61"/>
    314         <UsageCount Value="10"/>
    315       </Unit33>
    316       <Unit34>
    317         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/widgetset/wsstdctrls.pp"/>
    318         <UnitName Value="WSStdCtrls"/>
    319         <WindowIndex Value="0"/>
    320         <TopLine Value="212"/>
    321         <CursorPos X="3" Y="225"/>
    322         <UsageCount Value="10"/>
    323       </Unit34>
    324       <Unit35>
    325         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/widgetset/wsfactory.pas"/>
    326         <UnitName Value="WSFactory"/>
    327         <WindowIndex Value="0"/>
    328         <TopLine Value="42"/>
    329         <CursorPos X="1" Y="55"/>
    330         <UsageCount Value="10"/>
    331       </Unit35>
    332       <Unit36>
    333         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/controls.pp"/>
    334         <UnitName Value="Controls"/>
    335         <WindowIndex Value="0"/>
    336         <TopLine Value="1309"/>
    337         <CursorPos X="15" Y="1310"/>
    338         <UsageCount Value="10"/>
    339       </Unit36>
    340       <Unit37>
    341         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/include/control.inc"/>
    342         <WindowIndex Value="0"/>
    343         <TopLine Value="3633"/>
    344         <CursorPos X="47" Y="3641"/>
    345         <UsageCount Value="10"/>
    346       </Unit37>
    347       <Unit38>
    348         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/lclclasses.pp"/>
    349         <UnitName Value="LCLClasses"/>
    350         <WindowIndex Value="0"/>
    351         <TopLine Value="37"/>
    352         <CursorPos X="13" Y="41"/>
    353         <UsageCount Value="10"/>
    354       </Unit38>
    355       <Unit39>
    356         <Filename Value="../../../../Lazarus/1.1_2.6.0/lcl/widgetset/wslclclasses.pp"/>
    357         <UnitName Value="WSLCLClasses"/>
    358         <WindowIndex Value="0"/>
    359         <TopLine Value="61"/>
    360         <CursorPos X="3" Y="74"/>
    361         <UsageCount Value="10"/>
    362       </Unit39>
    363       <Unit40>
    364         <Filename Value="../Systems/FMOD/UAudioSystemFMOD.pas"/>
    365         <UnitName Value="UAudioSystemFMOD"/>
    366         <WindowIndex Value="0"/>
     135        <DefaultSyntaxHighlighter Value="Delphi"/>
     136      </Unit12>
     137      <Unit13>
     138        <Filename Value="../Systems/FMOD/AudioSystemFMOD.pas"/>
    367139        <TopLine Value="66"/>
    368140        <CursorPos X="25" Y="68"/>
    369141        <UsageCount Value="10"/>
    370       </Unit40>
    371       <Unit41>
    372         <Filename Value="../Systems/mplayer/UAudioSystemMPlayer.pas"/>
    373         <UnitName Value="UAudioSystemMPlayer"/>
    374         <WindowIndex Value="0"/>
    375         <TopLine Value="130"/>
    376         <CursorPos X="1" Y="134"/>
    377         <UsageCount Value="10"/>
    378       </Unit41>
    379       <Unit42>
    380         <Filename Value="../../../../Lazarus/1.1_2.6.0/fpc/2.6.0/source/rtl/objpas/classes/classesh.inc"/>
    381         <WindowIndex Value="0"/>
    382         <TopLine Value="1919"/>
    383         <CursorPos X="11" Y="1932"/>
    384         <UsageCount Value="10"/>
    385       </Unit42>
    386       <Unit43>
    387         <Filename Value="../Systems/DSP/UAudioSystemDSP.pas"/>
    388         <UnitName Value="UAudioSystemDSP"/>
     142        <DefaultSyntaxHighlighter Value="Delphi"/>
     143      </Unit13>
     144      <Unit14>
     145        <Filename Value="../Systems/mplayer/AudioSystemMPlayer.pas"/>
    389146        <EditorIndex Value="2"/>
    390         <WindowIndex Value="0"/>
     147        <CursorPos X="15"/>
     148        <UsageCount Value="10"/>
     149        <Loaded Value="True"/>
     150        <DefaultSyntaxHighlighter Value="Delphi"/>
     151      </Unit14>
     152      <Unit15>
     153        <Filename Value="../Systems/DSP/AudioSystemDSP.pas"/>
     154        <EditorIndex Value="5"/>
    391155        <TopLine Value="160"/>
    392         <CursorPos X="1" Y="167"/>
    393         <UsageCount Value="10"/>
    394         <Loaded Value="True"/>
    395       </Unit43>
    396       <Unit44>
    397         <Filename Value="../Systems/MAD/UAudioSystemMAD.pas"/>
    398         <UnitName Value="UAudioSystemMAD"/>
    399         <EditorIndex Value="1"/>
    400         <WindowIndex Value="0"/>
     156        <CursorPos Y="167"/>
     157        <UsageCount Value="10"/>
     158        <Loaded Value="True"/>
     159        <DefaultSyntaxHighlighter Value="Delphi"/>
     160      </Unit15>
     161      <Unit16>
     162        <Filename Value="../Systems/MAD/AudioSystemMAD.pas"/>
     163        <EditorIndex Value="4"/>
    401164        <TopLine Value="2"/>
    402         <CursorPos X="40" Y="20"/>
    403         <UsageCount Value="10"/>
    404         <Loaded Value="True"/>
    405       </Unit44>
     165        <CursorPos X="9" Y="20"/>
     166        <UsageCount Value="10"/>
     167        <Loaded Value="True"/>
     168        <DefaultSyntaxHighlighter Value="Delphi"/>
     169      </Unit16>
    406170    </Units>
    407     <JumpHistory Count="17" HistoryIndex="16">
     171    <JumpHistory Count="18" HistoryIndex="17">
    408172      <Position1>
    409         <Filename Value="UFormMain.pas"/>
    410         <Caret Line="121" Column="10" TopLine="111"/>
     173        <Filename Value="FormMain.pas"/>
     174        <Caret Line="7" Column="33"/>
    411175      </Position1>
    412176      <Position2>
    413         <Filename Value="UFormMain.pas"/>
    414         <Caret Line="125" Column="28" TopLine="112"/>
     177        <Filename Value="Demo.lpr"/>
     178        <Caret Line="10" Column="20"/>
    415179      </Position2>
    416180      <Position3>
    417         <Filename Value="UFormMain.pas"/>
    418         <Caret Line="122" Column="28" TopLine="112"/>
     181        <Filename Value="FormMain.pas"/>
     182        <Caret Line="84" Column="62" TopLine="62"/>
    419183      </Position3>
    420184      <Position4>
    421         <Filename Value="UFormMain.pas"/>
    422         <Caret Line="164" Column="30" TopLine="159"/>
     185        <Filename Value="FormMain.pas"/>
     186        <Caret Line="60" Column="50" TopLine="34"/>
    423187      </Position4>
    424188      <Position5>
    425         <Filename Value="UFormMain.pas"/>
    426         <Caret Line="51" Column="49" TopLine="27"/>
     189        <Filename Value="FormMain.pas"/>
     190        <Caret Line="69" Column="3" TopLine="45"/>
    427191      </Position5>
    428192      <Position6>
    429         <Filename Value="UFormMain.pas"/>
    430         <Caret Line="29" Column="32" TopLine="18"/>
     193        <Filename Value="FormPlaylist.pas"/>
     194        <Caret Line="74" Column="12" TopLine="50"/>
    431195      </Position6>
    432196      <Position7>
    433         <Filename Value="UFormMain.pas"/>
    434         <Caret Line="27" Column="18" TopLine="18"/>
     197        <Filename Value="FormPlaylist.pas"/>
     198        <Caret Line="82" Column="26" TopLine="58"/>
    435199      </Position7>
    436200      <Position8>
    437         <Filename Value="../Systems/MAD/UAudioSystemMAD.pas"/>
    438         <Caret Line="37" Column="23" TopLine="23"/>
     201        <Filename Value="FormPlaylist.pas"/>
     202        <Caret Line="93" Column="21" TopLine="68"/>
    439203      </Position8>
    440204      <Position9>
    441         <Filename Value="../Systems/MAD/UAudioSystemMAD.pas"/>
    442         <Caret Line="20" Column="29" TopLine="2"/>
     205        <Filename Value="FormPlaylist.pas"/>
     206        <Caret Line="110" Column="29" TopLine="86"/>
    443207      </Position9>
    444208      <Position10>
    445         <Filename Value="../Systems/DSP/UAudioSystemDSP.pas"/>
    446         <Caret Line="23" Column="14" TopLine="5"/>
     209        <Filename Value="FormPlaylist.pas"/>
     210        <Caret Line="122" Column="23" TopLine="98"/>
    447211      </Position10>
    448212      <Position11>
    449         <Filename Value="../Systems/DSP/UAudioSystemDSP.pas"/>
    450         <Caret Line="32" Column="40" TopLine="14"/>
     213        <Filename Value="FormPlaylist.pas"/>
     214        <Caret Line="146" Column="36" TopLine="119"/>
    451215      </Position11>
    452216      <Position12>
    453         <Filename Value="../Systems/DSP/UAudioSystemDSP.pas"/>
    454         <Caret Line="43" Column="23" TopLine="25"/>
     217        <Filename Value="FormPlaylist.pas"/>
     218        <Caret Line="167" Column="39" TopLine="133"/>
    455219      </Position12>
    456220      <Position13>
    457         <Filename Value="../Systems/WinAPI/UAudioSystemWindows.pas"/>
    458         <Caret Line="27" Column="44" TopLine="16"/>
     221        <Filename Value="FormPlaylist.pas"/>
     222        <Caret Line="176" Column="47" TopLine="133"/>
    459223      </Position13>
    460224      <Position14>
    461         <Filename Value="../Systems/WinAPI/UAudioSystemWindows.pas"/>
    462         <Caret Line="69" Column="53" TopLine="51"/>
     225        <Filename Value="FormMain.pas"/>
     226        <Caret Line="146" Column="29" TopLine="122"/>
    463227      </Position14>
    464228      <Position15>
    465         <Filename Value="../Systems/WinAPI/UAudioSystemWindows.pas"/>
    466         <Caret Line="16" Column="31" TopLine="1"/>
     229        <Filename Value="FormMain.pas"/>
     230        <Caret Line="156" Column="29" TopLine="132"/>
    467231      </Position15>
    468232      <Position16>
    469         <Filename Value="../Systems/WinAPI/UAudioSystemWindows.pas"/>
    470         <Caret Line="43" Column="73" TopLine="21"/>
     233        <Filename Value="Demo.lpr"/>
     234        <Caret Line="19" Column="66"/>
    471235      </Position16>
    472236      <Position17>
    473         <Filename Value="UFormMain.pas"/>
    474         <Caret Line="8" Column="51" TopLine="1"/>
     237        <Filename Value="Demo.lpr"/>
     238        <Caret Line="3"/>
    475239      </Position17>
     240      <Position18>
     241        <Filename Value="../Systems/mplayer/AudioSystemMPlayer.pas"/>
     242        <Caret Column="15"/>
     243      </Position18>
    476244    </JumpHistory>
    477245  </ProjectOptions>
     
    485253      <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
    486254    </SearchPaths>
     255    <Parsing>
     256      <SyntaxOptions>
     257        <SyntaxMode Value="Delphi"/>
     258      </SyntaxOptions>
     259    </Parsing>
    487260    <Linking>
    488261      <Debugging>
    489         <DebugInfoType Value="dsStabs"/>
     262        <DebugInfoType Value="dsDwarf3"/>
    490263      </Debugging>
    491264      <Options>
     
    495268      </Options>
    496269    </Linking>
    497     <Other>
    498       <CompilerPath Value="$(CompPath)"/>
    499     </Other>
    500270  </CompilerOptions>
    501271  <Debugging>
  • CoolAudio/Demo/Demo.lpr

    r352 r569  
    88  {$ENDIF}{$ENDIF}
    99  Interfaces, // this includes the LCL widgetset
    10   Forms, UFormMain, UFormPlaylist;
     10  Forms, FormMain, FormPlaylist;
    1111
    1212{$R *.res}
     
    1414begin
    1515  RequireDerivedFormResource := True;
     16  Application.Title:='';
    1617  Application.Initialize;
    17   Application.CreateForm(TFormMain, FormMain);
    18   Application.CreateForm(TFormPlaylist, FormPlaylist);
     18  Application.CreateForm(TFormMain, FormMain.FormMain);
     19  Application.CreateForm(TFormPlaylist, FormPlaylist.FormPlaylist);
    1920  Application.Run;
    2021end.
  • CoolAudio/Demo/FormMain.pas

    r568 r569  
    1 unit UFormMain;
    2 
    3 {$mode Delphi}{$H+}
     1unit FormMain;
    42
    53interface
     
    75uses
    86  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    9   ComCtrls, ExtCtrls, ActnList, UAudioSystem,
    10   UCoolAudio, UPlaylist;
     7  ComCtrls, ExtCtrls, ActnList, AudioSystem, CoolAudio, Playlist;
    118
    129type
     
    5451    procedure TrackBarPositionChange(Sender: TObject);
    5552    procedure TrackBarVolumeChange(Sender: TObject);
    56   private
    5753  public
    5854    procedure UpdateInterface;
     
    6561  ApplicationTitle = 'CoolAudio demo';
    6662
     63
    6764implementation
    6865
     
    7067
    7168uses
    72   UFormPlaylist;
     69  FormPlaylist;
    7370
    7471{ TFormMain }
     
    147144begin
    148145  PlayList.PlayNext;
    149   FormPlaylist.ReloadList;
     146  FormPlaylist.FormPlaylist.ReloadList;
    150147end;
    151148
     
    157154procedure TFormMain.AShowPlaylistExecute(Sender: TObject);
    158155begin
    159   FormPlaylist.Show;
     156  FormPlaylist.FormPlaylist.Show;
    160157end;
    161158
  • CoolAudio/Demo/FormPlaylist.pas

    r568 r569  
    1 unit UFormPlaylist;
    2 
    3 {$mode objfpc}{$H+}
     1unit FormPlaylist;
    42
    53interface
     
    75uses
    86  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
    9   ComCtrls, Menus, ActnList, UPlaylist;
     7  ComCtrls, Menus, ActnList, Playlist;
    108
    119type
     
    4745    procedure ListView1DblClick(Sender: TObject);
    4846    procedure ListView1KeyPress(Sender: TObject; var Key: char);
    49   private
    50     { private declarations }
    5147  public
    5248    procedure ReloadList;
     
    6157
    6258uses
    63   UAudioSystem, UFormMain;
     59  AudioSystem, FormMain;
    6460
    6561resourcestring
     
    7672procedure TFormPlaylist.AClearAllExecute(Sender: TObject);
    7773begin
    78   FormMain.PlayList.Items.Clear;
     74  FormMain.FormMain.PlayList.Items.Clear;
    7975  ReloadList;
    8076end;
     
    8480  I: Integer;
    8581begin
    86   with FormMain.PlayList, Items do begin
     82  with FormMain.FormMain.PlayList, Items do begin
    8783    for I := Count - 1 downto 0 do
    8884      if ListView1.Items[I].Selected then Delete(I);
     
    9490procedure TFormPlaylist.AItemPlayExecute(Sender: TObject);
    9591begin
    96   FormMain.PlayList.CurrentIndex := ListView1.Selected.Index;
    97   FormMain.PlayList.Play;
     92  FormMain.FormMain.PlayList.CurrentIndex := ListView1.Selected.Index;
     93  FormMain.FormMain.PlayList.Play;
    9894end;
    9995
     
    112108          NewItem := TPlaylistItem.Create;
    113109          NewItem.FileName := Dir + DirectorySeparator + sr.Name;
    114           FormMain.PlayList.Items.Add(NewItem);
     110          FormMain.FormMain.PlayList.Items.Add(NewItem);
    115111        end;
    116112      until FindNext(sr) <> 0;
     
    124120begin
    125121  if OpenDialog1.Execute then begin
    126     FormMain.PlayList.AddFile(OpenDialog1.FileName);
     122    FormMain.FormMain.PlayList.AddFile(OpenDialog1.FileName);
    127123    ReloadList;
    128124  end;
     
    145141procedure TFormPlaylist.ListView1Data(Sender: TObject; Item: TListItem);
    146142begin
    147   if (Item.Index >= 0) and (Item.Index < FormMain.PlayList.Items.Count) then
    148   with TPlaylistItem(FormMain.PlayList.Items[Item.Index]) do begin
     143  if (Item.Index >= 0) and (Item.Index < FormMain.FormMain.PlayList.Items.Count) then
     144  with TPlaylistItem(FormMain.FormMain.PlayList.Items[Item.Index]) do begin
    149145    Item.Caption := FileName;
    150     Item.Data := FormMain.PlayList.Items[Item.Index];
     146    Item.Data := FormMain.FormMain.PlayList.Items[Item.Index];
    151147  end;
    152148end;
     
    164160procedure TFormPlaylist.ReloadList;
    165161begin
    166   ListView1.Items.Count := FormMain.PlayList.Items.Count;
     162  ListView1.Items.Count := FormMain.FormMain.PlayList.Items.Count;
    167163  ListView1.Refresh;
    168164  ListView1.Selected := nil;
    169   if (FormMain.PlayList.CurrentIndex >= 0) and
    170     (FormMain.PlayList.CurrentIndex < ListView1.Items.Count) then
    171     ListView1.Items[FormMain.PlayList.CurrentIndex].Selected := True;
     165  if (FormMain.FormMain.PlayList.CurrentIndex >= 0) and
     166    (FormMain.FormMain.PlayList.CurrentIndex < ListView1.Items.Count) then
     167    ListView1.Items[FormMain.FormMain.PlayList.CurrentIndex].Selected := True;
    172168  UpdateInterface;
    173169end;
     
    178174  AItemPlay.Enabled := Assigned(ListView1.Selected);
    179175  AClearAll.Enabled := ListView1.Items.Count > 0;
    180   CheckBoxRandom.Checked := FormMain.PlayList.RandomOrder;
    181   CheckBoxRepeat.Checked := FormMain.PlayList.RepeatInfinitely;
     176  CheckBoxRandom.Checked := FormMain.FormMain.PlayList.RandomOrder;
     177  CheckBoxRepeat.Checked := FormMain.FormMain.PlayList.RepeatInfinitely;
    182178end;
    183179
  • CoolAudio/Playlist.pas

    r568 r569  
    1 unit UPlaylist;
    2 
    3 {$mode delphi}{$H+}
     1unit Playlist;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, Contnrs, UAudioSystem;
     6  Classes, SysUtils, Generics.Collections, AudioSystem;
    97
    108type
     
    3028  published
    3129    Player: TMediaPlayer;
    32     Items: TObjectList; // TObjectList<TPlaylistItem>
     30    Items: TObjectList<TPlaylistItem>;
    3331    property RandomOrder: Boolean read FRandomOrder write FRandomOrder;
    3432    property RepeatInfinitely: Boolean read FRepeatInfinitely
     
    5250procedure TPlayList.Shuffle;
    5351begin
    54 
    5552end;
    5653
     
    8481begin
    8582  inherited;
    86   Items := TObjectList.Create;
     83  Items := TObjectList<TPlaylistItem>.Create;
    8784end;
    8885
    8986destructor TPlayList.Destroy;
    9087begin
    91   Items.Free;
    92   inherited Destroy;
     88  FreeAndNil(Items);
     89  inherited;
    9390end;
    9491
  • CoolAudio/Systems/AudioSystem.pas

    r568 r569  
    1 unit UAudioSystem;
    2 
    3 {$mode delphi}{$H+}
     1unit AudioSystem;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, Contnrs;
     6  Classes, SysUtils, Generics.Collections;
    97
    108type
     
    118116  TAudioSystemManager = class(TComponent)
    119117  public
    120     Systems: TObjectList; // TListObject<TAudioSystem>
     118    Systems: TObjectList<TAudioSystemManagerItem>;
    121119    procedure Register(Name: string; SystemClass: TAudioSystemClass);
    122120    procedure FillStringList(StringList: TStrings);
     
    298296  StringList.Clear;
    299297  for I := 0 to Systems.Count - 1 do
    300   with TAudioSystemManagerItem(Systems[I]) do
     298  with Systems[I] do
    301299    StringList.AddObject(Name, Systems[I]);
    302300end;
     
    309307  I := 0;
    310308  while (I < Systems.Count) and
    311     ((TAudioSystemManagerItem(Systems[I]).Name <> Name) or
    312     (not TAudioSystemManagerItem(Systems[I]).Supported and SupportedOnly)) do Inc(I);
    313   if I < Systems.Count then Result := TAudioSystemManagerItem(Systems[I])
     309    ((Systems[I].Name <> Name) or
     310    (not Systems[I].Supported and SupportedOnly)) do Inc(I);
     311  if I < Systems.Count then Result := Systems[I]
    314312    else Result := nil;
    315313end;
     
    330328begin
    331329  inherited;
    332   Systems := TObjectList.Create;
     330  Systems := TObjectList<TAudioSystemManagerItem>.Create;
    333331end;
    334332
    335333destructor TAudioSystemManager.Destroy;
    336334begin
    337   Systems.Free;
    338   inherited Destroy;
     335  FreeAndNil(Systems);
     336  inherited;
    339337end;
    340338
     
    424422  Stop;
    425423  Active := False;
    426   inherited Destroy;
     424  inherited;
    427425end;
    428426
     
    448446destructor TAudioSystem.Destroy;
    449447begin
    450   inherited Destroy;
     448  inherited;
    451449end;
    452450
  • CoolAudio/Systems/DSP/AudioSystemDSP.pas

    r568 r569  
    1 unit UAudioSystemDSP;
     1unit AudioSystemDSP;
    22
    3 {$I UCoolAudioConfig.inc}
    4 {$mode delphi}{$H+}
     3{$I CoolAudioConfig.inc}
    54
    65interface
     
    87{$IFDEF AudioSystemDSP}
    98uses
    10   Classes, SysUtils, UAudioSystem, BaseUnix, UWavFile, ExtCtrls;
     9  Classes, SysUtils, AudioSystem, BaseUnix, WavFile, ExtCtrls;
    1110
    1211type
     
    6968
    7069{$ENDIF}
     70
    7171
    7272implementation
  • CoolAudio/Systems/FMOD/AudioSystemFMOD.pas

    r568 r569  
    1 unit UAudioSystemFMOD;
     1unit AudioSystemFMOD;
    22
    3 {$I UCoolAudioConfig.inc}
    4 {$mode delphi}{$H+}
     3{$I CoolAudioConfig.inc}
    54
    65interface
     
    98{$IFDEF AudioSystemFMOD}
    109uses
    11   Classes, SysUtils, fmoddyn, fmodtypes, UAudioSystem, DateUtils;
     10  Classes, SysUtils, fmoddyn, fmodtypes, AudioSystem, DateUtils;
    1211
    1312type
  • CoolAudio/Systems/MAD/AudioSystemMAD.pas

    r568 r569  
    1 unit UAudioSystemMAD;
     1unit AudioSystemMAD;
    22
    3 {$I UCoolAudioConfig.inc}
    4 {$mode delphi}{$H+}
     3{$I CoolAudioConfig.inc}
    54
    65interface
     
    87{$IFDEF AudioSystemMAD}
    98uses
    10   Classes, SysUtils, mad, UAudioSystem;
     9  Classes, SysUtils, mad, AudioSystem;
    1110
    1211type
     
    2625
    2726{$ENDIF}
     27
    2828
    2929implementation
  • CoolAudio/Systems/WavFile.pas

    r568 r569  
    1313{ *************************************************************************** }
    1414
    15 unit UWavFile;
     15unit WavFile;
    1616
    1717interface
     
    7979
    8080implementation
    81 
    8281
    8382{ ********************* Auxiliary functions & procedures ******************** }
  • CoolAudio/Systems/WinAPI/AudioSystemWindows.pas

    r568 r569  
    1 unit UAudioSystemWindows;
    2 
    3 {$I UCoolAudioConfig.inc}
    4 {$mode delphi}{$H+}
     1unit AudioSystemWindows;
     2
     3{$I CoolAudioConfig.inc}
    54
    65interface
     
    87{$IFDEF Windows}
    98uses
    10   Windows, Classes, SysUtils, UAudioSystem, MMSystem, DateUtils;
     9  Windows, Classes, SysUtils, AudioSystem, MMSystem, DateUtils;
    1110
    1211type
  • CoolAudio/Systems/mplayer/AudioSystemMPlayer.pas

    r568 r569  
    11// MPlayer slave command list: http://www.mplayerhq.hu/DOCS/tech/slave.txt
    22
    3 unit UAudioSystemMPlayer;
    4 
    5 {$I UCoolAudioConfig.inc}
    6 {$mode Delphi}{$H+}
     3unit AudioSystemMPlayer;
     4
     5{$I CoolAudioConfig.inc}
    76
    87interface
    98
    109uses
    11   Classes, SysUtils, UAudioSystem, Process, Math, Dialogs, DateUtils;
     10  Classes, SysUtils, AudioSystem, Process, Math, Dialogs, DateUtils;
    1211
    1312const
     
    6463  SCantStopProcess = 'Can''t stop Mplayer process';
    6564
     65
    6666implementation
    6767
     
    125125destructor TAudioSystemMPlayer.Destroy;
    126126begin
    127   inherited Destroy;
     127  inherited;
    128128end;
    129129
     
    306306begin
    307307  Stop;
    308   FProcess.Free;
    309   inherited Destroy;
     308  FreeAndNil(FProcess);
     309  inherited;
    310310end;
    311311
Note: See TracChangeset for help on using the changeset viewer.