[packages/esound.git] / esound-esddsp.in.patch

--- esound-0.2.22/esddsp.in~	Wed Aug 29 20:45:25 2001
+++ esound-0.2.22/esddsp.in	Wed Aug 29 21:03:22 2001
@@ -11,67 +11,72 @@
     case "$1" in
 
 	-h|--help)
-	    echo "esddsp - attempt to reroute audio device to esd"
-	    echo " "
-	    echo "esddsp [options] player arguments"
-	    echo " "
-	    echo "options:"
-	    echo "-h, --help                show brief help"
-	    echo "-s, --server=HOST:PORT    contact esd server on host at port"
-	    echo "-m, --mixer               enable mixer support"
-	    echo "-n, --name=NAME           use name to identify player to esd"
-	    echo "-v, --verbose             show parameters"
-	    exit 0
-	    ;;
+		echo "esddsp - attempt to reroute audio device to esd"
+		echo " "
+		echo "esddsp [options] player arguments"
+		echo " "
+		echo "options:"
+		echo "-h, --help                show brief help"
+		echo "-s, --server=HOST:PORT    contact esd server on host at port"
+		echo "-m, --mixer               enable mixer support"
+		echo "-n, --name=NAME           use name to identify player to esd"
+		echo "-v, --verbose             show parameters"
+		exit 0
+		;;
 
 	-s)
-	    shift
-	    if test $# -gt 0; then
-		export ESPEAKER=$1
-	    else
-		echo "no server specified"
-		exit 1
-	    fi
-	    shift
-	    ;;
+		shift
+		if test $# -gt 0; then
+			ESPEAKER=$1
+			export ESPEAKER
+		else
+			echo "no server specified"
+			exit 1
+		fi
+		shift
+		;;
 
 	--server*)
-	    export ESPEAKER=`echo $1 | sed -e 's/^[^=]*=//g'`
-	    shift
-	    ;;
+		ESPEAKER=`echo $1 | sed -e 's/^[^=]*=//g'`
+		export ESPEAKER
+		shift
+		;;
 
 	-m|--mixer)
-	    export ESDDSP_MIXER=1
-	    shift
-	    ;;
+		ESDDSP_MIXER=1
+		export ESDDSP_MIXER
+		shift
+		;;
 
 	-n)
-	    shift
-	    if test $# -gt 0; then
-		export ESDDSP_NAME=$1
-	    else
-		echo "no player name specified"
-		exit 1
-	    fi
-	    shift
-	    set_name=1
-	    ;;
+		shift
+		if test $# -gt 0; then
+			ESDDSP_NAME=$1
+			export ESDDSP_NAME
+		else
+			echo "no player name specified"
+			exit 1
+		fi
+		shift
+		set_name=1
+		;;
 
 	--name*)
-	    export ESDDSP_NAME=`echo $1 | sed -e 's/^[^=]*=//g'`
-	    set_name=1
-	    shift
-	    ;;
+		ESDDSP_NAME=`echo $1 | sed -e 's/^[^=]*=//g'`
+		export ESDDSP_NAME
+		set_name=1
+		shift
+		;;
 
 	-v|--verbose)
-	    verbose=1
-	    shift
-	    ;;
+		verbose=1
+		shift
+		;;
 
 	*)
-	    # no more esddsp options, get on with life
-	    break
-	    ;;
+		# no more esddsp options, get on with life
+		break
+		;;
     esac
 done
 
@@ -82,19 +87,15 @@
 
 # echo options if verbose specified
 if test "$verbose" = 1; then
-    echo "server:        $ESPEAKER"
-    echo "name:          $ESDDSP_NAME"
-    echo "command line:  $@"
+	echo "server:        $ESPEAKER"
+	echo "name:          $ESDDSP_NAME"
+	echo "command line:  $@"
 fi
 
-# setup esd to hijack calls made to /dev/dsp
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-
 # Don't try to connect to esd if it isn't running
 #if [ ! "x`pidof esd`" = "x" ]; then
-   export LD_PRELOAD="${libdir}/libesddsp.so.0:${libdir}/libesd.so.0"
+	LD_PRELOAD="@libdir@/libesddsp.so.0:@libdir@/libesd.so.0"
+	export LD_PRELOAD
 #fi
 
 # invoke the program with the args given
Commit	Line	Data
43b7c414	1	--- esound-0.2.22/esddsp.in~ Wed Aug 29 20:45:25 2001
	2	+++ esound-0.2.22/esddsp.in Wed Aug 29 21:03:22 2001
	3	@@ -11,67 +11,72 @@
	4	case "$1" in
	5
	6	-h\|--help)
	7	- echo "esddsp - attempt to reroute audio device to esd"
	8	- echo " "
	9	- echo "esddsp [options] player arguments"
	10	- echo " "
	11	- echo "options:"
	12	- echo "-h, --help show brief help"
	13	- echo "-s, --server=HOST:PORT contact esd server on host at port"
	14	- echo "-m, --mixer enable mixer support"
	15	- echo "-n, --name=NAME use name to identify player to esd"
	16	- echo "-v, --verbose show parameters"
	17	- exit 0
	18	- ;;
	19	+ echo "esddsp - attempt to reroute audio device to esd"
	20	+ echo " "
	21	+ echo "esddsp [options] player arguments"
	22	+ echo " "
	23	+ echo "options:"
	24	+ echo "-h, --help show brief help"
	25	+ echo "-s, --server=HOST:PORT contact esd server on host at port"
	26	+ echo "-m, --mixer enable mixer support"
	27	+ echo "-n, --name=NAME use name to identify player to esd"
	28	+ echo "-v, --verbose show parameters"
	29	+ exit 0
	30	+ ;;
	31
	32	-s)
	33	- shift
	34	- if test $# -gt 0; then
	35	- export ESPEAKER=$1
	36	- else
	37	- echo "no server specified"
	38	- exit 1
	39	- fi
	40	- shift
	41	- ;;
	42	+ shift
	43	+ if test $# -gt 0; then
	44	+ ESPEAKER=$1
	45	+ export ESPEAKER
	46	+ else
	47	+ echo "no server specified"
	48	+ exit 1
	49	+ fi
	50	+ shift
	51	+ ;;
	52
	53	--server*)
	54	- export ESPEAKER=`echo $1 \| sed -e 's/^[^=]*=//g'`
	55	- shift
	56	- ;;
	57	+ ESPEAKER=`echo $1 \| sed -e 's/^[^=]*=//g'`
	58	+ export ESPEAKER
	59	+ shift
	60	+ ;;
	61
	62	-m\|--mixer)
	63	- export ESDDSP_MIXER=1
	64	- shift
65	- ;;
66	+ ESDDSP_MIXER=1
67	+ export ESDDSP_MIXER
68	+ shift
69	+ ;;
70
71	-n)
72	- shift
73	- if test $# -gt 0; then
74	- export ESDDSP_NAME=$1
75	- else
76	- echo "no player name specified"
77	- exit 1
78	- fi
79	- shift
80	- set_name=1
81	- ;;
82	+ shift
83	+ if test $# -gt 0; then
84	+ ESDDSP_NAME=$1
85	+ export ESDDSP_NAME
86	+ else
87	+ echo "no player name specified"
88	+ exit 1
89	+ fi
90	+ shift
91	+ set_name=1
92	+ ;;
93
94	--name*)
95	- export ESDDSP_NAME=`echo $1 \| sed -e 's/^[^=]*=//g'`
96	- set_name=1
97	- shift
98	- ;;
99	+ ESDDSP_NAME=`echo $1 \| sed -e 's/^[^=]*=//g'`
100	+ export ESDDSP_NAME
101	+ set_name=1
102	+ shift
103	+ ;;
104
105	-v\|--verbose)
106	- verbose=1
107	- shift
108	- ;;
109	+ verbose=1
110	+ shift
111	+ ;;
112
113	*)
114	- # no more esddsp options, get on with life
115	- break
116	- ;;
117	+ # no more esddsp options, get on with life
118	+ break
119	+ ;;
120	esac
121	done
122
123	@@ -82,19 +87,15 @@
124
125	# echo options if verbose specified
126	if test "$verbose" = 1; then
127	- echo "server: $ESPEAKER"
128	- echo "name: $ESDDSP_NAME"
129	- echo "command line: $@"
130	+ echo "server: $ESPEAKER"
131	+ echo "name: $ESDDSP_NAME"
132	+ echo "command line: $@"
133	fi
134
135	-# setup esd to hijack calls made to /dev/dsp
136	-prefix=@prefix@
137	-exec_prefix=@exec_prefix@
138	-libdir=@libdir@
139	-
140	# Don't try to connect to esd if it isn't running
141	#if [ ! "x`pidof esd`" = "x" ]; then
142	- export LD_PRELOAD="${libdir}/libesddsp.so.0:${libdir}/libesd.so.0"
143	+ LD_PRELOAD="@libdir@/libesddsp.so.0:@libdir@/libesd.so.0"
144	+ export LD_PRELOAD
145	#fi
146
147	# invoke the program with the args given