psycamp: activate video support

1 files changed, 22 insertions, 18 deletions

diff --git a/bin/psycamp b/bin/psycamp
index ed4ee52..05f936a 100755..100644
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -67,8 +67,10 @@ $UNI = 'psyc://127.0.0.1:1144d/';
 # when running rxaudio, psycamp can only handle .mp3 and .sdj
 #   "part" and "dl" are the temporary filenames of some download tools
 $FILETYPES =
-#%      "(mp3|sdj|part|dl)";                                         #? X
-        "(mp\\d|sdj|part|dl|flac|wav|aif|aiff|ogg|m4a|aac|opus|au)"; #? !X
+#%      "(mp3|sdj|part|dl)";                                        #? X
+        "(mp\\d|sdj|part|dl|flac|wav|aif|aiff|ogg|m4a|aac|opus|au"  #? !X
+# whereas mplayer can also handle video
+        . "|webm|mkv|mov|wmv|avi|asf|flv|vob|ogv|qt|yuv|rm|m\dv|mp\w|mpeg|3gp|3g2|mxf|f4\w)";  #? !X
 #
 # 'makenoise' had support for these formats:
 # "(sea|mod|gz|lha|Z|lzh|zip|s3m)"; # |med|mmd0)";
@@ -96,7 +98,7 @@ $KEEP = 'LOCAL';
 #       16: debug PSYC transactions
 #       32: weird things that shouldn't happen
 #       64: show server pid
-#       128: show songs of same size when using -s S
+#       128: show tracks of same size when using -s S
 #       256: show all output from media engine
 #       512: watch only engine parse
 #       1024: watch timer events (timeout simulation)
@@ -237,9 +239,9 @@ Cannot find ffmpeg. Will not know duration and bitrates of some tracks.
 
 X
         &enqueue(@ARGV);
-        if ($NS) {              # global var for number of enqueued songs
+        if ($NS) {              # global var for number of enqueued tracks
             do {
-                @order = $opt_r ? &randomize : &sortsongs($opt_s);
+                @order = $opt_r ? &randomize : &sorttracks($opt_s);
                 print STDERR "\r[order] ", join(' ', @order), "\n\n" if DEBUG & 8;
                 foreach my $i (@order) {
                     unless ($i) {
@@ -513,9 +515,9 @@ sub next {
 #%      &gin('play');   #? X
         if ($opt_M) {
                 undef $!;
-                $rc = sendmsg ($opt_M, '_notice_play_music_title',
-                     "[_nick] is listening to: [_music_title]",
-                         { _nick => $nick, _music_title => $n
+                $rc = sendmsg ($opt_M, '_notice_play_media_title',
+                     "[_nick] is listening to: [_media_title]",
+                         { _nick => $nick, _media_title => $n
                  } );
                 die "sendmsg $rc: $!" if $!;
                 print STDERR BOLD, YELLOW, "sent to $opt_M!\n", RESET if DEBUG & 16;
@@ -551,7 +553,7 @@ X
                         $any++;
                         printf "%2d.%9d %s\n", $i, $s, $f;
                 }
-                print $any ? "\n" : "<no more songs in playlist>\n\n";
+                print $any ? "\n" : "<no more tracks in playlist>\n\n";
                 print &sep('-');
                 &printinfo;
                 next;
@@ -573,7 +575,7 @@ X
  #{ O
         if ( $ALLOW_DELETE_KEY ) {
             if ( /^T(T?)\s*$/ ) {
-                # 'T' deletes song and remembers it in the index of trash music
+                # 'T' deletes song and remembers it in the index of trash media
                 if (open(HATE, ">>", HATEINDEX)) {
                         printf HATE "%10d %5s %3s\t%s\r\n",
                            $CurrentSize, $I{duration}, $I{bitrate}, $CurrentFile;
@@ -600,7 +602,7 @@ X
                 next;
             }
         }
-        if ( /^(J|U|K|E|M|X|C|S|R)(\w?)\s*$/ ) {
+        if ( /^(J|U|K|E|M|V|X|C|S|R)(\w?)\s*$/ ) {
                 my $r = $2;
                 if ($r and $r ne $1) {
                         print BOLD, RED, ">> command $1$r not defined\n", RESET;
@@ -612,12 +614,13 @@ X
                         $1 eq 'K' ? 'KEEP' :
                         $1 eq 'E' ? 'EDITABLE' :
                         $1 eq 'M' ? 'REMASTER' :
+                        $1 eq 'V' ? 'VOLATILE' :
                         $1 eq 'X' ? 'EXPORT' :
                         $1 eq 'C' ? 'CRITICIZE' :
                         $1 eq 'S' ? 'SECONDARY' : 'REPERTOIRE';
                 my $f = $CurrentFile;
                 $f = $ENV{PWD}. '/'. $f unless $f =~ m!^/!;
-                unless ($f =~ s:\b(SHARE|T|COMPLETE|KEEP|EDITABLE|SECONDARY|REPERTOIRE|NEW|SEEK|TODO|USE|DEEJAY|REMASTER|INCOMING)\b:$t:i)
+                unless ($f =~ s:\b(SHARE|T|COMPLETE|KEEP|EDITABLE|SECONDARY|REPERTOIRE|NEW|SEEK|TODO|USE|DEEJAY|REMASTER|INCOMING|VOLATILE)\b:$t:i)
                 {
                         print BOLD, RED, ">> not applicable for $f\n", RESET;
                         next;
@@ -834,7 +837,7 @@ sub which {
         return $1;
 }
 
-sub sortsongs {
+sub sorttracks {
         my $style = shift;
         return (1 .. $NS) unless $style;
         my @order;
@@ -882,7 +885,7 @@ Same file size $B:
         $file[$b]
 X
                         # we could also be calling cmp, but then we
-                        # are doing a different job than playing music
+                        # are doing a different job than playing media
                 }
                 return $A <=> $B;
         } else {
@@ -960,7 +963,7 @@ sub enqueue {
                 &wanted;
         }
         if (my $new = $NS - $saveNS) {
-               &progress($new, ' songs found');
+               &progress($new, ' tracks found');
                print "\n";
         }
 }
@@ -1257,7 +1260,7 @@ sub exit {
 }
 
 sub load {
-        my $songs = $opt_L? 'songs': 'entries';
+        my $tracks = $opt_L? 'tracks': 'entries';
         local *L;
         return unless open (L, $playlist);
         for ($NS=0; <L>;) {
@@ -1270,7 +1273,7 @@ sub load {
                 $file[$NS++] = $_;
         }
         close L;
-        print YELLOW, "\rLoaded $NS $songs from $playlist \n\n", RESET
+        print YELLOW, "\rLoaded $NS $tracks from $playlist \n\n", RESET
             unless $opt_q;
 }
 sub save {
@@ -1309,7 +1312,7 @@ files:	(o)pen <file>			       immediately load this new song
         <file>              a filename by itself will first fade current song
         (l)ist [<dir>]                                       simply calls 'ls'
         (n)ext                                        next file from playlist
-        '?'                      show a list of the next 9 songs in the queue
+        '?'                     show a list of the next 9 tracks in the queue
         (w)rite or (e)dit playlist
         e(x)it                                  exit without updating playlist
 
@@ -1339,6 +1342,7 @@ the following uppercase commands:
         X = send to EXPORT
         S = send to SECONDARY
         R = send to REPERTOIRE
+        V = send to VOLATILE
 
 If you prefer to execute the command *after* having finished playing it,
 you can schedule the move for later by doubling the command letter. So