Fix k3b FTBFS under Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1242628 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 85723d544d
commit abc21952ac

@ -321,7 +321,7 @@ int K3bAudioDecoder::decode( char* _data, int maxLen )
int K3bAudioDecoder::resample( char* data, int maxLen )
{
if( !d->resampleState ) {
d->resampleState = src_new( SRC_SINC_MEDIUM_TQUALITY, d->channels, 0 );
d->resampleState = src_new( SRC_SINC_MEDIUM_QUALITY, d->channels, 0 );
if( !d->resampleState ) {
kdDebug() << "(K3bAudioDecoder) unable to initialize resampler." << endl;
return -1;

@ -11,7 +11,7 @@ have_libdvdread=no
if test "$ac_cv_use_libdvdread" = "yes"; then
KDE_CHECK_HEADERS(dvdread/dvd_reader.h,
[
AC_CHECK_LIB(dvdread,
KDE_CHECK_LIB(dvdread,
DVDOpen,
[
AC_DEFINE(HAVE_LIBDVDREAD,1,[Defined if you have libdvdread headers and libs installed.])

@ -9,7 +9,7 @@ AC_ARG_WITH(
have_flac=no
if test "$ac_cv_use_flac" = "yes"; then
KDE_CHECK_HEADERS(FLAC++/decoder.h, [
AC_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
have_flac=yes,[],$all_libraries)])
AC_MSG_CHECKING(for libFLAC newer than 1.1.1)

@ -56,7 +56,7 @@ public:
file = f;
file->open(IO_ReadOnly);
internalBuffer->flush();
TQT_TQIODEVICE(internalBuffer)->flush();
set_metadata_respond(FLAC__METADATA_TYPE_STREAMINFO);
set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT);

@ -9,7 +9,7 @@ AC_ARG_WITH(
if test "$ac_cv_use_libmad" = "yes"; then
MAD_LIB=""
KDE_CHECK_HEADER(mad.h, [
AC_CHECK_LIB(mad, mad_synth_frame, [
KDE_CHECK_LIB(mad, mad_synth_frame, [
MAD_LIB="-lmad"
AC_DEFINE(HAVE_LIBMAD,1,[defined if you have libmad headers and libraries])],
[],

@ -15,7 +15,7 @@ if test "$ac_cv_use_mpc" = "yes"; then
dnl - search for both the new and the old naming -
KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [
AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [
have_mpc=yes
MPC_LIBS="-lmpcdec"
AC_DEFINE(
@ -28,7 +28,7 @@ if test "$ac_cv_use_mpc" = "yes"; then
if test "$have_mpc" = "no"; then
KDE_CHECK_HEADERS(mpc/mpcdec.h, [
AC_CHECK_LIB(mpcdec, mpc_decoder_setup, [
KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [
have_mpc=yes
MPC_LIBS="-lmpcdec"
AC_DEFINE(
@ -42,7 +42,7 @@ if test "$ac_cv_use_mpc" = "yes"; then
if test "$have_mpc" = "no"; then
KDE_CHECK_HEADERS(musepack/musepack.h, [
AC_CHECK_LIB(musepack, mpc_decoder_setup, [
KDE_CHECK_LIB(musepack, mpc_decoder_setup, [
have_mpc=yes
MPC_LIBS="-lmusepack"
AC_DEFINE(

@ -9,7 +9,7 @@ AC_ARG_WITH(
have_lame=no
if test "$ac_cv_use_lame" = "yes"; then
KDE_CHECK_HEADERS(lame/lame.h, [
AC_CHECK_LIB(mp3lame, lame_init, [
KDE_CHECK_LIB(mp3lame, lame_init, [
have_lame=yes
AC_DEFINE(HAVE_LAME,1,[defined if you have the lame header and lib])
], [], $all_libraries -lm)

Loading…
Cancel
Save