Commit 3b23333f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Fix defines that were broken in previous commits

parent a39c659d
......@@ -30,10 +30,10 @@
uint32_t mm_accel (void);
#if defined(LIBDTS_FIXED)
#if defined(LIBDCA_FIXED)
typedef int32_t sample_t;
typedef int32_t level_t;
#elif defined(LIBDTS_DOUBLE)
#elif defined(LIBDCA_DOUBLE)
typedef double sample_t;
typedef double level_t;
#else
......
......@@ -82,7 +82,7 @@ static int aif_play (ao_instance_t * _instance, int flags, sample_t * _samples)
aif_instance_t * instance = (aif_instance_t *) _instance;
int16_t int16_samples[256*2];
#ifdef LIBDTS_DOUBLE
#ifdef LIBDCA_DOUBLE
convert_t samples[256 * 2];
int i;
......
......@@ -64,7 +64,7 @@ static int al_play (ao_instance_t * _instance, int flags, sample_t * _samples)
int16_t int16_samples[256*6];
int chans = -1;
#ifdef LIBDTS_DOUBLE
#ifdef LIBDCA_DOUBLE
convert_t samples[256 * 6];
int i;
......
......@@ -43,13 +43,13 @@ static int float_setup (ao_instance_t * instance, int sample_rate, int * flags,
static int float_play (ao_instance_t * instance, int flags,
sample_t * _samples)
{
#if defined(LIBDTS_FIXED)
#if defined(LIBDCA_FIXED)
float samples[256 * 2];
int i;
for (i = 0; i < 256 * 2; i++)
samples[i] = _samples[i] * (1.0 / (1 << 30));
#elif defined(LIBDTS_DOUBLE)
#elif defined(LIBDCA_DOUBLE)
float samples[256 * 2];
int i;
......
......@@ -21,13 +21,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifdef LIBDTS_DOUBLE
#ifdef LIBDCA_DOUBLE
typedef float convert_t;
#else
typedef sample_t convert_t;
#endif
#ifdef LIBDTS_FIXED
#ifdef LIBDCA_FIXED
#define CONVERT_LEVEL (1 << 26)
#define CONVERT_BIAS 0
#else
......
......@@ -88,7 +88,7 @@ static int oss_play (ao_instance_t * _instance, int flags, sample_t * _samples)
int16_t int16_samples[256*6];
int chans = -1;
#ifdef LIBDTS_DOUBLE
#ifdef LIBDCA_DOUBLE
convert_t samples[256 * 6];
int i;
......
......@@ -33,7 +33,7 @@ static int peak_play (ao_instance_t * _instance, int flags, sample_t * samples)
int i;
for (i = 0; i < 256 * 2; i++) {
#ifdef LIBDTS_FIXED
#ifdef LIBDCA_FIXED
float f = fabs (samples[i] * (1.0 / (1 << 30)));
#else
float f = fabs (samples[i]);
......
......@@ -67,7 +67,7 @@ static int solaris_play (ao_instance_t * _instance, int flags,
solaris_instance_t * instance = (solaris_instance_t *) _instance;
int16_t int16_samples[256*2];
#ifdef LIBDTS_DOUBLE
#ifdef LIBDCA_DOUBLE
convert_t samples[256 * 2];
int i;
......
......@@ -193,7 +193,7 @@ static int wav_play (ao_instance_t * _instance, int flags, sample_t * _samples)
{ 2, 0, 1, 4, 5, 3 }, /* DTS_3F2R */
};
#ifdef LIBDTS_DOUBLE
#ifdef LIBDCA_DOUBLE
convert_t samples[256 * 6];
int i;
......
......@@ -75,7 +75,7 @@ static int win_play (ao_instance_t * _instance, int flags, sample_t * _samples)
int current_buffer;
MMRESULT result;
#ifdef LIBDTS_DOUBLE
#ifdef LIBDCA_DOUBLE
convert_t samples[256 * 2];
int i;
......
......@@ -32,7 +32,7 @@
static inline int16_t convert (int32_t i)
{
#ifdef LIBDTS_FIXED
#ifdef LIBDCA_FIXED
i >>= 15;
#else
i -= 0x43c00000;
......
......@@ -164,7 +164,7 @@ void dts_upmix (sample_t * samples, int acmod, int output);
#define ROUND(x) ((int)((x) + ((x) > 0 ? 0.5 : -0.5)))
#ifndef LIBDTS_FIXED
#ifndef LIBDCA_FIXED
typedef sample_t quantizer_t;
#define SAMPLE(x) (x)
......@@ -175,7 +175,7 @@ typedef sample_t quantizer_t;
#define DIV(a,b) ((a) / (b))
#define BIAS(x) ((x) + bias)
#else /* LIBDTS_FIXED */
#else /* LIBDCA_FIXED */
typedef int16_t quantizer_t;
#define SAMPLE(x) (sample_t)((x) * (1 << 30))
......
/* vc++/config.h - manually adapted from include/config.h.in */
/* dtsdec profiling */
/* #undef DTSDEC_GPROF */
/* dcadec profiling */
/* #undef DCADEC_GPROF */
/* maximum supported data alignment */
/* #undef ATTRIBUTE_ALIGNED_MAX */
......@@ -66,11 +66,11 @@
/* Define to 1 if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */
/* dts sample precision */
/* #undef LIBDTS_DOUBLE */
/* dca sample precision */
/* #undef LIBDCA_DOUBLE */
/* use fixed-point arithmetic */
/* #undef LIBDTS_FIXED */
/* #undef LIBDCA_FIXED */
/* libao al support */
/* #undef LIBAO_AL */
......@@ -85,7 +85,7 @@
#define LIBAO_WIN
/* Name of package */
#define PACKAGE "dtsdec"
#define PACKAGE "libdca"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment