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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.113 by root, Thu Jul 12 17:56:51 2007 UTC vs.
Revision 1.118 by root, Fri Jul 13 15:44:48 2007 UTC

57 57
58 my $faces = $ev->{faces}; 58 my $faces = $ev->{faces};
59 my @songs; 59 my @songs;
60 60
61 # request music from server if appropriate 61 # request music from server if appropriate
62 my $pri = -100; 62 if (my $faces = $ev->{faces}) {
63 for my $face (@$faces) { 63 for (@$faces) {
64 if (defined (my $chksum = $ev->{chksum}{$face})) { 64 my ($face, $pri, $chksum) = @$_;
65 utf8::downgrade $chksum; 65 utf8::downgrade $chksum;
66 66
67 $chksum = unpack "H*", $chksum; 67 $chksum = unpack "H*", $chksum;
68 $self->{music_map}{$face} = $chksum; 68 $self->{music_map}{$face} = $chksum;
69 69
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." }); 70 # check if already cached
71 $self->ask_face ($face, $pri, undef, sub { 71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my $num = $_[0]; 72 my ($meta) = @_;
73 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1];
75 73
76 CFPlus::DB::write_file $chksum, $data, sub { }; 74 if (defined $meta) {
77 CFPlus::DB::put resmap => $chksum => $meta, sub { };
78
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta); 75 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
76 } else {
77 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
78 $self->ask_face ($face, -100 - $pri, undef, sub {
79 my $len = length $_[1];
80 my ($meta, $data) = unpack "(w/a*)*", $_[1];
81
82 CFPlus::DB::write_file $chksum, $data, sub { };
83 CFPlus::DB::put "res-metadata" => $chksum => $meta, sub { };
84
85 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
80 ::message ({ markup => "downloaded song #$face, size $len octets" }); 86 ::message ({ markup => "downloaded song #$face, size $len octets" });
81 87
82 &::audio_music_set ($self->{songs}); 88 &::audio_music_set ($self->{songs});
89 });
90 }
83 }); 91 }
84 } 92 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 } 93 }
89 94
90 &::audio_music_set ($self->{songs} = \@songs); 95 if (my $play = $ev->{play}) {
96 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
97 }
91 }); 98 });
92 99
93 $self->connect_ext (event_capabilities => sub { 100 $self->connect_ext (event_capabilities => sub {
94 my ($cap) = @_; 101 my ($cap) = @_;
95 102
752} 759}
753 760
754sub set_texture { 761sub set_texture {
755 my ($self, $id, $data) = @_; 762 my ($self, $id, $data) = @_;
756 763
764 return unless $self->{map};
765
757 $self->{texture}[$id] = my $tex = 766 $self->{texture}[$id] = my $tex =
758 new_from_image CFPlus::Texture 767 new_from_image CFPlus::Texture
759 $data, minify => 1, mipmap => 1; 768 $data, minify => 1, mipmap => 1;
760 769
761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 770 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines