ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/deliantra
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/deliantra (file contents):
Revision 1.100 by root, Tue Dec 22 01:37:42 2009 UTC vs.
Revision 1.101 by root, Thu Feb 4 20:01:09 2010 UTC

541 sub audio_tab_update; 541 sub audio_tab_update;
542 audio_tab_update; 542 audio_tab_update;
543} 543}
544 544
545sub audio_shutdown { 545sub audio_shutdown {
546 if ($SDL_MIXER) {
547 DC::MixMusic::halt;
548 DC::Mix_AllocateChannels 0;
549 }
550
546 undef $MUSIC_PLAYER; 551 undef $MUSIC_PLAYER;
547 undef $MUSIC_PLAYING_META; 552 undef $MUSIC_PLAYING_META;
548 undef $MUSIC_PLAYING_DATA; 553 undef $MUSIC_PLAYING_DATA;
549 554
550 $MUSIC_WANT = []; 555 $MUSIC_WANT = [];
551 @MUSIC_JINGLE = (); 556 @MUSIC_JINGLE = ();
552 %AUDIO_PLAY = (); 557 %AUDIO_PLAY = ();
553 %AUDIO_CHUNK = (); 558 %AUDIO_CHUNK = ();
554 559
555 DC::MixMusic::halt;
556 DC::Mix_AllocateChannels 0;
557 DC::Mix_CloseAudio if $SDL_MIXER; 560 DC::Mix_CloseAudio if $SDL_MIXER;
558 undef $SDL_MIXER; 561 undef $SDL_MIXER;
559} 562}
560 563
561############################################################################# 564#############################################################################
1138 1141
1139 my $text = !$freq 1142 my $text = !$freq
1140 ? "audio is off" 1143 ? "audio is off"
1141 : "audio is enabled\n" 1144 : "audio is enabled\n"
1142 . "frequency (Hz): $freq\n" 1145 . "frequency (Hz): $freq\n"
1143 . "channels: $chans"; 1146 . "channels: $chans\n"
1147 . "chunk decoders available: " . (join ", ", DC::MixChunk::decoders) . "\n"
1148 . "music decoders available: " . (join ", ", DC::MixMusic::decoders);
1144 1149
1145 $AUDIO_INFO->set_text ($text); 1150 $AUDIO_INFO->set_text ($text);
1146} 1151}
1147 1152
1148sub audio_setup { 1153sub audio_setup {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines