From 49c04b11b1b4c9e448b6728940b4d6dd7c34b4c9 Mon Sep 17 00:00:00 2001
From: data <data@a0fa61bc-5347-0410-a1a9-7f54aa4e1825>
Date: Sat, 29 Jan 2005 15:23:19 +0000
Subject: [PATCH]  r12@keebo:  data | 2005-01-24T21:38:49.651783Z  More bits
 merged to get PIPES working

git-svn-id: http://abcde.googlecode.com/svn/trunk@41 a0fa61bc-5347-0410-a1a9-7f54aa4e1825
---
 abcde | 40 ++++++++++++++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/abcde b/abcde
index 757f087..4a28dda 100755
--- a/abcde
+++ b/abcde
@@ -1590,13 +1590,27 @@ do_cdread ()
 	fi
 	CDDBTRACKNUM=$(expr $UTRACKNUM - 1)
 	WAVDATA="$ABCDETEMPDIR/track$UTRACKNUM.wav"
-	OUTDATA="$ABCDETEMPDIR/track$UTRACKNUM.$OUTPUTTYPE"
 	if [ -r "$CDDBDATA" ]; then
 		TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\])
 		echo "Grabbing track $UTRACKNUM: $TRACKNAME..." >&2
 	else
 		echo "Grabbing track $UTRACKNUM..." >&2
 	fi
+	if [ "$USEPIPES" = "y" ]; then
+		TEMPARG="PIPE_$CDROMREADERSYNTAX"
+		FILEARG=${!TEMPARG}
+		REDIR=""
+	else
+		case "$CDROMREADERSYNTAX" in
+			dagrab)
+				FILEARG="-f $WAVDATA"
+				;;
+			*)
+				FILEARG=$WAVDATA
+				;;
+		esac
+		REDIR=">&2"
+	fi
 	case "$CDROMREADERSYNTAX" in
 		cdparanoia) nice $READNICE $CDROMREADER -d $CDROM $UTRACKNUM "$WAVDATA" >&2 ;;
 		cdda2wav)
@@ -1637,10 +1651,18 @@ do_cdread ()
 		if [ "$RETURN" = "0" -a ! -s "$WAVDATA" ]; then
 			RETURN=73 # fake a return code as cdparanoia return 0 also on aborted reads
 		fi
-		echo "readtrack-$UTRACKNUM: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
+		if [ "$USEPIPES" = "y" ]; then
+			echo "readencodetrack-$UTRACKNUM: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
+		else
+			echo "readtrack-$UTRACKNUM: $CDROMREADER returned code $RETURN" >> "$ABCDETEMPDIR/errors"
+		fi
 		return $RETURN
 	else
-		echo readtrack-$UTRACKNUM >> "$ABCDETEMPDIR/status"
+		if [ "$USEPIPES" = "y" ]; then
+			echo readencodetrack-$UTRACKNUM >> "$ABCDETEMPDIR/status"
+		else
+			echo readtrack-$UTRACKNUM >> "$ABCDETEMPDIR/status"
+		fi
 	fi
 }
 
@@ -2277,8 +2299,14 @@ else
 	for UTRACKNUM in $TRACKQUEUE
 	do
 		if [ "$DOREAD" = "y" ]; then
-			if checkstatus readtrack-$UTRACKNUM; then :; else
-				do_cdread $UTRACKNUM
+			if [ "$USEPIPES" = "y" ]; then
+				if checkstatus readencodetrack-$UTRACKNUM; then :; else
+					do_cdread $UTRACKNUM | do_encode $UTRACKNUM %local0%
+				fi
+			else
+				if checkstatus readtrack-$UTRACKNUM; then :; else
+					do_cdread $UTRACKNUM
+				fi
 				if [ "$?" != "0" ]; then
 					# CD read failed - don't give the goahead to
 					# the encoder
@@ -2408,7 +2436,7 @@ do
 	read GOAHEAD # For blocking - will contain either "NO" or "NEXTTRACK"
 	if [ "$GOAHEAD" = "NO" ]; then break; fi
 	# find out where this track is to be encoded
-	if [ "$DOENCODE" = "y" ]; then
+	if [ "$DOENCODE" = "y" -a "$USEPIPES" != "y" ]; then
 		# Make sure we have a place to encode this, if not, exit stage right
 		if [ -z "$ENCODELOCATIONS" ]; then
 			continue
-- 
2.20.1