hedgewars/uSound.pas
author nemo
Thu, 23 Dec 2010 23:46:14 -0500
changeset 4659 ce5897f53072
parent 4461 2f4f5d649bcd
child 4748 ce9b48de1f52
permissions -rw-r--r--
more fiddling with graphics to try and satisfy both fire and snow
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     1
(*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 611
diff changeset
     2
 * Hedgewars, a free turn based strategy game
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
     3
 * Copyright (c) 2005, 2007, 2009 Andrey Korotaev <unC0Rr@gmail.com>
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     4
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
     8
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    12
 * GNU General Public License for more details.
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    13
 *
183
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    14
 * You should have received a copy of the GNU General Public License
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    15
 * along with this program; if not, write to the Free Software
57c2ef19f719 Relicense to GPL
unc0rr
parents: 181
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    17
 *)
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    18
2630
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    19
{$INCLUDE "options.inc"}
079ef82eac75 revamped file access and debug display
koda
parents: 2603
diff changeset
    20
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    21
unit uSound;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    22
interface
4357
a1fcfc341a52 Introduce unit uTypes in order to remove some cyclic unit dependencies
unC0Rr
parents: 3825
diff changeset
    23
uses SDLh, uConsts, uTypes;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    24
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
    25
var MusicFN: shortstring;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
    26
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
    27
procedure initModule;
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
    28
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
    29
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    30
procedure InitSound;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    31
procedure ReleaseSound;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    32
procedure SoundLoad;
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
    33
procedure PlaySound(snd: TSound);
3202
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
    34
procedure PlaySound(snd: TSound; keepPlaying: boolean);
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
    35
procedure PlaySound(snd: TSound; voicepack: PVoicepack);
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
    36
procedure PlaySound(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean);
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    37
function  LoopSound(snd: TSound): LongInt;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    38
function  LoopSound(snd: TSound; voicepack: PVoicepack): LongInt;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    39
procedure PlayMusic;
1712
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
    40
procedure PauseMusic;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
    41
procedure ResumeMusic;
282
b1e3387389b6 - Pickhammer sound
unc0rr
parents: 183
diff changeset
    42
procedure StopSound(snd: TSound);
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
    43
procedure StopSound(chn: LongInt);
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
    44
function  ChangeVolume(voldelta: LongInt): LongInt;
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
    45
function  AskForVoicepack(name: shortstring): Pointer;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    46
1097
06b15817b8a0 Enable music dependance on current land theme
unc0rr
parents: 1066
diff changeset
    47
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    48
implementation
4461
2f4f5d649bcd add a simple check to prevent loading sounds when device is muted
koda
parents: 4404
diff changeset
    49
uses uVariables, uConsole, uUtils, uCommands, uDebug, uMobile;
564
17fb45c670c1 Finalize basic playlists implementation
unc0rr
parents: 449
diff changeset
    50
3418
8545f646a40d Engine:
smxx
parents: 3202
diff changeset
    51
const chanTPU = 32;
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
    52
var Volume: LongInt;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
    53
    lastChan: array [TSound] of LongInt;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
    54
    voicepacks: array[0..cMaxTeams] of TVoicepack;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
    55
    defVoicepack: PVoicepack;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
    56
    Mus: PMixMusic = nil;
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
    57
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
    58
function  AskForVoicepack(name: shortstring): Pointer;
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
    59
var i: Longword;
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
    60
begin
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
    61
i:= 0;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    62
    while (voicepacks[i].name <> name) and (voicepacks[i].name <> '') do
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    63
    begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    64
        inc(i);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    65
        TryDo(i <= cMaxTeams, 'Engine bug: AskForVoicepack i > cMaxTeams', true)
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    66
    end;
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
    67
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    68
    voicepacks[i].name:= name;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
    69
    AskForVoicepack:= @voicepacks[i]
1654
9cfa6f23e767 Start voicepacks implementation
unc0rr
parents: 1562
diff changeset
    70
end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    71
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    72
procedure InitSound;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
    73
var i: TSound;
3825
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    74
    channels: LongInt;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
    75
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    76
    if not isSoundEnabled then exit;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    77
    WriteToConsole('Init sound...');
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    78
    isSoundEnabled:= SDL_InitSubSystem(SDL_INIT_AUDIO) >= 0;
2671
7e0f88013fe8 smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents: 2647
diff changeset
    79
3825
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    80
{$IFDEF IPHONEOS}
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    81
    channels:= 1;
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    82
{$ELSE}
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    83
    channels:= 2;
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    84
{$ENDIF}
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    85
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    86
    if isSoundEnabled then
3825
fd6c20cd90e3 typos, reduced sound size and last minute fixes
koda
parents: 3697
diff changeset
    87
        isSoundEnabled:= Mix_OpenAudio(44100, $8010, channels, 1024) = 0;
2327
4832b77ec958 restored volumen control (hoorray)
koda
parents: 2303
diff changeset
    88
3182
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
    89
{$IFDEF SDL_MIXER_NEWER}
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
    90
    WriteToConsole('Init SDL_mixer... ');
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
    91
    SDLTry(Mix_Init(MIX_INIT_OGG) <> 0, true);
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
    92
    WriteLnToConsole(msgOK);
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
    93
{$ENDIF}
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
    94
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    95
    if isSoundEnabled then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    96
        WriteLnToConsole(msgOK)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    97
    else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
    98
        WriteLnToConsole(msgFailed);
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
    99
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   100
    Mix_AllocateChannels(Succ(chanTPU));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   101
    if isMusicEnabled then
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   102
        Mix_VolumeMusic(50);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   103
    for i:= Low(TSound) to High(TSound) do
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   104
        lastChan[i]:= -1;
2671
7e0f88013fe8 smaller patches, one missing Sky-lowres, IMG_Init and Mix_Init (might require newer libraries), updates to SDL bindings, code cleanup, new compile flags
koda
parents: 2647
diff changeset
   105
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   106
    Volume:= 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   107
    ChangeVolume(cInitVolume)
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   108
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   109
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   110
procedure ReleaseSound;
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   111
var i: TSound;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   112
    t: Longword;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   113
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   114
    for t:= 0 to cMaxTeams do
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   115
        if voicepacks[t].name <> '' then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   116
            for i:= Low(TSound) to High(TSound) do
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   117
                if voicepacks[t].chunks[i] <> nil then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   118
                    Mix_FreeChunk(voicepacks[t].chunks[i]);
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   119
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   120
    if Mus <> nil then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   121
        Mix_FreeMusic(Mus);
3182
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
   122
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
   123
{$IFDEF SDL_MIXER_NEWER}
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   124
    // make sure all instances of sdl_mixer are unloaded before continuing
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   125
    while Mix_Init(0) <> 0 do
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   126
        Mix_Quit();
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3667
diff changeset
   127
{$ENDIF}
3182
f75d546414c4 Engine:
smxx
parents: 3038
diff changeset
   128
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   129
    Mix_CloseAudio();
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   130
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   131
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   132
procedure SoundLoad;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   133
var i: TSound;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   134
    t: Longword;
3667
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   135
    s:shortstring;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   136
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   137
    if not isSoundEnabled then exit;
1656
209cf0e2fc36 Finish voicepacks support in engine (not tested though)
unc0rr
parents: 1654
diff changeset
   138
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   139
    defVoicepack:= AskForVoicepack('Default');
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3667
diff changeset
   140
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   141
    for t:= 0 to cMaxTeams do
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   142
        if voicepacks[t].name <> '' then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   143
            for i:= Low(TSound) to High(TSound) do
3667
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   144
                voicepacks[t].chunks[i]:= nil;
3697
d5b30d6373fc remove trailing spaces from end of line
koda
parents: 3667
diff changeset
   145
3667
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   146
    for i:= Low(TSound) to High(TSound) do
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   147
    begin
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   148
        defVoicepack^.chunks[i]:= nil;
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   149
        // preload all the big sound files (>32k) that would otherwise lockup the game
4461
2f4f5d649bcd add a simple check to prevent loading sounds when device is muted
koda
parents: 4404
diff changeset
   150
        if (i in [sndBeeWater, sndBee, sndCake, sndHellishImpact1, sndHellish, sndHomerun,
2f4f5d649bcd add a simple check to prevent loading sounds when device is muted
koda
parents: 4404
diff changeset
   151
                  sndMolotov, sndMortar, sndRideOfTheValkyries, sndYoohoo])
3667
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   152
            and (Soundz[i].Path <> ptVoices) and (Soundz[i].FileName <> '') then
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   153
        begin
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   154
            s:= Pathz[Soundz[i].Path] + '/' + Soundz[i].FileName;
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   155
            WriteToConsole(msgLoading + s + ' ');
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   156
            defVoicepack^.chunks[i]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), 'rb'), 1);
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   157
            TryDo(defVoicepack^.chunks[i] <> nil, msgFailed, true);
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   158
            WriteLnToConsole(msgOK);
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   159
        end;
9359a70df013 use external libs more consistently
koda
parents: 3664
diff changeset
   160
    end;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   161
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   162
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   163
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   164
procedure PlaySound(snd: TSound);
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   165
begin
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   166
    PlaySound(snd, nil, false);
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   167
end;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   168
3202
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   169
procedure PlaySound(snd: TSound; keepPlaying: boolean);
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   170
begin
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   171
    PlaySound(snd, nil, keepPlaying);
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   172
end;
b470d7875f23 Engine:
smxx
parents: 3201
diff changeset
   173
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   174
procedure PlaySound(snd: TSound; voicepack: PVoicepack);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   175
begin
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   176
    PlaySound(snd, voicepack, false);
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   177
end;
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   178
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   179
procedure PlaySound(snd: TSound; voicepack: PVoicepack; keepPlaying: boolean);
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   180
var s:shortstring;
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   181
begin
4461
2f4f5d649bcd add a simple check to prevent loading sounds when device is muted
koda
parents: 4404
diff changeset
   182
    if (not isSoundEnabled) or fastUntilLag or isDeviceMute() then
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   183
        exit;
3201
400c98815100 Engine:
smxx
parents: 3182
diff changeset
   184
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   185
    if keepPlaying and (lastChan[snd] <> -1) and (Mix_Playing(lastChan[snd]) <> 0) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   186
        exit;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   187
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   188
    if (voicepack <> nil) then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   189
    begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   190
        if (voicepack^.chunks[snd] = nil) and (Soundz[snd].Path = ptVoices) and (Soundz[snd].FileName <> '') then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   191
        begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   192
            s:= Pathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   193
            WriteToConsole(msgLoading + s + ' ');
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   194
            voicepack^.chunks[snd]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), 'rb'), 1);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   195
            if voicepack^.chunks[snd] = nil then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   196
                WriteLnToConsole(msgFailed)
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   197
            else
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   198
                WriteLnToConsole(msgOK)
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   199
        end;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   200
        lastChan[snd]:= Mix_PlayChannelTimed(-1, voicepack^.chunks[snd], 0, -1)
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   201
    end
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   202
    else
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   203
    begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   204
        if (defVoicepack^.chunks[snd] = nil) and (Soundz[snd].Path <> ptVoices) and (Soundz[snd].FileName <> '') then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   205
        begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   206
            s:= Pathz[Soundz[snd].Path] + '/' + Soundz[snd].FileName;
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   207
            WriteToConsole(msgLoading + s + ' ');
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   208
            defVoicepack^.chunks[snd]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), 'rb'), 1);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   209
            TryDo(defVoicepack^.chunks[snd] <> nil, msgFailed, true);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   210
            WriteLnToConsole(msgOK);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   211
        end;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   212
        lastChan[snd]:= Mix_PlayChannelTimed(-1, defVoicepack^.chunks[snd], 0, -1)
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   213
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   214
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   215
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   216
function LoopSound(snd: TSound): LongInt;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   217
begin
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   218
    LoopSound:= LoopSound(snd, nil)
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   219
end;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   220
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   221
function LoopSound(snd: TSound; voicepack: PVoicepack): LongInt;
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   222
var s: shortstring;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   223
begin
4461
2f4f5d649bcd add a simple check to prevent loading sounds when device is muted
koda
parents: 4404
diff changeset
   224
    if (not isSoundEnabled) or fastUntilLag or isDeviceMute() then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   225
    begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   226
        LoopSound:= -1;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   227
        exit
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   228
    end;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   229
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   230
    if (voicepack <> nil) then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   231
    begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   232
        if (voicepack^.chunks[snd] = nil) and (Soundz[snd].Path = ptVoices) and (Soundz[snd].FileName <> '') then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   233
        begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   234
            s:= Pathz[Soundz[snd].Path] + '/' + voicepack^.name + '/' + Soundz[snd].FileName;
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   235
            WriteToConsole(msgLoading + s + ' ');
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   236
            voicepack^.chunks[snd]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), 'rb'), 1);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   237
            if voicepack^.chunks[snd] = nil then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   238
                WriteLnToConsole(msgFailed)
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   239
            else
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   240
                WriteLnToConsole(msgOK)
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   241
        end;
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   242
        LoopSound:= Mix_PlayChannelTimed(-1, voicepack^.chunks[snd], -1, -1)
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   243
    end
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   244
    else
3664
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   245
    begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   246
        if (defVoicepack^.chunks[snd] = nil) and (Soundz[snd].Path <> ptVoices) and (Soundz[snd].FileName <> '') then
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   247
        begin
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   248
            s:= Pathz[Soundz[snd].Path] + '/' + Soundz[snd].FileName;
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   249
            WriteToConsole(msgLoading + s + ' ');
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   250
            defVoicepack^.chunks[snd]:= Mix_LoadWAV_RW(SDL_RWFromFile(Str2PChar(s), 'rb'), 1);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   251
            TryDo(defVoicepack^.chunks[snd] <> nil, msgFailed, true);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   252
            WriteLnToConsole(msgOK);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   253
        end;
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   254
        LoopSound:= Mix_PlayChannelTimed(-1, defVoicepack^.chunks[snd], -1, -1);
f5bdf26c843e sound is loaded lazily
koda
parents: 3615
diff changeset
   255
    end;
2647
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   256
end;
0e1208e92dfe Smaxx patch with tuning by me:
unc0rr
parents: 2633
diff changeset
   257
282
b1e3387389b6 - Pickhammer sound
unc0rr
parents: 183
diff changeset
   258
procedure StopSound(snd: TSound);
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   259
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   260
    if not isSoundEnabled then exit;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   261
    if (lastChan[snd] <> -1) and (Mix_Playing(lastChan[snd]) <> 0) then
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   262
    begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   263
        Mix_HaltChannel(lastChan[snd]);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   264
        lastChan[snd]:= -1;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   265
    end;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   266
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   267
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   268
procedure StopSound(chn: LongInt);
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   269
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   270
    if not isSoundEnabled then exit;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   271
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   272
    if (chn <> -1) and (Mix_Playing(chn) <> 0) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   273
        Mix_HaltChannel(chn);
2745
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   274
end;
11fce231f24a Engine:
smxx
parents: 2744
diff changeset
   275
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   276
procedure PlayMusic;
2905
f3c79f7193a9 Engine:
smxx
parents: 2832
diff changeset
   277
var s: shortstring;
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   278
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   279
    if (not isSoundEnabled) or (MusicFN = '') or (not isMusicEnabled) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   280
        exit;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   281
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   282
    s:= PathPrefix + '/Music/' + MusicFN;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   283
    WriteToConsole(msgLoading + s + ' ');
565
092cb8deffc5 Fix some bug, finish playlist implementation
unc0rr
parents: 564
diff changeset
   284
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   285
    Mus:= Mix_LoadMUS(Str2PChar(s));
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   286
    TryDo(Mus <> nil, msgFailed, false);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   287
    WriteLnToConsole(msgOK);
565
092cb8deffc5 Fix some bug, finish playlist implementation
unc0rr
parents: 564
diff changeset
   288
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   289
    SDLTry(Mix_FadeInMusic(Mus, -1, 3000) <> -1, false)
4
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   290
end;
bcbd7adb4e4b - set svn:eol-style to native
unc0rr
parents: 1
diff changeset
   291
371
731ad6d27bd1 integer -> LongInt
unc0rr
parents: 355
diff changeset
   292
function ChangeVolume(voldelta: LongInt): LongInt;
174
0b2c5b22f644 Changeable volume
unc0rr
parents: 97
diff changeset
   293
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   294
    if not isSoundEnabled then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   295
        exit(0);
2327
4832b77ec958 restored volumen control (hoorray)
koda
parents: 2303
diff changeset
   296
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   297
    inc(Volume, voldelta);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   298
    if Volume < 0 then Volume:= 0;
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   299
    Mix_Volume(-1, Volume);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   300
    Volume:= Mix_Volume(-1, -1);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   301
    if isMusicEnabled then Mix_VolumeMusic(Volume * 4 div 8);
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   302
    ChangeVolume:= Volume * 100 div MIX_MAX_VOLUME
174
0b2c5b22f644 Changeable volume
unc0rr
parents: 97
diff changeset
   303
end;
0b2c5b22f644 Changeable volume
unc0rr
parents: 97
diff changeset
   304
1712
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   305
procedure PauseMusic;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   306
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   307
    if (MusicFN = '') or (not isMusicEnabled) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   308
        exit;
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   309
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   310
    Mix_PauseMusic(Mus);
1712
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   311
end;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   312
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   313
procedure ResumeMusic;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   314
begin
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   315
    if (MusicFN = '') or (not isMusicEnabled) then
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   316
        exit;
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   317
3529
0e968ba12a84 memory management for openalbridge
koda
parents: 3418
diff changeset
   318
    Mix_ResumeMusic(Mus);
1712
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   319
end;
f5b916de40f0 Patch by nemo (polished by me)
unc0rr
parents: 1669
diff changeset
   320
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   321
procedure chVoicepack(var s: shortstring);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   322
begin
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   323
    if CurrentTeam = nil then OutError(errmsgIncorrectUse + ' "/voicepack"', true);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   324
    if s[1]='"' then Delete(s, 1, 1);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   325
    if s[byte(s[0])]='"' then Delete(s, byte(s[0]), 1);
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   326
    CurrentTeam^.voicepack:= AskForVoicepack(s)
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   327
end;
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   328
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
   329
procedure initModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   330
begin
4398
36d7e4b6ca81 Move some command handlers out of uCommands into more appropriate places, thus removing some dependencies. Ideally uCommands shouldn't depend on anything (except for uTypes and uConsts probably)
unc0rr
parents: 4377
diff changeset
   331
    RegisterVariable('voicepack', vtCommand, @chVoicepack, false);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2905
diff changeset
   332
    MusicFN:='';
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   333
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   334
3038
4e48c276a468 In pascal unit is a namespace
unc0rr
parents: 2948
diff changeset
   335
procedure freeModule;
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   336
begin
3615
b78d7959540a further code cleanup and less redundancy
koda
parents: 3529
diff changeset
   337
    if isSoundEnabled then
b78d7959540a further code cleanup and less redundancy
koda
parents: 3529
diff changeset
   338
        ReleaseSound();
2716
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   339
end;
b9ca1bfca24f complete the replacement of init/free wrappers for every unit
koda
parents: 2674
diff changeset
   340
2515
51d3f4b6293a revert audio to use SDL_mixer -- also frontend uses it, so it needs sdlmixer sources
koda
parents: 2501
diff changeset
   341
end.
2192
4763a778c033 - Fix quickplay sound bug triggered by two faults: ttsmj's (passing voicepack with empty name in team config) and koda's (he changed fallback to default scheme condition)
unc0rr
parents: 2191
diff changeset
   342