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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.155 by root, Sat May 12 08:13:34 2007 UTC vs.
Revision 1.168 by root, Sat Jul 14 12:05:53 2007 UTC

 #!/opt/bin/perl
 my $startup_done = sub { };
+our $PANGO = "1.5.0";
 # do splash-screen thingy on win32
 BEGIN {
    if (%PAR::LibCache && $^O eq "MSWin32") {
       while (my ($filename, $zip) = each %PAR::LibCache) {
       if ($^O eq "MSWin32") {
          # relocatable
       } else {
          # unix, need to patch pango rc file
-         open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules"
+         open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
-            or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!";
+            or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
          local $/;
          my $rc = <$fh>;
          $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
          mkdir "$tmp/pango-modules";
 our $SDL_ACTIVE;
 our %SDL_CB;
 our $SDL_MIXER;
+our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
+our @MUSIC_WANT;
+our $MUSIC_START;
+our $MUSIC_PLAYING;
+our $MUSIC_PLAYER;
+our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
 our @SOUNDS;       # event => file mapping
 our %AUDIO_CHUNKS; # audio files
 our $ALT_ENTER_MESSAGE;
 our $STATUSBOX;
    $LOGIN_BUTTON->set_text ("Login");
    $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";
    $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
    $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
    $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
    $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
    $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
-   $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
+   $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
    my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
    for my $x (0..2) {
       for my $y (0 .. 2) {
       has_close_button => 1
    ;
    my $ntb =
       $PL_NOTEBOOK =
-         new CFPlus::UI::Notebook expand => 1, debug => 1;
+         new CFPlus::UI::Notebook expand => 1;
    $ntb->add (
       "Statistics (F2)" => $STATS_PAGE = stats_window,
       "Shows statistics, where all your Stats and Resistances are shown."
    );
    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 @want =
+      grep $_,
+         map $CONN->{music_meta}{$_},
+            @$songs;
+   if (@want) {
+      @MUSIC_WANT = @want;
+      &audio_music_changed ();
+   }
+}
+sub audio_music_start {
+   my $path = $MUSIC_PLAYING->{path}
+      or return;
+   CFPlus::DB::prefetch_file $path, 1024_000, sub {
+      # music might have changed...
+      $path eq $MUSIC_PLAYING->{path}
+         or return &audio_music_start ();
+      $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
+      my $NOW = time;
+      if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
+         my $pos = $MUSIC_PLAYING->{stop_pos};
+         $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
+         $MUSIC_START = time - $pos;
+      } else {
+         $MUSIC_PLAYER->play (0);
+         $MUSIC_START = time;
+      }
+      delete $MUSIC_PLAYING->{stop_time};
+      delete $MUSIC_PLAYING->{stop_pos};
+   }
+}
+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;
+   my $NOW = time;
+   if ($MUSIC_PLAYING) {
+      $MUSIC_PLAYING->{stop_time} = $NOW;
+      $MUSIC_PLAYING->{stop_pos}  = $NOW - $MUSIC_START;
+      CFPlus::MixMusic::fade_out 1000;
+   } else {
+      # sort by stop time, oldest first
+      @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
+      # if the most recently-played piece played very recently,
+      # resume it, else choose the oldest piece for rotation.
+      $MUSIC_PLAYING =
+         $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
+            ? $MUSIC_WANT[-1]
+            : $MUSIC_WANT[0];
+      audio_music_start;
+   }
+}
 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.155 by root, Sat May 12 08:13:34 2007 UTC vs. Revision 1.168 by root, Sat Jul 14 12:05:53 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.155 by root, Sat May 12 08:13:34 2007 UTC vs.
Revision 1.168 by root, Sat Jul 14 12:05:53 2007 UTC