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.120 by root, Sat Jul 14 13:04:42 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 # check if already cached
71 CFPlus::DB::get "res-metadata" => $chksum, sub {
72 my ($meta_json) = @_;
73 my $path = CFPlus::DB::path_of_res $chksum;
74
75 if (defined $meta_json) {
76 my $meta = $self->{json_coder}->decode ($meta_json);
77 $meta->{path} = $path;
78 $self->{music_meta}{$chksum} = $meta;
79 } else {
70 ::message ({ markup => "starting to download song #$face, check your output-rate setting if your connection gets laggy." }); 80 ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
71 $self->ask_face ($face, $pri, undef, sub { 81 $self->ask_face ($face, -100 - $pri, undef, sub {
72 my $num = $_[0];
73 my $len = length $_[1]; 82 my $len = length $_[1];
74 my ($meta, $data) = unpack "(w/a*)*", $_[1]; 83 my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
75 84
76 CFPlus::DB::write_file $chksum, $data, sub { }; 85 CFPlus::DB::write_file $path, $data, sub {
77 CFPlus::DB::put resmap => $chksum => $meta, sub { }; 86 CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
87 my $meta = $self->{json_coder}->decode ($meta_json);
88 $meta->{path} = $path;
89 $self->{music_meta}{$chksum} = $meta;
78 90
79 $self->{music_meta}{$chksum} = $self->{json_coder}->decode ($meta);
80 ::message ({ markup => "downloaded song #$face, size $len octets" }); 91 ::message ({ markup => "downloaded song #$face, size $len octets" });
81
82 &::audio_music_set ($self->{songs}); 92 &::audio_music_set ($self->{songs});
93 };
94 };
95 });
96 }
83 }); 97 }
84 } 98 }
85
86 push @songs, $self->{music_map}{$face};
87 --$pri;
88 } 99 }
89 100
90 &::audio_music_set ($self->{songs} = \@songs); 101 if (my $play = $ev->{play}) {
102 &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
103 }
91 }); 104 });
92 105
93 $self->connect_ext (event_capabilities => sub { 106 $self->connect_ext (event_capabilities => sub {
94 my ($cap) = @_; 107 my ($cap) = @_;
95 108
752} 765}
753 766
754sub set_texture { 767sub set_texture {
755 my ($self, $id, $data) = @_; 768 my ($self, $id, $data) = @_;
756 769
770 return unless $self->{map};
771
757 $self->{texture}[$id] = my $tex = 772 $self->{texture}[$id] = my $tex =
758 new_from_image CFPlus::Texture 773 new_from_image CFPlus::Texture
759 $data, minify => 1, mipmap => 1; 774 $data, minify => 1, mipmap => 1;
760 775
761 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 776 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines