adam
/
darkice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #120 from Ouack23/master 

Cast float* in SRC lib calls to delete fpermissive compilation error
This commit is contained in:
rafael2k 2017-02-15 22:16:40 -02:00 committed by GitHub
parent 8dd294db4f 1e2eb18d34
commit c681c908f6
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
darkice/trunk/src/FaacEncoder.cpp
View File

@ -164,7 +164,7 @@ FaacEncoder :: write ( const void * buf,
if ( converter ) { if ( converter ) {
unsigned int converted; unsigned int converted;
#ifdef HAVE_SRC_LIB #ifdef HAVE_SRC_LIB
src_short_to_float_array ((short *) b, converterData.data_in, samples); src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples);
converterData.input_frames = nSamples; converterData.input_frames = nSamples;
converterData.data_out = resampledOffset + (resampledOffsetSize * channels); converterData.data_out = resampledOffset + (resampledOffsetSize * channels);
int srcError = src_process (converter, &converterData); int srcError = src_process (converter, &converterData);

2
darkice/trunk/src/OpusLibEncoder.cpp
View File

@ -403,7 +403,7 @@ OpusLibEncoder :: write ( const void * buf,
#ifdef HAVE_SRC_LIB #ifdef HAVE_SRC_LIB
(void)inCount; (void)inCount;
converterData.input_frames = processed; converterData.input_frames = processed;
src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples);
int srcError = src_process (converter, &converterData); int srcError = src_process (converter, &converterData);
if (srcError) if (srcError)
throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError));

2
darkice/trunk/src/VorbisLibEncoder.cpp
View File

@ -337,7 +337,7 @@ VorbisLibEncoder :: write ( const void * buf,
int converted; int converted;
#ifdef HAVE_SRC_LIB #ifdef HAVE_SRC_LIB
converterData.input_frames = nSamples; converterData.input_frames = nSamples;
src_short_to_float_array (shortBuffer, converterData.data_in, totalSamples); src_short_to_float_array (shortBuffer, (float *) converterData.data_in, totalSamples);
int srcError = src_process (converter, &converterData); int srcError = src_process (converter, &converterData);
if (srcError) if (srcError)
throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError)); throw Exception (__FILE__, __LINE__, "libsamplerate error: ", src_strerror (srcError));

2
darkice/trunk/src/aacPlusEncoder.cpp
View File

@ -155,7 +155,7 @@ aacPlusEncoder :: write ( const void * buf,
if ( converter ) { if ( converter ) {
unsigned int converted; unsigned int converted;
#ifdef HAVE_SRC_LIB #ifdef HAVE_SRC_LIB
src_short_to_float_array ((short *) b, converterData.data_in, samples); src_short_to_float_array ((short *) b, (float *) converterData.data_in, samples);
converterData.input_frames = nSamples; converterData.input_frames = nSamples;
converterData.data_out = resampledOffset + (resampledOffsetSize * channels); converterData.data_out = resampledOffset + (resampledOffsetSize * channels);
int srcError = src_process (converter, &converterData); int srcError = src_process (converter, &converterData);