psycamp: when media file is corrupt, mplayer may get stuck

1 files changed, 11 insertions, 6 deletions

diff --git a/bin/psycamp b/bin/psycamp
index d73403b..c996173 100755
--- a/bin/psycamp
+++ b/bin/psycamp
@@ -306,7 +306,7 @@ X
         $|=1;
 
         # Net::PSYC::Event doesn't support idle events yet.. TODO
-#%      add(3, 'i', \&timeout, 1);      #? X
+        add(3, 'i', \&timeout, 1);
         # higher frequency necessary to detect timeouts this way..
         # then again, if it's too high timer is sometimes faster
         # than rxaudio and produces an erroneous kick..
@@ -325,9 +325,9 @@ sub head {
         return $rc . $AUTHOR ."\n". &sep('-');
 }
 
+sub timeout {
+    if (!$paused) {
  #{ X
-#%sub timeout {
-#%    if (!$paused) {
 #%      # HACK for rxaudio which sometimes gets enchanted
 #%      #y $trick = rand(2)>1 ? 'pause' : 'seek 1 1';
 #%      #y $trick = ('pause', 'seek 1 1', 'play')[rand(3)];
@@ -338,10 +338,14 @@ sub head {
 #%      &gin('seek 1 1'); #? X
 #%      &gin('seek 0 1'); #? !X
 #%      &gin('pause'); #? !X
-#%    }
-#%    return 3;
-#%}
+ #: X
+        print RED, "\n*** Playback problem. ", RESET, "Skipping $OpenedFile\n";
+        # so far timeout only happens when the input file is b0rked, so we skip it
+        &next(0);
  #} X
+    }
+    return 3;
+}
 
 sub ginread {
     $_ = <R>;
@@ -493,6 +497,7 @@ sub open {
                 &gin("pausing_keep_force pt_step 1");
                 &gin("get_property pause");     # ANS_pause=no
  #} X
+                $OpenedFile = $file;
                 $DUR = 0;
                 &sleep(0.3);    # have to wait for file to load?
                 $scan=0, &seek(5) if $scan;