summaryrefslogtreecommitdiffstats
path: root/plugins/decoder
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-22 08:36:52 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-22 08:36:52 +0000
commitabc21952ac547e45f72d35c35bc7d746648947cc (patch)
treecf27691c1556b466ce28816340a1162c38d7af24 /plugins/decoder
parent85723d544dd6aad9b2d0974dfe91ece438f03dfb (diff)
downloadk3b-abc21952ac547e45f72d35c35bc7d746648947cc.tar.gz
k3b-abc21952ac547e45f72d35c35bc7d746648947cc.zip
Fix k3b FTBFS under Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k3b@1242628 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'plugins/decoder')
-rw-r--r--plugins/decoder/flac/configure.in.in2
-rw-r--r--plugins/decoder/flac/k3bflacdecoder.cpp2
-rw-r--r--plugins/decoder/mp3/configure.in.in2
-rw-r--r--plugins/decoder/musepack/configure.in.in6
4 files changed, 6 insertions, 6 deletions
diff --git a/plugins/decoder/flac/configure.in.in b/plugins/decoder/flac/configure.in.in
index e6a3700..4679bf7 100644
--- a/plugins/decoder/flac/configure.in.in
+++ b/plugins/decoder/flac/configure.in.in
@@ -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)
diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp
index 4e537b0..495e3d9 100644
--- a/plugins/decoder/flac/k3bflacdecoder.cpp
+++ b/plugins/decoder/flac/k3bflacdecoder.cpp
@@ -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);
diff --git a/plugins/decoder/mp3/configure.in.in b/plugins/decoder/mp3/configure.in.in
index fb92936..9da5da7 100644
--- a/plugins/decoder/mp3/configure.in.in
+++ b/plugins/decoder/mp3/configure.in.in
@@ -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])],
[],
diff --git a/plugins/decoder/musepack/configure.in.in b/plugins/decoder/musepack/configure.in.in
index ca42976..1500ae3 100644
--- a/plugins/decoder/musepack/configure.in.in
+++ b/plugins/decoder/musepack/configure.in.in
@@ -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(