--- deliantra/server/ext/player-env.ext	2010/04/08 18:27:17	1.16
+++ deliantra/server/ext/player-env.ext	2010/05/16 01:58:50	1.20
@@ -3,23 +3,55 @@
 # this extension provides "environmental effects",
 # meaning mostly background music and region messages right now.
 
-sub parse_facelist($$) {
-   my ($prefix, $list) = @_;
+our %MUSIC_GROUP;
+our %MUSIC_FACE_CACHE; # cleared by reload_facedata
+
+sub reload {
+   cf::trace "loading music config from $DATADIR/music\n";
+
+   0 < Coro::AIO::aio_load "$DATADIR/music", my $data
+      or die "$DATADIR/music $!";
+
+   my $conf = JSON::XS->new->utf8->relaxed->decode ($data);
+   %MUSIC_GROUP = %{ $conf->{group} };
+   %MUSIC_FACE_CACHE = ();
+}
+
+cf::post_init {
+   $_[0] ? cf::async { reload } : reload
+};
+
+sub parse_musiclist($) {
+   my ($list) = @_;
 
    return undef
       unless defined $list;
 
-   #TODO, sort by size (smallest first...)
-   [
-      sort { (cf::face::get_data_size $a) <=> (cf::face::get_data_size $b) }
-      grep $_,
-      map +(cf::face::find "$prefix$_" or ((warn "unable to find music file $_"), undef)),
-      split /\s*,\s*/, $list
-   ]
+   my @name = split /\s*,\s*/, $list;
+   my @face;
+
+   while (@name) {
+      my $name = shift @name;
+
+      if ($name =~ /^\@(.*)$/) {
+         my $group = $MUSIC_GROUP{$1}
+            or cf::error "music group $1 does not exist (referenced in '$list')";
+
+         unshift @name, @$group;
+      } else {
+         my $face = cf::face::find "music/$name"
+            or "unable to find music face $name (referenced in '$list')";
+
+         push @face, $face
+            if $face;
+      }
+   }
+
+   # sort by size, smallest first, because it'S the fastest to download...
+   [ sort { (cf::face::get_data_size $a) <=> (cf::face::get_data_size $b) } @face ]
 }
 
 our %MUSIC_QUEUE;
-our %MUSIC_FACE_CACHE; # cleared by reload_facedata
 
 our $MUSIC_SCHEDULER = cf::async_ext {
    $Coro::current->{desc} = "music scheduler";
@@ -31,28 +63,24 @@
          cf::get_slot 0.01, -10, "music scheduler";
 
          my $pl = cf::player::find_active $_ or next;
-         $pl->ob->active or next;
+         my $ob = $pl->ob;
          my $ns = $pl->ns or next;
          $ns->extcmd or next;
-         my $map = $pl->ob->map or next;
+         my $map = $ob->map;
+         my $rgn = $ob->region;
+
+         my $id = join "\x00", $map->path, $rgn->name;
 
          my $faces = delete $ns->{music_play_once};
-         $faces ||= $MUSIC_FACE_CACHE{$map} ||= do {
+         $faces ||= $MUSIC_FACE_CACHE{$id} ||= do {
             # 1. map-specific music info
-            parse_facelist "music/", $map->{music}
+            parse_musiclist $map->{music}
                or do {
                   # 2. fall back to region if no map-specific music
-                  my $rgn = $pl->ob->region
-                     or next;
-
-                  my $par = $rgn;
-                  while () {
-                     last if exists $par->{music};
-                     $par = $par->parent
-                        or last;
-                  }
+                  $rgn = $rgn->parent
+                     while $rgn && !exists $rgn->{music};
 
-                  parse_facelist "music/", $par->{music}
+                  parse_musiclist $rgn->{music}
                }
             ;
          };
@@ -97,7 +125,7 @@
 sub play_music_once {
    my ($pl, $music) = @_;
 
-   $pl->ns->{music_play_once} = parse_facelist "music/", $music;
+   $pl->ns->{music_play_once} = parse_musiclist $music;
 
    undef $MUSIC_QUEUE{$pl->ob->name};
    $MUSIC_SCHEDULER->ready;