--- deliantra/Deliantra-Client/bin/cfplus	2007/07/31 00:50:04	1.194
+++ deliantra/Deliantra-Client/bin/cfplus	2007/07/31 02:45:39	1.198
@@ -161,17 +161,6 @@
 our $SDL_ACTIVE;
 our %SDL_CB;
 
-our $SDL_MIXER;
-our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
-our @MUSIC_WANT;
-our $MUSIC_START;
-our $MUSIC_PLAYING_DATA;
-our $MUSIC_PLAYING_META;
-our $MUSIC_PLAYER;
-our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
-our @SOUNDS;       # event => file mapping
-our %AUDIO_CHUNK;  # audio files
-
 our $ALT_ENTER_MESSAGE;
 our $STATUSBOX;
 our $DEBUG_STATUS;
@@ -182,6 +171,8 @@
 
 our $PICKUP_CFG;
 
+#############################################################################
+
 sub status {
    $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
 }
@@ -195,6 +186,230 @@
    $MESSAGE_WINDOW->message ($para);
 }
 
+#############################################################################
+#TODO: maybe move into own audio module...
+
+our $SDL_MIXER;
+
+our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
+our $MUSIC_WANT; # arryref of ambient music we want to play
+our @MUSIC_HAVE; # ambient music we have on disk
+our $MUSIC_START;
+our @MUSIC_JINGLE; # which jingles to play next
+our $MUSIC_PLAYING_DATA;
+our $MUSIC_PLAYING_META;
+our $MUSIC_PLAYER;
+our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
+
+our %AUDIO_CHUNK;  # audio "files"
+our %AUDIO_PLAY;   # which audio faces should be played
+
+sub audio_channel_finished {
+   my ($channel) = @_;
+
+#   warn "channel $channel finished\n";#d#
+}
+
+sub audio_sound_push($) {
+   my ($face) = @_;
+
+   if (my $chunk = $AUDIO_CHUNK{$face}) {
+      for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
+         my (undef, $dx, $dy, $vol) = @$_;
+
+         my $channel = CFPlus::Channel::find;
+         $channel->volume ($vol * 128 / 255);
+         $dx = $dx / 10 * 255;
+         $channel->set_panning (255 - $dx, 255 + $dx);
+
+#         my $angle = $dx ? : $dx < 0 ? 
+#         my $distance = -$vol;
+#         $channel->set_position ($angle, $distance);
+
+         $chunk->play ($channel);
+      }
+   } else {
+      # sound_meta not set means data is in flight either way
+      my $meta = $CONN->{sound_meta}{$face}
+         or return;
+
+      # if its a jingle, play it as ambient music
+      if ($meta->{meta}{jingle}) {
+         delete $AUDIO_PLAY{$face}; # take the jingle out of the sound queue
+         push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
+         &audio_music_push ($face);
+      } else {
+         # fetch from database
+         CFPlus::DB::get res_data => $meta->{name}, sub {
+            my $rwops = new CFPlus::RW $_[0];
+            my $chunk = new CFPlus::MixChunk $rwops;
+            $chunk->volume (($meta->{meta}{volume} || 1) * 128);
+            $AUDIO_CHUNK{$face} = $chunk;
+
+            audio_sound_push ($face);
+         };
+      }
+   }
+}
+
+sub audio_sound_play {
+   my ($face, $dx, $dy, $vol) = @_;
+
+   $SDL_MIXER
+      or return;
+
+   my $queue = $AUDIO_PLAY{$face} ||= [];
+   push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
+   audio_sound_push $face
+      unless @$queue > 1;
+}
+
+sub audio_music_update_volume {
+   return unless $MUSIC_PLAYING_META;
+   my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
+   my $base   = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
+   CFPlus::MixMusic::volume $base * $volume * 128;
+}
+
+sub audio_music_start {
+   my $meta = $MUSIC_PLAYING_META;
+
+   CFPlus::DB::get res_data => $meta->{name}, sub {
+      return unless $SDL_MIXER;
+
+      # music might have changed...
+      $meta eq $MUSIC_PLAYING_META
+         or return &audio_music_start ();
+
+      audio_music_update_volume;
+
+      $MUSIC_PLAYING_DATA = \$_[0];
+
+      my $rwops = $meta->{path}
+         ? new_from_file CFPlus::RW $meta->{path}
+         : new CFPlus::RW $$MUSIC_PLAYING_DATA;
+
+      $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
+         or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
+
+      my $NOW = time;
+
+      if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
+         my $pos = $MUSIC_PLAYING_META->{stop_pos};
+         $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
+         $MUSIC_START = time - $pos;
+      } else {
+         $MUSIC_PLAYER->play (0);
+         $MUSIC_START = time;
+      }
+
+      delete $MUSIC_PLAYING_META->{stop_time};
+      delete $MUSIC_PLAYING_META->{stop_pos};
+   }
+}
+
+sub audio_music_push {
+   return unless $SDL_MIXER;
+
+   my $fade_out;
+
+   if (@MUSIC_JINGLE) {
+      @MUSIC_HAVE = $MUSIC_JINGLE[0];
+      $fade_out = 333;
+   } else {
+      return unless $CFG->{bgm_enable};
+
+      my @have =
+         grep $_,
+            map $CONN->{music_meta}{$_},
+               @$MUSIC_WANT;
+
+      @MUSIC_HAVE = @have
+         if @have;
+
+      # default MUSIC_HAVE == MUSIC_DEFAULT
+      @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
+      $fade_out = 1000;
+   }
+   
+   # if the currently playing song is acceptable, let it continue
+   return if $MUSIC_PLAYING_META
+             && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
+
+   my $NOW = time;
+
+   if ($MUSIC_PLAYING_META) {
+      $MUSIC_PLAYING_META->{stop_time} = $NOW;
+      $MUSIC_PLAYING_META->{stop_pos}  = $NOW - $MUSIC_START;
+      CFPlus::MixMusic::fade_out $fade_out;
+   } else {
+      # sort by stop time, oldest first
+      @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
+
+      # if the most recently-played piece played very recently,
+      # resume it, else choose the oldest piece for rotation.
+      $MUSIC_PLAYING_META =
+         $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
+            ? $MUSIC_HAVE[-1]
+            : $MUSIC_HAVE[0];
+
+      audio_music_start;
+   }
+}
+
+sub audio_music_set_ambient {
+   my ($songs) = @_;
+
+   $MUSIC_WANT = $songs;
+   audio_music_push;
+}
+
+sub audio_music_finished {
+   # we compress multiple jingles of the same type
+   shift @MUSIC_JINGLE
+      while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
+
+   undef $MUSIC_PLAYER;
+   undef $MUSIC_PLAYING_META;
+   undef $MUSIC_PLAYING_DATA;
+
+   audio_music_push;
+}
+
+sub audio_init {
+   if ($CFG->{audio_enable}) {
+      $ENV{MIX_EFFECTSMAXSPEED} = 1;
+      $SDL_MIXER = !CFPlus::Mix_OpenAudio;
+
+      unless ($SDL_MIXER) {
+         status "Unable to open sound device: there will be no sound";
+         return;
+      }
+
+      CFPlus::Mix_AllocateChannels 16;
+
+      audio_music_finished;
+   } else {
+      undef $SDL_MIXER;
+   }
+}
+
+sub audio_shutdown {
+   undef $MUSIC_PLAYER;
+   undef $MUSIC_PLAYING_META;
+   undef $MUSIC_PLAYING_DATA;
+
+   $MUSIC_WANT   = [];
+   @MUSIC_JINGLE = ();
+   %AUDIO_PLAY   = ();
+   %AUDIO_CHUNK  = ();
+
+   CFPlus::Mix_CloseAudio if $SDL_MIXER;
+   undef $SDL_MIXER;
+}
+
+#############################################################################
+
 sub destroy_query_dialog {
    (delete $_[0]{query_dialog})->destroy
       if $_[0]{query_dialog};
@@ -650,7 +865,7 @@
    $hbox->add (new CFPlus::UI::Slider
       expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
       tooltip => "The volume of the background music. Changes are instant.",
-      on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
+      on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
    );
 
    $table->add_at (1, $row++, new CFPlus::UI::Button
@@ -1789,178 +2004,6 @@
    undef $SDL_ACTIVE;
 }
 
-sub audio_channel_finished {
-   my ($channel) = @_;
-
-#   warn "channel $channel finished\n";#d#
-}
-
-our %AUDIO_PLAY;
-our %AUDIO_CHUNK;
-
-sub audio_sound_push($) {
-   my ($face) = @_;
-
-   if (my $chunk = $AUDIO_CHUNK{$face}) {
-      for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
-         my (undef, $dx, $dy, $vol) = @$_;
-
-         my $channel = CFPlus::Channel::find;
-         $channel->volume (128 + $vol);
-         $dx = $dx / 10 * 255;
-         $channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
-
-#         my $angle = $dx ? : $dx < 0 ? 
-#         my $distance = -$vol;
-#         $channel->set_position ($angle, $distance);
-
-         $chunk->play ($channel);
-      }
-   } else {
-      # sound_meta not set means data is in flight either way
-      my $meta = $CONN->{sound_meta}{$face}
-         or return;
-
-      # fetch from database
-      CFPlus::DB::get res_data => $meta->{name}, sub {
-         my $vol = $meta->{meta}{volume} || 1;
-         my $rwops = new CFPlus::RW $_[0];
-         my $chunk = new CFPlus::MixChunk $rwops;
-         $chunk->volume ($vol * 128);
-         $AUDIO_CHUNK{$face} = $chunk;
-
-         audio_sound_push ($face);
-      };
-   }
-}
-
-sub audio_sound_play {
-   my ($face, $dx, $dy, $vol) = @_;
-
-   $SDL_MIXER
-      or return;
-
-   my $queue = $AUDIO_PLAY{$face} ||= [];
-   push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
-   audio_sound_push $face
-      unless @$queue > 1;
-}
-
-sub audio_music_set_ambient {
-   my ($songs) = @_;
-
-   my @want =
-      grep $_,
-         map $CONN->{music_meta}{$_},
-            @$songs;
-
-   if (@want) {
-      @MUSIC_WANT = @want;
-      &audio_music_changed ();
-   }
-}
-
-sub audio_music_start {
-   my $meta = $MUSIC_PLAYING_META;
-
-   CFPlus::DB::get res_data => $meta->{name}, sub {
-      return unless $SDL_MIXER;
-
-      # music might have changed...
-      $meta eq $MUSIC_PLAYING_META
-         or return &audio_music_start ();
-
-      $MUSIC_PLAYING_DATA = \$_[0];
-
-      my $rwops = $meta->{path}
-         ? new_from_file CFPlus::RW $meta->{path}
-         : new CFPlus::RW $$MUSIC_PLAYING_DATA;
-
-      $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
-         or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
-
-      my $NOW = time;
-
-      if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
-         my $pos = $MUSIC_PLAYING_META->{stop_pos};
-         $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
-         $MUSIC_START = time - $pos;
-      } else {
-         $MUSIC_PLAYER->play (0);
-         $MUSIC_START = time;
-      }
-
-      delete $MUSIC_PLAYING_META->{stop_time};
-      delete $MUSIC_PLAYING_META->{stop_pos};
-   }
-}
-
-sub audio_music_changed {
-   return unless $CFG->{bgm_enable};
-   return unless $SDL_MIXER;
-
-   # default MUSIC_WANT == MUSIC_DEFAULT
-   @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
-   
-   # if the currently playing song is acceptable, let it continue
-   return if $MUSIC_PLAYING_META
-             && grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
-
-   my $NOW = time;
-
-   if ($MUSIC_PLAYING_META) {
-      $MUSIC_PLAYING_META->{stop_time} = $NOW;
-      $MUSIC_PLAYING_META->{stop_pos}  = $NOW - $MUSIC_START;
-      CFPlus::MixMusic::fade_out 1000;
-   } else {
-      # sort by stop time, oldest first
-      @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
-
-      # if the most recently-played piece played very recently,
-      # resume it, else choose the oldest piece for rotation.
-      $MUSIC_PLAYING_META =
-         $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
-            ? $MUSIC_WANT[-1]
-            : $MUSIC_WANT[0];
-
-      audio_music_start;
-   }
-}
-
-sub audio_music_finished {
-   undef $MUSIC_PLAYER;
-   undef $MUSIC_PLAYING_META;
-   undef $MUSIC_PLAYING_DATA;
-
-   audio_music_changed;
-}
-
-sub audio_init {
-   if ($CFG->{audio_enable}) {
-      $ENV{MIX_EFFECTSMAXSPEED} = 1;
-      $SDL_MIXER = !CFPlus::Mix_OpenAudio;
-
-      unless ($SDL_MIXER) {
-         status "Unable to open sound device: there will be no sound";
-         return;
-      }
-
-      CFPlus::Mix_AllocateChannels 16;
-      CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
-
-      audio_music_finished;
-   } else {
-      undef $SDL_MIXER;
-   }
-}
-
-sub audio_shutdown {
-   CFPlus::Mix_CloseAudio if $SDL_MIXER;
-   undef $SDL_MIXER;
-   @SOUNDS = ();
-   %AUDIO_CHUNK = ();
-}
-
 my %animate_object;
 my $animate_timer;