[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.161 by root, Thu Jul 5 06:57:03 2007 UTC vs.
Revision 1.167 by root, Fri Jul 13 05:31:32 2007 UTC

 our $SDL_ACTIVE;
 our %SDL_CB;
 our $SDL_MIXER;
+our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
+our @MUSIC_WANT;
+our $MUSIC_PLAYING;
+our $MUSIC_PLAYER;
 our @SOUNDS;       # event => file mapping
 our %AUDIO_CHUNKS; # audio files
 our $ALT_ENTER_MESSAGE;
 our $STATUSBOX;
    my ($host, $port) = split /:/, $PROFILE->{host};
    $MAP = new CFPlus::Map;
-   warn "connecting...\n";#d#
    $CONN = eval {
       new CFPlus::Protocol
          host => $host,
          port => $port || 13327,
          user => $PROFILE->{user},
                or return;
             $chunk->play;
          },
    };
-   warn "connected<$CONN,$@>\n";#d#
    if ($CONN) {
       CFPlus::lowdelay fileno $CONN->{fh};
       status "login successful";
    $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
    $SETUP_DIALOG->show;
    $PL_WINDOW->hide;
    $SPELL_LIST->clear_spells;
    $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
+   &audio_music_set ([]);
    return unless $CONN;
    status "connection closed";
    CFPlus::OpenGL::shutdown;
    undef $SDL_ACTIVE;
 }
-my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
-my $bgmusic;#TODO#hack#d#
 sub audio_channel_finished {
    my ($channel) = @_;
    #warn "channel $channel finished\n";#d#
 }
+sub audio_music_set {
+   my ($songs) = @_;
+   my $count = @$songs;
+   my @meta;
+   for my $name (@$songs) {
+      CFPlus::DB::get "res-metadata" => $name, sub {
+         my ($data) = @_;
+         if ($data) {
+            $data = JSON::XS->new->utf8->decode ($data);
+            $data->{path} = CFPlus::DB::path_of $name;
+            push @meta, $data;
+         }
+         unless (--$count) {
+            if (@meta) {
+               @MUSIC_WANT = @meta;
+               &audio_music_changed ();
+            }
+         }
+      };
+   }
+}
+sub audio_music_changed {
+   return unless $CFG->{bgm_enable};
+   # default MUSIC_WANT == MUSIC_DEFAULT
+   @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
+   # if the currently playing song is acceptable, let it continue
+   return if $MUSIC_PLAYING
+             && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
+   if ($MUSIC_PLAYING) {
+      CFPlus::MixMusic::fade_out 1000;
+   } else {
+      my $music = $MUSIC_WANT [rand @MUSIC_WANT];
+      $MUSIC_PLAYING = $music;
+      $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path};
+      $MUSIC_PLAYER->play (0);
+   }
+}
 sub audio_music_finished {
-   return unless $CFG->{bgm_enable};
+   $MUSIC_PLAYING = undef;
+   undef $MUSIC_PLAYER;
-   # TODO: hack, do play loop and mood music
+   audio_music_changed;
-   $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
-   $bgmusic->play (0);
-   push @bgmusic, shift @bgmusic;
 }
 sub audio_init {
    if ($CFG->{audio_enable}) {
       if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.161 by root, Thu Jul 5 06:57:03 2007 UTC vs. Revision 1.167 by root, Fri Jul 13 05:31:32 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.161 by root, Thu Jul 5 06:57:03 2007 UTC vs.
Revision 1.167 by root, Fri Jul 13 05:31:32 2007 UTC