fade volume before skipping to next track

1 files changed, 41 insertions, 16 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 06130d3..7e52a16 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -208,6 +208,8 @@ $playlist="$tmpdir/playlist-$ENV{USER}.m3u";
         use Date::Format qw( time2str );    ## T
         use IPC::Open3 qw( open3 );
         use Net::PSYC qw( :event );
+        # would need to extend this to actually use it:
+        #use Audio::Play::MPlayer;
 
         *name   = *File::Find::name;    # ugly style works
         $scan = 0;
@@ -226,7 +228,7 @@ MAIN: {
 
         print "Using playlist: $playlist\n" if $opt_v;
         if ($opt_h) {
-                print BOLD, BLACK, &head, YELLOW, <<X, BOLD, BLUE, &sorthelp, RESET;
+                print BOLD, BLACK, &head, RESET, <<X, &sorthelp;
 
 usage: $0 [<flags>] [-b <uniform>] [-n <nick>] [-s <mode>]
           [-M <UNI>] [-S <screen>] [<files|dirs>]
@@ -332,8 +334,7 @@ X
             &load unless $opt_x;
             system "$ENV{EDITOR} $playlist;clear" if $opt_e;
         }
-        #exec "xaudio `cat $playlist`" if $opt_x;
-        exec 'mplayer "`cat $playlist`"' if $opt_x;
+        exec '$has_mplayer "`cat $playlist`"' if $opt_x;
         #exec "mpg123 --remain --aggressive -@ $playlist" if $opt_x;
 
         print STDERR BOLD, YELLOW, "binding to $opt_b ...\n", RESET if DEBUG & 16 && $opt_b;
@@ -372,7 +373,14 @@ X
         $CS = -1;       # global var for current song
 
         &next(0);
-#       &vol(100);
+        # ah wait, selecting PCM by command doesn't even work.
+        # rgrep USEMASTER in source shows that 'use_master'
+        # to toggle PCM doesn't even exist. great docs!  :D
+        #&gin('use_master');
+        # if we don't want to raise volume to 100% at start then
+        # we have to disable the fade-on-next logic as well.
+        # let's try to make mplayer use PCM instead of Master.
+        &vol( $Volume = $VOL );
         $|=1;
 
         # Net::PSYC::Event doesn't support idle events yet.. TODO
@@ -775,7 +783,8 @@ sub gin {
 sub fade {
         my $s = shift;
 #%      $s = 33 unless $s;      #? X
-        $s = 12 unless $s;      #? !X
+        # 12 when using Master
+        $s = 3 unless $s;       #? !X
         my $p = shift;
         $p = 0.4 unless $p;
         foreach $i ( reverse @VV ) {
@@ -841,6 +850,7 @@ sub seek {
         return 1;
 }
 
+# FIXME: duration isn't essential, but annoying not to have
 sub duration {
         my $t = shift;
 
@@ -877,8 +887,9 @@ sub which {
 sub sortsongs {
         my $style = shift;
         return (1 .. $NS) unless $style;
-        lc $style;
+#       lc $style; -- eh? this breaks half of the algorithms
         my @order;
+        print STDERR "sorting by_$style 1 .. $NS\n" if DEBUG & 8;
         eval "\@order = sort by_$style 1 .. $NS";
         croak <<X, &sorthelp if $@;
 invalid sort option '$style'
@@ -890,23 +901,32 @@ sub sorthelp { return <<X; }
 available sort algorithms:
         n(ame)          # sorts by file path (directory first)
         N(ame)          # sorts by file ending (reverse of -n)
-        nr              # gives an order by name a slight shuffle
-        cr              # gives the order given on commandline a slight shuffle
         s(ize)          # hear silly small sound snippets first
         S(ize)          # hear big epic pieces first
         m(odification)  # hear newest tracks first
         M(odification)  # hear oldest tracks first
         a(ccessTime)    # hear tracks you haven't heard in a long time first
         A(ccessTime)    # hear tracks you recently accessed first
+        cr              # gives the order given on commandline a slight shuffle
+
+you can append 'r' to each algorithm (as in 'nr' or 'Ar') to apply a slight 
+random shuffle of the items while roughly following the sorting principle.
 X
         # r(andom)      # bad randomizer algorithm (use -r instead)
-sub by_n { $file[$a] cmp $file[$b]; }
-sub by_N { reverse($file[$a]) cmp reverse($file[$b]); }
 # this actually produces VERY pseudo random results, says randal
 # see http://www.perlmonks.org/?node_id=199901
 sub by_r { rand(10) < 5; }
 sub by_nr { rand(9) > 3 ? &by_n : &by_r; }
+sub by_Nr { rand(9) > 3 ? &by_N : &by_r; }
 sub by_cr { rand(9) > 3 ? $a <=> $b : &by_r; }
+sub by_sr { rand(9) > 3 ? &by_s : &by_r; }
+sub by_Sr { rand(9) > 3 ? &by_S : &by_r; }
+sub by_mr { rand(9) > 3 ? &by_m : &by_r; }
+sub by_Mr { rand(9) > 3 ? &by_M : &by_r; }
+sub by_ar { rand(9) > 3 ? &by_a : &by_r; }
+sub by_Ar { rand(9) > 3 ? &by_A : &by_r; }
+sub by_n { $file[$a] cmp $file[$b]; }
+sub by_N { reverse($file[$a]) cmp reverse($file[$b]); }
 sub by_m { $date[$a] <=> $date[$b]; }
 sub by_M { $date[$b] <=> $date[$a]; }
 sub by_a { $adate[$a] <=> $adate[$b]; }
@@ -1037,7 +1057,7 @@ sub progress {
         my $tx = join('', @_);
         my $len = length $tx;
         print "\r", GREEN, $tx, RESET, ' ';
-        print '_' x (74-$len), ' ' if $len < 74;
+        print '_' x (76-$len), ' ' if $len < 76;
         print "\n" if DEBUG & 1;
 }
 
@@ -1067,7 +1087,13 @@ sub ginparse {
                 }
                 return 0;
         }
-        print STDERR BOLD, BLUE, $_, RESET if $opt_V or DEBUG & 512;
+        if ($opt_V or DEBUG & 512) {
+ #{ !X
+                return if / supported but disabled$/;
+                return if /^(Configuration: --|CommandLine:|get_path)/;
+ #} !X
+                print STDERR BOLD, BLUE, $_, RESET;
+        }
  #{ X
 #%      if (/^MSG notify duration \[(\d+)\]/) {
 #%              # kludge to get around a bug in xaudio (duration output twice)
@@ -1175,8 +1201,6 @@ sub ginparse {
                 print GREEN, $txt, RESET, "\n" if $opt_v;
                 return 0;
         }
-        return if / supported but disabled$/; # unimportant
-        return if /^Configuration: --prefix/; # useless ffmpeg compilation infos
  #} X
         return $_;
 }
@@ -1197,11 +1221,12 @@ sub ginstart {
  #: X
         # -v is needed to receive the EOF!
         # '-osdlevel', '3' can be useful
-        $pid = open3( \*W, \*R, \*R, $has_mplayer, '-slave', '-idle', '-v', '-fs', '-zoom', '-screen', $opt_S || $screen );
+        # to allow for fading we want to have the PCM channel,
+        # this works for ALSA - does it fail otherwise?
+        $pid = open3( \*W, \*R, \*R, $has_mplayer, '-slave', '-idle', '-v', '-fs', '-zoom', '-screen', $opt_S || $screen, '-mixer-channel', 'PCM' );
         R->blocking(0);
         $pid || die "$has_mplayer: $!";
         &ginxpect('^MPlayer');
-        &gin('use_master');
  #} X
         print STDERR <<X if DEBUG & 64;
 audio engine running as $pid