Version 0.85vdr-0.85

- Added Norwegian language texts (thanks to Jørgen Tvedt).
- Increased the usleep value in cDvbOsd::Cmd() to 5000 in order to work on
  systems with the KURT/utime-patch (thanks to Guido Fiala).
- Changed the check whether the driver is loaded in runvdr to check for the
  'dvb' module (the last one loaded).
- Fixed repeat function with LIRC (thanks to Stefan Huelswitt).
- Increased the upper limit for the symbol rate to 30000 (thanks to Ulrich
  Röder).
- Made the position of the channel display configurable (thanks to Stefan
  Huelswitt).
- Made the width and height of the OSD configurable (thanks to Stefan Huelswitt).
- DiSEqC support can now be generally enabled/disabled in the Setup menu. This
  may be necessary if your multiswitch gets irritated by the default DiSEqC
  codes '0' (thanks to Markus Lang).
- Fixed replaying in case there is no index file.
- Fixed jumping to an editing mark when replay has been paused.
- Avoiding unnecessary code execution in the replay progress display (thanks
  to Guido Fiala).
- When entering time values the digits that still have to be entered are now
  shown as '-' (as in "1-:--").
- When setting an editing mark while the progress display is not active, the
  display will now be turned on for a short while to indicate the successful
  setting of the mark.
- Updated 'channels.conf' for Premiere World (thanks to Helmut Schächner).
  Check your timers if you use this channels.conf file, since the sequence of
  several PW channels has been changed.
- Changed the color of "Info" messages to "black on green" and that of the
  confirmation messages (like "Delete...") to "black on yellow".
- Fixed display with DEBUG_OSD (it still crashes sometimes, esp. when replaying,
  but I can't seem to find what causes this... any ideas anybody?).
- Avoiding audio/video distortions in 'Transfer Mode' by no longer actually
  tuning the primary interface (which can't receive this channel, anyway).
  Apparently the driver gets irritated when the channel is switched and a
  replay session is started immediately after that.
- Increased timeout until reporting "video data stream broken" when recording.
- Explicitly switching back to the previously active channel after ending a
  replay session (to have it shown correctly in case it was in 'Transfer Mode').

1 files changed, 75 insertions, 54 deletions

diff --git a/Tools/schnitt/cutt b/Tools/schnitt/cutt
index 4e89b7a..1942437 100755
--- a/Tools/schnitt/cutt
+++ b/Tools/schnitt/cutt
@@ -3,10 +3,13 @@
 DIRA=/x2/temp
 DIRB=/x1/temp
 
-if [ -f cut ]; then
+if [ ! -f cut2 ]; then
+  echo Keine Beschreibungsdatei
+  exit 1
+else
   name="`cut2`"
   echo $name
-  count=`cat cut | wc -l`
+  count=`cat cut2 | wc -l`
   let count=count-1
   let test=count%2
   if [ "$test" == "1" ]; then
@@ -16,70 +19,88 @@ if [ -f cut ]; then
 
   file=1
 
-  while [ "$count" != "0" ]
-  do
-    start=`cat cut | tail -n $count | head -n 1`
+  if [ "$count" == "2" ]; then
+    start=`cat cut2 | tail -n $count | head -n 1`
     let count=count-1
-    end=`cat cut | tail -n $count | head -n 1`
-    let count=count-1
-    echo Cutting\&Demuxing from $start to $end
-    schnitt2.pl $start $end | pvademux $DIRA teil$file
-#    schnitt2.pl $start $end | pes2av_pes | pvademux $DIRA teil$file
-    let file=file+1
-  done
-else
-  echo Keine Beschreibungsdatei
-  exit 1
+    end=`cat cut2 | tail -n $count | head -n 1`
+    schnitt2.pl $start $end | avpes2mpeg | cut.pl $DIRA
+    secondway=2
+  else
+    while [ "$count" != "0" ]
+    do
+      start=`cat cut2 | tail -n $count | head -n 1`
+      let count=count-1
+      end=`cat cut2 | tail -n $count | head -n 1`
+      let count=count-1
+      echo Cutting \& Converting from $start to $end
+      schnitt2.pl $start $end | avpes2mpeg > $DIRA/teil$file.mpg
+#      schnitt2.pl $start $end | pvademux $DIRA teil$file
+      let file=file+1
+    done
+  fi
 fi
 
 # Ab hier mkimg
 
-sync
-
-lmplex $DIRA $DIRB `ls -la $DIRA/teil*.m2v | cut -b 30- | sort -n -r | cut -d / -f4`
-
-echo Multiplexing DONE
-
-rm -f $DIRA/teil*.m2v $DIRA/teil*.mp2
+rm cut2
 
 sync
 
-if [ -f $DIRB/teil1.mpg ]; then
-  echo Splitting
+if [ "$secondway" != "2" ]; then
   cd $DIRA
-#  cat $DIRB/teil*.mpg | split -b 723517440
-  cat $DIRB/teil*.mpg | cut.pl
-  rm $DIRB/teil*
-fi
-
-sync
-
-cd $DIRA
+  cut2.pl "$name"
+  if [ -d 2 ]; then
+    count=1
+    cond=0
+
+    while [ "$cond" != "1" ]
+    do
+      echo mkisofs Teil $count
+      mkisofs -r -o $DIRB/image1.raw $count
+      rm -rf $count
+      mv -- $DIRB/image1.raw "$DIRB/${name} CD $count"
+      sync
+      let count=count+1
+      if [ ! -d $count ]; then
+        cond=1
+      fi
+    done
+  else
+    echo mkisofs
+    mkisofs -r -o $DIRB/image1.raw $count
+    rm -rf $count
+    mv -- $DIRB/image1.raw "$DIRB/${name}"
+  fi
+else
 
-if [ -f part2 ]; then
-  count=1
-  cond=0
+  cd $DIRA
 
-  while [ "$cond" != "1" ]
-  do
+  if [ -f part2 ]; then
+    count=1
+    cond=0
+
+    while [ "$cond" != "1" ]
+    do
+      mkdir a
+      mv "part$count" "a/${name} CD $count.mpg"
+      echo mkisofs Teil $count
+      mkisofs -r -o $DIRB/image1.raw a
+      rm -rf a
+      mv -- $DIRB/image1.raw "$DIRB/${name} CD $count"
+      sync
+
+      let count=count+1
+      if [ ! -f "part$count" ]; then
+        cond=1
+      fi
+    done
+  else
     mkdir a
-    mv "part$count" "a/${name} Teil $count"
-    echo mkisofs Teil $count
+    mv part1 "a/${name}.mpg"
+    echo mkisofs
     mkisofs -r -o $DIRB/image1.raw a
     rm -rf a
-    mv -- $DIRB/image1.raw "$DIRB/${name} Teil $count"
-    sync
-
-    let count=count+1
-    if [ ! -f "part$count" ]; then
-      cond=1
-    fi
-  done
-else
-  mkdir a
-  mv part1 "a/${name}"
-  echo mkisofs
-  mkisofs -r -o $DIRB/image1.raw a
-  rm -rf a
-  mv -- $DIRB/image1.raw "$DIRB/${name}"
+    mv -- $DIRB/image1.raw "$DIRB/${name}"
+  fi
 fi
+