[PATCH] sound: convert "sound" subdirectory to UTF-8

[John Anthony Kazos Jr.]

From: John Anthony Kazos Jr. <jakj@xxxxxxxxxxx>

Convert the "sound" subdirectory to UTF-8. The following files are 
changed.

sound/oss/{trident.c,es1371.c,pas2_pcm.c}
sound/oss/emu10k1/{passthrough.h,passthrough.c}
sound/pci/mixart/mixart.c

Signed-off-by: John Anthony Kazos Jr. <jakj@xxxxxxxxxxx>

---

I can't get my mail client to send in ISO-8859-1 explicitly instead of 
whatever it decides I want, so the actual patch is attached in 
octet-stream format. The below patch is just for reference and will very 
likely NOT work, unless this time it picks ISO-8859-1.

Also, since the patch includes both encodings, whichever encoding you 
select while viewing it will display one correct and one garbled line. 
However, the bytecodes -are- correct.

diff -uprN linux-2.6.21-rc7.orig/sound/oss/emu10k1/passthrough.c linux-2.6.21-rc7.mod/sound/oss/emu10k1/passthrough.c
--- linux-2.6.21-rc7.orig/sound/oss/emu10k1/passthrough.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.21-rc7.mod/sound/oss/emu10k1/passthrough.c	2007-04-17 13:55:45.000000000 -0400
@@ -1,13 +1,13 @@
 /*
  **********************************************************************
  *     passthrough.c -- Emu10k1 digital passthrough
- *     Copyright (C) 2001  Juha Yrjölä <jyrjola@xxxxxxxxx>
+ *     Copyright (C) 2001  Juha Yrjölä <jyrjola@xxxxxxxxx>
  *
  **********************************************************************
  *
  *     Date                 Author          Summary of changes
  *     ----                 ------          ------------------
- *     May 15, 2001	    Juha Yrjölä	    base code release
+ *     May 15, 2001	    Juha Yrjölä	    base code release
  *
  **********************************************************************
  *
diff -uprN linux-2.6.21-rc7.orig/sound/oss/emu10k1/passthrough.h linux-2.6.21-rc7.mod/sound/oss/emu10k1/passthrough.h
--- linux-2.6.21-rc7.orig/sound/oss/emu10k1/passthrough.h	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.21-rc7.mod/sound/oss/emu10k1/passthrough.h	2007-04-17 13:55:45.000000000 -0400
@@ -1,13 +1,13 @@
 /*
  **********************************************************************
  *     passthrough.h -- Emu10k1 digital passthrough header file
- *     Copyright (C) 2001  Juha Yrjölä <jyrjola@xxxxxxxxx>
+ *     Copyright (C) 2001  Juha Yrjölä <jyrjola@xxxxxxxxx>
  *
  **********************************************************************
  *
  *     Date                 Author          Summary of changes
  *     ----                 ------          ------------------
- *     May 15, 2001	    Juha Yrjölä     base code release
+ *     May 15, 2001	    Juha Yrjölä     base code release
  *
  **********************************************************************
  *
diff -uprN linux-2.6.21-rc7.orig/sound/oss/es1371.c linux-2.6.21-rc7.mod/sound/oss/es1371.c
--- linux-2.6.21-rc7.orig/sound/oss/es1371.c	2007-04-17 11:42:18.000000000 -0400
+++ linux-2.6.21-rc7.mod/sound/oss/es1371.c	2007-04-17 13:55:45.000000000 -0400
@@ -100,7 +100,7 @@
  *                       Tjeerd Mulder <tjeerd.mulder@xxxxxxxxxxxxxxxxxxx>
  *    05.01.2001   0.29  Hopefully updates will not be required anymore when Creative bumps
  *                       the CT5880 revision.
- *                       suggested by Stephan Müller <smueller@xxxxxxxxxx>
+ *                       suggested by Stephan Müller <smueller@xxxxxxxxxx>
  *    31.01.2001   0.30  Register/Unregister gameport
  *                       Fix SETTRIGGER non OSS API conformity
  *    14.07.2001   0.31  Add list of laptops needing amplifier control
diff -uprN linux-2.6.21-rc7.orig/sound/oss/pas2_pcm.c linux-2.6.21-rc7.mod/sound/oss/pas2_pcm.c
--- linux-2.6.21-rc7.orig/sound/oss/pas2_pcm.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.21-rc7.mod/sound/oss/pas2_pcm.c	2007-04-17 13:55:45.000000000 -0400
@@ -85,7 +85,7 @@ static int pcm_set_speed(int arg)
 	 * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/.
 	 *
 	 * I cleared bit 5 of these values, since that bit controls the master
-	 * mute flag. (Olav Wölfelschneider)
+	 * mute flag. (Olav Wölfelschneider)
 	 *
 	 */
 #if !defined NO_AUTO_FILTER_SET
diff -uprN linux-2.6.21-rc7.orig/sound/oss/trident.c linux-2.6.21-rc7.mod/sound/oss/trident.c
--- linux-2.6.21-rc7.orig/sound/oss/trident.c	2007-04-17 11:42:18.000000000 -0400
+++ linux-2.6.21-rc7.mod/sound/oss/trident.c	2007-04-17 13:55:45.000000000 -0400
@@ -18,7 +18,7 @@
  *	Ollie Lho <ollie@xxxxxxxxxx> SiS 7018 Audio Core Support
  *	Ching-Ling Lee <cling-li@xxxxxxxxxx> ALi 5451 Audio Core Support 
  *	Matt Wu <mattwu@xxxxxxxxxxxxxxxxxx> ALi 5451 Audio Core Support
- *	Peter Wächtler <pwaechtler@xxxxxxxxxxxxx> CyberPro5050 support
+ *	Peter Wächtler <pwaechtler@xxxxxxxxxxxxx> CyberPro5050 support
  *      Muli Ben-Yehuda <mulix@xxxxxxxxx>
  *
  *
@@ -89,7 +89,7 @@
  *	use set_current_state, properly release resources on failure in
  *	trident_probe, get rid of check_region
  *  v0.14.9c
- *	August 10 2001 Peter Wächtler <pwaechtler@xxxxxxxxxxxxx>
+ *	August 10 2001 Peter Wächtler <pwaechtler@xxxxxxxxxxxxx>
  *	added support for Tvia (formerly Integraphics/IGST) CyberPro5050
  *	this chip is often found in settop boxes (combined video+audio)
  *  v0.14.9b
diff -uprN linux-2.6.21-rc7.orig/sound/pci/mixart/mixart.c linux-2.6.21-rc7.mod/sound/pci/mixart/mixart.c
--- linux-2.6.21-rc7.orig/sound/pci/mixart/mixart.c	2007-02-04 13:44:54.000000000 -0500
+++ linux-2.6.21-rc7.mod/sound/pci/mixart/mixart.c	2007-04-17 13:55:45.000000000 -0400
@@ -472,7 +472,7 @@ static int snd_mixart_prepare(struct snd
 	struct snd_mixart *chip = snd_pcm_substream_chip(subs);
 	struct mixart_stream *stream = subs->runtime->private_data;
 
-	/* TODO de façon non bloquante, réappliquer les hw_params (rate, bits, codec) */
+	/* TODO de façon non bloquante, réappliquer les hw_params (rate, bits, codec) */
 
 	snd_printdd("snd_mixart_prepare\n");

Attachment: patch-sound.bin
Description: Binary data