psycamp: considering quiet music

1 files changed, 10 insertions, 5 deletions

diff --git a/bin/psycamp b/bin/psycamp
index 49ffd53..1ecfff2 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -141,6 +141,9 @@ my $screen = 0;
         use Term::ReadKey qw(GetTerminalSize);
         ($TWIDTH, $THEIGHT) = GetTerminalSize();
 
+#       binmode STDERR, ":encoding(UTF-8)";
+#       binmode STDOUT, ":encoding(UTF-8)";
+
         *name   = *File::Find::name;    # ugly style works
         my %I;
         my $CDUR = 0;
@@ -264,7 +267,7 @@ X
         }
         if ($opt_x) {
                 # "mpg123 --remain --aggressive -@ $playlist"
-                my $exec = $has_mplayer .' -fs -zoom -playlist '. $playlist;
+                my $exec = $has_mplayer .' -quiet -fs -zoom -playlist '. $playlist;
                 print STDERR "\n$exec\n";
                 exec $exec;
         }
@@ -629,7 +632,7 @@ X
                 next;
             }
         }
-        if ( /^(J|U|K|E|M|V|Q|X|C|F|L|W|S|R|Y)(\w?)\s*$/ ) {
+        if ( /^(J|U|K|E|M|V|Q|O|X|C|F|L|W|S|R|Y)(\w?)\s*$/ ) {
                 my $r = $2;
                 if ($r and $r ne $1) {
                         &say(BOLD, RED, ">> command $1$r not defined", RESET);
@@ -642,7 +645,8 @@ X
                         $1 eq 'E' ? 'EDITABLE' :
                         $1 eq 'M' ? 'REMASTER' :
                         $1 eq 'V' ? 'VOLATILE' :
-                        $1 eq 'Q' ? 'COOL' :
+                        $1 eq 'Q' ? 'QUIET' :
+                        $1 eq 'O' ? 'COOL' :
                         $1 eq 'X' ? 'EXPORT' :
                         $1 eq 'Y' ? 'EASY' :
                         $1 eq 'C' ? 'CRITICIZE' :
@@ -654,7 +658,7 @@ X
                 $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!;
                 my $f2 = $f;
                 # the initial (.*) is a hack to make the regexp match the last occurance in the path string rather than earlier ones
-                unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i)
+                unless ($f =~ s:^(.*)/(SHARE|T|COMPLETE|KEEP|EDITABLE|FAVES|WRONG|SECONDARY|REPERTOIRE|NEW|TODO|USE|DEEJAY|REMASTER|CRITICIZE|EASY|INCOMING|incomingDJ|EXPORT|VOLATILE|L8R|QUIET|COOL|CHAOS|DJ|byArtist|byGenre|vol)\d?/:\1/$t/:i)
                 {
                         &say(BOLD, RED, ">> not applicable for $f", RESET);
                         next;
@@ -1484,7 +1488,8 @@ the following uppercase commands:
         K = send to KEEP
         L = send to L8R
         M = send to REMASTER
-        Q = send to COOL
+        Q = send to QUIET
+        O = send to COOL
         R = send to REPERTOIRE
         S = send to SECONDARY
         S = send to USE