[PATCH] Remove stray Polypaudio strings

[Pierre Ossman <ossman@cendio.se>]

[-- Attachment #1.1.1: Type: text/plain, Size: 147 bytes --]

Some stray mentions of the old Polypaudio name was still present in the
PulseAudio plug-in.

Signed-off-by: Pierre Ossman <ossman@cendio.se>


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: polyp.patch --]
[-- Type: text/x-patch; name="polyp.patch", Size: 2325 bytes --]

diff -r fa66f27a1d63 pulse/ctl_pulse.c
--- a/pulse/ctl_pulse.c	Tue Aug 22 14:40:44 2006 +0200
+++ b/pulse/ctl_pulse.c	Sun Aug 27 23:25:03 2006 +0200
@@ -689,10 +689,10 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pulse)
     ctl->ext.version = SND_CTL_EXT_VERSION;
     ctl->ext.card_idx = 0;
     strncpy(ctl->ext.id, "pulse", sizeof(ctl->ext.id) - 1);
-    strncpy(ctl->ext.driver, "Polypaudio plugin", sizeof(ctl->ext.driver) - 1);
-    strncpy(ctl->ext.name, "Polypaudio", sizeof(ctl->ext.name) - 1);
-    strncpy(ctl->ext.longname, "Polypaudio", sizeof(ctl->ext.longname) - 1);
-    strncpy(ctl->ext.mixername, "Polypaudio", sizeof(ctl->ext.mixername) - 1);
+    strncpy(ctl->ext.driver, "PulseAudio plugin", sizeof(ctl->ext.driver) - 1);
+    strncpy(ctl->ext.name, "PulseAudio", sizeof(ctl->ext.name) - 1);
+    strncpy(ctl->ext.longname, "PulseAudio", sizeof(ctl->ext.longname) - 1);
+    strncpy(ctl->ext.mixername, "PulseAudio", sizeof(ctl->ext.mixername) - 1);
     ctl->ext.poll_fd = -1;
     ctl->ext.callback = &pulse_ext_callback;
     ctl->ext.private_data = ctl;
diff -r fa66f27a1d63 pulse/pcm_pulse.c
--- a/pulse/pcm_pulse.c	Tue Aug 22 14:40:44 2006 +0200
+++ b/pulse/pcm_pulse.c	Sun Aug 27 23:25:23 2006 +0200
@@ -471,7 +471,7 @@ static int pulse_prepare(snd_pcm_ioplug_
 
     err = pulse_wait_stream_state(pcm->p, pcm->stream, PA_STREAM_READY);
     if (err < 0) {
-        fprintf(stderr, "*** POLYPAUDIO: Unable to create stream.\n");
+        fprintf(stderr, "*** PULSEAUDIO: Unable to create stream.\n");
         pa_stream_unref(pcm->stream);
         pcm->stream = NULL;
         goto finish;
@@ -524,7 +524,7 @@ static int pulse_hw_params(snd_pcm_ioplu
         pcm->ss.format = PA_SAMPLE_FLOAT32BE;
         break;
     default:
-        fprintf(stderr, "*** POLYPAUDIO: unsupported format %s\n",
+        fprintf(stderr, "*** PULSEAUDIO: unsupported format %s\n",
             snd_pcm_format_name(io->format));
         err = -EINVAL;
         goto finish;
@@ -715,7 +715,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse)
         goto error;
 
 	pcm->io.version = SND_PCM_IOPLUG_VERSION;
-	pcm->io.name = "ALSA <-> Polypaudio PCM I/O Plugin";
+	pcm->io.name = "ALSA <-> PulseAudio PCM I/O Plugin";
 	pcm->io.poll_fd = -1;
 	pcm->io.poll_events = 0;
 	pcm->io.mmap_rw = 0;

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 251 bytes --]

[-- Attachment #2: Type: text/plain, Size: 373 bytes --]

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

[-- Attachment #3: Type: text/plain, Size: 161 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel