From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001
From: Denys Dmytriyenko <denis@denix.org>
Date: Tue, 17 Mar 2009 14:32:59 -0400
Subject: rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
 .../libccaudio2-0.9.0/02-ccaudio-stereo.diff       | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 recipes/libccaudio2/libccaudio2-0.9.0/02-ccaudio-stereo.diff

(limited to 'recipes/libccaudio2/libccaudio2-0.9.0/02-ccaudio-stereo.diff')

diff --git a/recipes/libccaudio2/libccaudio2-0.9.0/02-ccaudio-stereo.diff b/recipes/libccaudio2/libccaudio2-0.9.0/02-ccaudio-stereo.diff
new file mode 100644
index 0000000000..1643fd8d1c
--- /dev/null
+++ b/recipes/libccaudio2/libccaudio2-0.9.0/02-ccaudio-stereo.diff
@@ -0,0 +1,54 @@
+diff -NurBb ccaudio2-0.9.0/src/detect.cpp /tmp/ccaudiosrc/detect.cpp
+--- ccaudio2-0.9.0/src/detect.cpp	2006-05-02 02:20:18.000000000 +0200
++++ tmp/ccaudiosrc/detect.cpp	2006-05-02 02:17:27.000000000 +0200
+@@ -32,6 +32,7 @@
+ #include <cctype>
+ #include <cmath>
+ #include <ctime>
++#include <iostream>
+ 
+ #ifdef  HAVE_STDINT_H
+ #include <stdint.h>
+@@ -198,7 +199,7 @@
+ 		// time of a rolled loop on the machine on which it was developed 
+ 		for(j = sample;  j < limit;  j++)
+ 		{
+-			famp = amp[j];
++			famp = amp[2*j+1];
+ 	  		state->energy += famp*famp;
+ 	    
+ 			// With GCC 2.95, the following unrolled code seems to take about 35%
+diff -NurBb ccaudio2-0.9.0/src/oss.cpp /tmp/ccaudiosrc/oss.cpp
+--- ccaudio2-0.9.0/src/oss.cpp	2006-03-30 00:17:28.000000000 +0200
++++ tmp/ccaudiosrc/oss.cpp	2006-05-02 02:17:27.000000000 +0200
+@@ -39,7 +39,7 @@
+ #include "audio2.h"
+ #include <cmath>
+ #include <cstdio>
+-
++#include <iostream>
+ extern int _oss_ccaudio_dummy;
+ int _oss_ccaudio_dummy = 0;
+ 
+@@ -183,6 +183,10 @@
+ 
+ 	if(ioctl(dsp, SOUND_PCM_WRITE_RATE, &srate))
+ 		return false;
++	if ( srate == 0 ) {
++		std::cerr << "ossSetAudio: invalid rate " << rate << std::endl;
++		return false;
++	}
+ 
+ 	if(ioctl(dsp, SOUND_PCM_WRITE_CHANNELS, &channels))
+ 		return false;
+@@ -192,7 +196,10 @@
+ 	ioctl(dsp, SNDCTL_DSP_GETBLKSIZE, &blksize);
+ 	info.framesize = blksize;	
+ 	info.framecount = toSamples(info.encoding, blksize);
++	if ( srate )
+ 	info.framing = (info.framecount * 1000l) / srate;
++	else
++		info.framing = (info.framecount * 500l);
+ 
+ 	bufsize = info.framecount * channels;
+ 
-- 
cgit v1.2.3