--- deliantra/server/ext/player-env.ext	2007/07/11 17:09:06	1.3
+++ deliantra/server/ext/player-env.ext	2007/08/30 08:34:40	1.14
@@ -9,54 +9,66 @@
    return undef
       unless defined $list;
 
-   #TODO
-   [sort grep $_, map +(cf::face::find "$prefix$_"), split /\s*,\s*/, $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
+   ]
 }
 
 our %MUSIC_QUEUE;
+our %MUSIC_FACE_CACHE; # cleared by reload_facedata
 
 our $MUSIC_SCHEDULER = cf::async_ext {
    while () {
       for (keys %MUSIC_QUEUE) {
          delete $MUSIC_QUEUE{$_};
-         my $pl = cf::player::find_active $_
-            or next;
 
-         my $faces;
+         cf::get_slot 0.01, -10, "music scheduler";
 
-         my $map = $pl->ob->map
-            or next;
+         my $pl = cf::player::find_active $_ or next;
+         $pl->ob->active or next;
+         my $ns = $pl->ns or next;
+         $ns->extcmd or next;
+         my $map = $pl->ob->map or next;
+
+         my $faces = $MUSIC_FACE_CACHE{$map} ||= do {
+            # 1. map-specific music info
+            parse_facelist "music/", $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;
+                  }
 
-         # 1. update map-specific music info
-         unless (exists $map->{music_faces}) {
-            $map->{music_faces} = parse_facelist "music/", $map->{music};
-         }
-
-         my $faces = $map->{music_faces};
-
-         # 2. fall back to region if no map-specific music
-         unless ($faces) {
-            my $rgn = $pl->ob->region
-               or next;
-
-            unless (exists $rgn->{music_faces}) {
-               my $par = $rgn;
-               while () {
-                  last if exists $par->{music};
-                  $par = $par->parent
-                     or last;
+                  parse_facelist "music/", $par->{music}
                }
+            ;
+         };
 
-               $rgn->{music_faces} = parse_facelist "music/", $par->{music};
-            }
+         $faces
+            or next;
+
+         my $facestr = join ",", @$faces;
+         $ns->{current_music_faces} ne $facestr
+            or next;
 
-            $faces = $rgn->{music_faces};
-         }
+         $ns->{current_music_faces} = $facestr;
 
-         warn "music for $pl is @$faces\n"
-            if $faces;
+         my $pri = 0;
+         $ns->send_face ($_, --$pri - 110)
+            for @$faces;
+         $ns->flush_fx;
 
-         cf::cede_to_tick;
+         $ns->ext_msg (ambient_music => $faces);
       }
       Coro::schedule unless %MUSIC_QUEUE;
    }