| … | |
… | |
| 48 | sort { (length $a) <=> (length $b) } |
48 | sort { (length $a) <=> (length $b) } |
| 49 | @args |
49 | @args |
| 50 | } sort { $a->{par} <=> $b->{par} } |
50 | } sort { $a->{par} <=> $b->{par} } |
| 51 | CFPlus::Pod::find command => "*"; |
51 | CFPlus::Pod::find command => "*"; |
| 52 | |
52 | |
| 53 | $self->connect_ext (music => sub { |
53 | $self->connect_ext (ambient_music => sub { |
| 54 | my ($ev) = @_; |
54 | my ($songs) = @_; |
| 55 | |
55 | &::audio_music_set_ambient ($songs); |
| 56 | &::audio_music_set ($self->{songs} = $ev->{play}) |
|
|
| 57 | if $ev->{play}; |
|
|
| 58 | }); |
56 | }); |
| 59 | |
57 | |
| 60 | $self->connect_ext (capabilities => sub { |
58 | $self->connect_ext (capabilities => sub { |
| 61 | my (%cap) = @_; |
59 | my (%cap) = @_; |
| 62 | |
60 | |
| … | |
… | |
| 758 | $self->{music_meta}{$facenum} = $face; |
756 | $self->{music_meta}{$facenum} = $face; |
| 759 | |
757 | |
| 760 | ::message ({ markup => "downloaded song #$facenum" }) |
758 | ::message ({ markup => "downloaded song #$facenum" }) |
| 761 | if $changed; |
759 | if $changed; |
| 762 | |
760 | |
| 763 | &::audio_music_set ($self->{songs}); |
761 | &::audio_music_push ($facenum); |
| 764 | }; |
762 | }; |
| 765 | } elsif ($face->{type} == 5) { # FT_SOUND |
763 | } elsif ($face->{type} == 5) { # FT_SOUND |
| 766 | $cb = sub { |
764 | $cb = sub { |
| 767 | $self->{sound_meta}{$facenum} = $face; |
765 | $self->{sound_meta}{$facenum} = $face; |
| 768 | |
766 | |
| 769 | use Data::Dumper; warn Dumper $face;#d# |
|
|
| 770 | ::message ({ markup => "downloaded sound #$facenum" }) |
767 | ::message ({ markup => "downloaded sound #$facenum" }) |
| 771 | if $changed; |
768 | if $changed; |
|
|
769 | |
|
|
770 | &::audio_sound_push ($facenum); |
| 772 | }; |
771 | }; |
| 773 | } |
772 | } |
| 774 | |
|
|
| 775 | |
773 | |
| 776 | if ($changed) { # new data |
774 | if ($changed) { # new data |
| 777 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
775 | my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; |
| 778 | |
776 | |
| 779 | CFPlus::DB::put res_data => $face->{name} => $data, sub { |
777 | CFPlus::DB::put res_data => $face->{name} => $data, sub { }; |
| 780 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
778 | CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { |
| 781 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
779 | $face->{meta} = $self->{json_coder}->decode ($meta_json); |
| 782 | |
|
|
| 783 | $cb->(); |
780 | $cb->(); |
| 784 | }; |
|
|
| 785 | }; |
781 | }; |
| 786 | |
782 | |
| 787 | } else { |
783 | } else { |
| 788 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
784 | $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); |
| 789 | $cb->(); |
785 | $cb->(); |
| … | |
… | |
| 823 | @{$self->{face_cb}{$id}}; |
819 | @{$self->{face_cb}{$id}}; |
| 824 | } |
820 | } |
| 825 | } |
821 | } |
| 826 | |
822 | |
| 827 | sub sound_play { |
823 | sub sound_play { |
| 828 | my ($self, $x, $y, $soundnum, $type) = @_; |
824 | my ($self, $type, $face, $dx, $dy, $vol) = @_; |
| 829 | warn "sound play <@_>\n";#d# |
|
|
| 830 | |
825 | |
| 831 | #$self->{sound_play}->($x, $y, $soundnum, $type); |
826 | &::audio_sound_play ($face, $dx, $dy, $vol) |
|
|
827 | unless $type & 1; # odd types are silent for future expansion |
| 832 | } |
828 | } |
| 833 | |
829 | |
| 834 | my $LAST_QUERY; # server is stupid, stupid, stupid |
830 | my $LAST_QUERY; # server is stupid, stupid, stupid |
| 835 | |
831 | |
| 836 | sub query { |
832 | sub query { |
