diff options
Diffstat (limited to 'plugins/decoder')
47 files changed, 81 insertions, 549 deletions
diff --git a/plugins/decoder/Makefile.am b/plugins/decoder/Makefile.am deleted file mode 100644 index 1b4eafa..0000000 --- a/plugins/decoder/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ - -if include_OGG -DECOGGDIR = ogg -endif - -if include_MP3 -DECMP3DIR = mp3 -endif - -if include_FLAC -DECFLACDIR = flac -endif - -if include_AIFF -DECAIFFDIR = libsndfile -endif - -if include_FFMPEG -FFMPEGDIR = ffmpeg -endif - -if include_MPC -MPCDIR = musepack -endif - -SUBDIRS = wave $(DECOGGDIR) $(DECMP3DIR) $(DECFLACDIR) $(DECAIFFDIR) $(FFMPEGDIR) $(MPCDIR) diff --git a/plugins/decoder/ffmpeg/CMakeLists.txt b/plugins/decoder/ffmpeg/CMakeLists.txt index 08a977c..7197348 100644 --- a/plugins/decoder/ffmpeg/CMakeLists.txt +++ b/plugins/decoder/ffmpeg/CMakeLists.txt @@ -44,6 +44,7 @@ tde_add_kpart( libk3bffmpegdecoder AUTOMOC ##### other data ################################ -install( FILES k3bffmpegdecoder.plugin +tde_create_translated_desktop( + SOURCE k3bffmpegdecoder.plugin DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins ) diff --git a/plugins/decoder/ffmpeg/Makefile.am b/plugins/decoder/ffmpeg/Makefile.am deleted file mode 100644 index 2e00dc5..0000000 --- a/plugins/decoder/ffmpeg/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(all_includes) -KDE_CXXFLAGS = -D__STDC_CONSTANT_MACROS - -kde_module_LTLIBRARIES = libk3bffmpegdecoder.la - -libk3bffmpegdecoder_la_SOURCES = k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp - -libk3bffmpegdecoder_la_LIBADD = ../../../libk3b/libk3b.la $(LIB_TDEUI) -lavcodec -lavformat -libk3bffmpegdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - -pluginsdir = $(kde_datadir)/k3b/plugins -plugins_DATA = k3bffmpegdecoder.plugin - -METASOURCES = AUTO - diff --git a/plugins/decoder/ffmpeg/configure.in.bot b/plugins/decoder/ffmpeg/configure.in.bot deleted file mode 100644 index 3d24645..0000000 --- a/plugins/decoder/ffmpeg/configure.in.bot +++ /dev/null @@ -1,25 +0,0 @@ -echo "" - -echo "K3b - FFMpeg decoder plugin (decodes wma and others):" -if test x$have_ffmpeg = xyes; then - echo "K3b - yes" - if test x$enable_ffmpeg_all_codecs = xyes; then - echo "K3b - WARNING: You enabled all codecs in the ffmpeg decoder plugin." - echo "K3b - Be aware that most are not tested and track lengths" - echo "K3b - will be wrong in many cases." - fi -else - echo "K3b - no" -if test "$ac_cv_use_ffmpeg" = "yes"; then - if test "$ffmpeg_compiles" = "yes"; then - echo "K3b - You are missing the ffmpeg libraries." - echo "K3b - Make sure ffmpeg has been configured as a" - echo "K3b - shared library (which is not the default)." - else - echo "K3b - You are missing the ffmpeg headers and libraries" - echo "K3b - version 0.4.9 or higher." - fi - echo "K3b - The ffmpeg audio decoding plugin (decodes wma and" - echo "K3b - others) won't be compiled." -fi -fi diff --git a/plugins/decoder/ffmpeg/configure.in.in b/plugins/decoder/ffmpeg/configure.in.in deleted file mode 100644 index 84b345a..0000000 --- a/plugins/decoder/ffmpeg/configure.in.in +++ /dev/null @@ -1,68 +0,0 @@ -dnl --------------- FFMPEG CHECK --------------------------------- - -AC_ARG_WITH( - ffmpeg, - AS_HELP_STRING( - [--without-ffmpeg], - [build K3b without ffmpeg audio decoder support (default=no)]), - [ac_cv_use_ffmpeg=$withval], - [ac_cv_use_ffmpeg=yes] -) - -# -# The ffmpeg decoder plugin needs ffmpeg 0.4.9 or higher -# -have_ffmpeg=no -if test "$ac_cv_use_ffmpeg" = "yes"; then - k3b_cxxflags_save="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS" - AC_MSG_CHECKING(for ffmpeg >= 0.4.9) - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_COMPILE_IFELSE( - extern "C" { - #include <libavformat/avformat.h> - #include <libavcodec/avcodec.h> - } - - int main() { - AVFormatContext* fc = 0; - AVPacket* p = 0; - av_register_all(); - return av_read_frame( fc, p ); - }, - [ffmpeg_compiles=yes], [ffmpeg_compiles=no] ) - OLD_LIBS=$LIBS - LIBS="-lavformat -lavcodec $LIBS" - AC_LINK_IFELSE( - extern "C" { - #include <libavformat/avformat.h> - #include <libavcodec/avcodec.h> - } - - int main() { - AVFormatContext* fc = 0; - AVPacket* p = 0; - av_register_all(); - return av_read_frame( fc, p ); - }, - [ffmpeg_links=yes], [ffmpeg_links=no] ) - AC_LANG_RESTORE - LIBS=$OLD_LIBS - have_ffmpeg=$ffmpeg_links - AC_MSG_RESULT($have_ffmpeg) - CXXFLAGS=$k3b_cxxflags_save -fi -AM_CONDITIONAL(include_FFMPEG, [test x$have_ffmpeg = xyes]) - -dnl --------------- FFMPEG CHECK END ------------------------------ - -AC_ARG_ENABLE( - ffmpeg-all-codecs, - AS_HELP_STRING( - [--enable-ffmpeg-all-codecs], - [Build K3b's ffmeg decoder plugin with all audio codecs enabled (default=disabled)]), - [AC_DEFINE(K3B_FFMPEG_ALL_CODECS, 1, [Defined if all ffmpeg codecs should be allowed]) - enable_ffmpeg_all_codecs=yes], - [enable_ffmpeg_all_codecs=no] -) diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h index 1b493b7..0afd20a 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.h +++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.h @@ -23,7 +23,7 @@ class K3bFFMpegFile; class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -43,7 +43,7 @@ class K3bFFMpegDecoderFactory : public K3bAudioDecoderFactory class K3bFFMpegDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin b/plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin index 3592388..a3e3251 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin +++ b/plugins/decoder/ffmpeg/k3bffmpegdecoder.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=libk3bffmpegdecoder -Group=AudioDecoder Name=K3b FFMpeg Decoder +Comment=Decoding module to decode wma files Author=Sebastian Trueg Email=trueg@k3b.org Version=0.9.1 -Comment=Decoding module to decode wma files License=GPL +Group=AudioDecoder +Lib=libk3bffmpegdecoder diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index 983c808..3e34c5c 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -217,8 +217,13 @@ bool K3bFFMpegFile::open() { #else d->sampleFormat = static_cast<::AVSampleFormat>(d->audio_stream->codecpar->format); #endif +# if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 24, 100) d->isSpacious = ::av_sample_fmt_is_planar(d->sampleFormat) && d->audio_stream->codecpar->channels > 1; +# else + d->isSpacious = ::av_sample_fmt_is_planar(d->sampleFormat) && + d->audio_stream->codecpar->ch_layout.nb_channels > 1; +# endif // dump some debugging info ::av_dump_format(d->formatContext, 0, m_filename.local8Bit(), 0); @@ -255,7 +260,11 @@ int K3bFFMpegFile::sampleRate() const { } int K3bFFMpegFile::channels() const { +# if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 24, 100) return d->audio_stream->codecpar->channels; +# else + return d->audio_stream->codecpar->ch_layout.nb_channels; +# endif } int K3bFFMpegFile::type() const { return d->audio_stream->codecpar->codec_id; } diff --git a/plugins/decoder/flac/CMakeLists.txt b/plugins/decoder/flac/CMakeLists.txt index 75eea0d..090e3d6 100644 --- a/plugins/decoder/flac/CMakeLists.txt +++ b/plugins/decoder/flac/CMakeLists.txt @@ -18,11 +18,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/libk3bdevice ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${TAGLIB_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} ${FLAC_LIBRARY_DIRS} + ${TAGLIB_LIBRARY_DIRS} ) if( ${FLAC_VERSION} VERSION_GREATER "1.1.1" ) @@ -34,13 +36,14 @@ endif( ) tde_add_kpart( libk3bflacdecoder AUTOMOC SOURCES k3bflacdecoder.cpp LINK tdecore-shared k3b-shared k3bdevice-shared - ${FLAC_LIBRARIES} + ${FLAC_LIBRARIES} ${TAGLIB_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) ##### other data ################################ -install( FILES k3bflacdecoder.plugin +tde_create_translated_desktop( + SOURCE k3bflacdecoder.plugin DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins ) diff --git a/plugins/decoder/flac/Makefile.am b/plugins/decoder/flac/Makefile.am deleted file mode 100644 index 36ed8ef..0000000 --- a/plugins/decoder/flac/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice -I$(srcdir)/../../../libk3b/core $(taglib_includes) $(all_includes) - -kde_module_LTLIBRARIES = libk3bflacdecoder.la - -libk3bflacdecoder_la_SOURCES = k3bflacdecoder.cpp - -libk3bflacdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lFLAC++ -lFLAC $(taglib_libs) -libk3bflacdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - -pluginsdir = $(kde_datadir)/k3b/plugins -plugins_DATA = k3bflacdecoder.plugin - -METASOURCES = AUTO diff --git a/plugins/decoder/flac/configure.in.bot b/plugins/decoder/flac/configure.in.bot deleted file mode 100644 index f2d95a4..0000000 --- a/plugins/decoder/flac/configure.in.bot +++ /dev/null @@ -1,13 +0,0 @@ -echo "" - -if test x$have_flac = xyes; then - echo "K3b - FLAC support: yes" -else - echo "K3b - FLAC support: no" -if test "$ac_cv_use_flac" = "yes"; then - if test "$have_flac" = "no"; then - echo "K3b - You are missing the FLAC++ headers and libraries." - echo "K3b - The FLAC decoding plugin won't be compiled." - fi -fi -fi diff --git a/plugins/decoder/flac/configure.in.in b/plugins/decoder/flac/configure.in.in deleted file mode 100644 index 4679bf7..0000000 --- a/plugins/decoder/flac/configure.in.in +++ /dev/null @@ -1,41 +0,0 @@ -dnl === test for FLAC++ and FLAC - begin ==== -AC_ARG_WITH( - flac, - AS_HELP_STRING([--without-flac], [build K3b without FLAC support (default=no)]), - [ac_cv_use_flac=$withval], - [ac_cv_use_flac=yes] -) - -have_flac=no -if test "$ac_cv_use_flac" = "yes"; then - KDE_CHECK_HEADERS(FLAC++/decoder.h, [ - KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single, - have_flac=yes,[],$all_libraries)]) - - AC_MSG_CHECKING(for libFLAC newer than 1.1.1) - AC_CACHE_VAL(k3b_flac_new, - [ - AC_LANG_SAVE - AC_LANG_CPLUSPLUS - AC_TRY_COMPILE( - [ - #include <FLAC++/metadata.h> - ], [ - FLAC::Metadata::VorbisComment* vc; - vc->get_vendor_string().get_field(); - ], k3b_flac_new=no, k3b_flac_new=yes ) - AC_LANG_RESTORE - ]) - AC_MSG_RESULT($k3b_flac_new) - if test $k3b_flac_new = yes; then - AC_DEFINE(FLAC_NEWER_THAN_1_1_1, - 1, - [Define to 1 if your flac library's version is newer than or equal to 1.1.2] - ) - fi -else - have_flac=no -fi - -AM_CONDITIONAL(include_FLAC, [test x$have_flac = xyes]) -dnl === test for FLAC++ and FLAC - end ==== diff --git a/plugins/decoder/flac/k3bflacdecoder.cpp b/plugins/decoder/flac/k3bflacdecoder.cpp index 671bf4c..2d814d8 100644 --- a/plugins/decoder/flac/k3bflacdecoder.cpp +++ b/plugins/decoder/flac/k3bflacdecoder.cpp @@ -33,6 +33,7 @@ #ifdef HAVE_TAGLIB #include <taglib/tag.h> #include <taglib/flacfile.h> +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) #endif #if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6 @@ -56,7 +57,7 @@ public: file = f; file->open(IO_ReadOnly); - TQT_TQIODEVICE(internalBuffer)->flush(); + internalBuffer->flush(); set_metadata_respond(FLAC__METADATA_TYPE_STREAMINFO); set_metadata_respond(FLAC__METADATA_TYPE_VORBIS_COMMENT); @@ -165,7 +166,7 @@ K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) { #else FLAC__StreamDecoderSeekStatus K3bFLACDecoder::Private::seek_callback(FLAC__uint64 absolute_byte_offset) { - if(file->at(absolute_byte_offset) == FALSE) + if(file->at(absolute_byte_offset) == false) return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR; else return FLAC__STREAM_DECODER_SEEK_STATUS_OK; @@ -293,9 +294,9 @@ bool K3bFLACDecoder::analyseFileInternal( K3b::Msf& frames, int& samplerate, int kdDebug() << "(K3bFLACDecoder) using taglib to read tag" << endl; TagLib::FLAC::File f( TQFile::encodeName(filename()) ); if( f.isOpen() ) { - addMetaInfo( META_TITLE, TStringToQString( f.tag()->title() ) ); - addMetaInfo( META_ARTIST, TStringToQString( f.tag()->artist() ) ); - addMetaInfo( META_COMMENT, TStringToQString( f.tag()->comment() ) ); + addMetaInfo( META_TITLE, TStringToTQString( f.tag()->title() ) ); + addMetaInfo( META_ARTIST, TStringToTQString( f.tag()->artist() ) ); + addMetaInfo( META_COMMENT, TStringToTQString( f.tag()->comment() ) ); } } #endif diff --git a/plugins/decoder/flac/k3bflacdecoder.h b/plugins/decoder/flac/k3bflacdecoder.h index 83904dd..d2f1d87 100644 --- a/plugins/decoder/flac/k3bflacdecoder.h +++ b/plugins/decoder/flac/k3bflacdecoder.h @@ -23,7 +23,7 @@ class KURL; class K3bFLACDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -41,7 +41,7 @@ class K3bFLACDecoderFactory : public K3bAudioDecoderFactory class K3bFLACDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/flac/k3bflacdecoder.plugin b/plugins/decoder/flac/k3bflacdecoder.plugin index 1e1bcbb..5b7ded9 100644 --- a/plugins/decoder/flac/k3bflacdecoder.plugin +++ b/plugins/decoder/flac/k3bflacdecoder.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=libk3bflacdecoder -Group=AudioDecoder Name=K3b FLAC Decoder +Comment=Decoding module to decode FLAC files Author=John Steele Scott Email=toojays@toojays.net Version=2.1 -Comment=Decoding module to decode FLAC files License=GPL +Group=AudioDecoder +Lib=libk3bflacdecoder diff --git a/plugins/decoder/libsndfile/CMakeLists.txt b/plugins/decoder/libsndfile/CMakeLists.txt index fa387c0..f9a35ed 100644 --- a/plugins/decoder/libsndfile/CMakeLists.txt +++ b/plugins/decoder/libsndfile/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/libk3bdevice ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${SNDFILE_INCLUDE_DIRS} ) link_directories( @@ -38,6 +39,7 @@ tde_add_kpart( libk3blibsndfiledecoder AUTOMOC ##### other data ################################ -install( FILES k3blibsndfiledecoder.plugin +tde_create_translated_desktop( + SOURCE k3blibsndfiledecoder.plugin DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins ) diff --git a/plugins/decoder/libsndfile/Makefile.am b/plugins/decoder/libsndfile/Makefile.am deleted file mode 100644 index b01e30f..0000000 --- a/plugins/decoder/libsndfile/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(all_includes) - -kde_module_LTLIBRARIES = libk3blibsndfiledecoder.la - -libk3blibsndfiledecoder_la_SOURCES = k3blibsndfiledecoder.cpp - -libk3blibsndfiledecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -lsndfile -libk3blibsndfiledecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - -pluginsdir = $(kde_datadir)/k3b/plugins -plugins_DATA = k3blibsndfiledecoder.plugin - -METASOURCES = AUTO - diff --git a/plugins/decoder/libsndfile/configure.in.bot b/plugins/decoder/libsndfile/configure.in.bot deleted file mode 100644 index cf1e4e9..0000000 --- a/plugins/decoder/libsndfile/configure.in.bot +++ /dev/null @@ -1,11 +0,0 @@ -echo "" - -if $av_cv_sndfile; then - echo "K3b - libsndfile audio decoding support: yes" -else - echo "K3b - libsndfile audio decoding support: no" -if test "$ac_cv_use_sndfile" = "yes"; then - echo "K3b - You are missing the libsndfile headers and libraries." - echo "K3b - The libsndfile audio decoding plugin won't be compiled." -fi -fi diff --git a/plugins/decoder/libsndfile/configure.in.in b/plugins/decoder/libsndfile/configure.in.in deleted file mode 100644 index 6b50a68..0000000 --- a/plugins/decoder/libsndfile/configure.in.in +++ /dev/null @@ -1,52 +0,0 @@ -dnl === test for libsndfile - begin === -dnl -dnl Don't use PKG_CHECK, since if there is no pkg-config installed, -dnl then there is no auto* magic for it either. -dnl -dnl Tests copied from tdebase/tdeioslave/thumbnail/ -dnl -if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -fi - -AC_ARG_WITH( - sndfile, - AS_HELP_STRING([--without-sndfile], - [build K3b without libsndfile support (default=no)]), - [ac_cv_use_sndfile=$withval], - [ac_cv_use_sndfile=yes] -) - -if test "$ac_cv_use_sndfile" = "yes"; then - SNDFILE_CFLAGS="" - SNDFILE_LIBS="" - if test "$PKG_CONFIG" = "no" ; then - ac_cv_sndfile=0 - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - if !(`$PKG_CONFIG --exists sndfile`) ; then - echo "*** sndfile is not installed." - ac_cv_sndfile=0 - else - if !(`$PKG_CONFIG --atleast-version="1.0.2" sndfile`) ; then - echo "*** You need at least version 1.0.2 of sndfile." - ac_cv_sndfile=0 - else - ac_cv_sndfile=1 - SNDFILE_CFLAGS=`$PKG_CONFIG --cflags sndfile` - SNDFILE_LIBS=`$PKG_CONFIG --libs sndfile` - fi - fi - fi - - AC_DEFINE_UNQUOTED([HAVE_SNDFILE],${ac_cv_sndfile}, - [Set to 1 if you have libsndfile.]) - AC_SUBST(SNDFILE_CFLAGS) - AC_SUBST(SNDFILE_LIBS) -fi - -AM_CONDITIONAL(include_AIFF, [test x$ac_cv_sndfile = x1]) -dnl === test for libsndfile - end === diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp index ad094a6..6e00aa1 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.cpp @@ -26,7 +26,7 @@ #include <kurl.h> #include <kdebug.h> #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <math.h> diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h index 5840ee7..8cf5e97 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.h +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.h @@ -24,7 +24,7 @@ class KURL; class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -44,7 +44,7 @@ class K3bLibsndfileDecoderFactory : public K3bAudioDecoderFactory class K3bLibsndfileDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin b/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin index 7ae05f1..f0945fb 100644 --- a/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin +++ b/plugins/decoder/libsndfile/k3blibsndfiledecoder.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=libk3blibsndfiledecoder -Group=AudioDecoder Name=K3b Libsndfile Decoder +Comment=Decoding module to decode audio files supported by libsndfile Author=Matthieu Bedouet Email=mbedouet@no-log.org Version=1.0 -Comment=Decoding module to decode audio files supported by libsndfile License=GPL +Group=AudioDecoder +Lib=libk3blibsndfiledecoder diff --git a/plugins/decoder/mp3/CMakeLists.txt b/plugins/decoder/mp3/CMakeLists.txt index 2c31bae..a04a4e9 100644 --- a/plugins/decoder/mp3/CMakeLists.txt +++ b/plugins/decoder/mp3/CMakeLists.txt @@ -18,11 +18,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/libk3bdevice ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} + ${TAGLIB_INCLUDE_DIRS} ) link_directories( ${TQT_LIBRARY_DIRS} ${MAD_LIBRARY_DIRS} + ${TAGLIB_LIBRARY_DIRS} ) @@ -31,13 +33,14 @@ link_directories( tde_add_kpart( libk3bmaddecoder AUTOMOC SOURCES k3bmad.cpp k3bmaddecoder.cpp LINK tdecore-shared k3b-shared k3bdevice-shared - ${MAD_LIBRARIES} + ${MAD_LIBRARIES} ${TAGLIB_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) ##### other data ################################ -install( FILES k3bmaddecoder.plugin +tde_create_translated_desktop( + SOURCE k3bmaddecoder.plugin DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins ) diff --git a/plugins/decoder/mp3/Makefile.am b/plugins/decoder/mp3/Makefile.am deleted file mode 100644 index a2befe9..0000000 --- a/plugins/decoder/mp3/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3bdevice $(taglib_includes) $(all_includes) - -kde_module_LTLIBRARIES = libk3bmaddecoder.la - -libk3bmaddecoder_la_SOURCES = k3bmad.cpp k3bmaddecoder.cpp - -libk3bmaddecoder_la_LIBADD = $(LIB_TDECORE) $(MAD_LIB) $(taglib_libs) ../../../libk3b/libk3b.la -libk3bmaddecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - -pluginsdir = $(kde_datadir)/k3b/plugins -plugins_DATA = k3bmaddecoder.plugin - -METASOURCES = AUTO diff --git a/plugins/decoder/mp3/configure.in.bot b/plugins/decoder/mp3/configure.in.bot deleted file mode 100644 index 0ee4872..0000000 --- a/plugins/decoder/mp3/configure.in.bot +++ /dev/null @@ -1,11 +0,0 @@ -echo "" - -if test -n "$MAD_LIB"; then - echo "K3b - Mp3 decoding support (libmad): yes" -else - echo "K3b - Mp3 decoding support (libmad): no" -if test "$ac_cv_use_libmad" = "yes"; then - echo "K3b - You are missing the libmad headers and libraries." - echo "K3b - The Mp3 decoding plugin won't be compiled." -fi -fi diff --git a/plugins/decoder/mp3/configure.in.in b/plugins/decoder/mp3/configure.in.in deleted file mode 100644 index 9da5da7..0000000 --- a/plugins/decoder/mp3/configure.in.in +++ /dev/null @@ -1,24 +0,0 @@ -dnl === libmad MPEG decoder check - begin === -AC_ARG_WITH( - libmad, - AS_HELP_STRING([--without-libmad], [build K3b without libmad support (default=no)]), - [ac_cv_use_libmad=$withval], - [ac_cv_use_libmad=yes] -) - -if test "$ac_cv_use_libmad" = "yes"; then - MAD_LIB="" - KDE_CHECK_HEADER(mad.h, [ - KDE_CHECK_LIB(mad, mad_synth_frame, [ - MAD_LIB="-lmad" - AC_DEFINE(HAVE_LIBMAD,1,[defined if you have libmad headers and libraries])], - [], - $all_libraries - ) - ]) - AC_SUBST(MAD_LIB) - -fi - -AM_CONDITIONAL(include_MP3, [test -n "$MAD_LIB"]) -dnl === libmad MPeg decoder check - end === diff --git a/plugins/decoder/mp3/k3bmaddecoder.cpp b/plugins/decoder/mp3/k3bmaddecoder.cpp index a28e24b..ece3ea7 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.cpp +++ b/plugins/decoder/mp3/k3bmaddecoder.cpp @@ -48,6 +48,7 @@ #ifdef HAVE_TAGLIB #include <taglib/tag.h> #include <taglib/mpegfile.h> +#define TStringToTQString(s) TQString::fromUtf8((s).toCString(true)) #endif @@ -110,11 +111,11 @@ TQString K3bMadDecoder::metaInfo( MetaDataField f ) if ( file.tag() ) { switch( f ) { case META_TITLE: - return TStringToQString( file.tag()->title() ); + return TStringToTQString( file.tag()->title() ); case META_ARTIST: - return TStringToQString( file.tag()->artist() ); + return TStringToTQString( file.tag()->artist() ); case META_COMMENT: - return TStringToQString( file.tag()->comment() ); + return TStringToTQString( file.tag()->comment() ); default: return TQString(); } diff --git a/plugins/decoder/mp3/k3bmaddecoder.h b/plugins/decoder/mp3/k3bmaddecoder.h index df63a1d..de1fe9e 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.h +++ b/plugins/decoder/mp3/k3bmaddecoder.h @@ -26,7 +26,7 @@ extern "C" { class K3bMadDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -44,7 +44,7 @@ class K3bMadDecoderFactory : public K3bAudioDecoderFactory class K3bMadDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/mp3/k3bmaddecoder.plugin b/plugins/decoder/mp3/k3bmaddecoder.plugin index 69fbbb8..2acb7ba 100644 --- a/plugins/decoder/mp3/k3bmaddecoder.plugin +++ b/plugins/decoder/mp3/k3bmaddecoder.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=libk3bmaddecoder -Group=AudioDecoder Name=K3b MAD Decoder +Comment=Decoding module to decode MPEG 1 Layer III files Author=Sebastian Trueg Email=trueg@k3b.org Version=3.1 -Comment=Decoding module to decode MPEG 1 Layer III files License=GPL +Group=AudioDecoder +Lib=libk3bmaddecoder diff --git a/plugins/decoder/musepack/CMakeLists.txt b/plugins/decoder/musepack/CMakeLists.txt index 95fb7ae..71d1e00 100644 --- a/plugins/decoder/musepack/CMakeLists.txt +++ b/plugins/decoder/musepack/CMakeLists.txt @@ -40,6 +40,7 @@ tde_add_kpart( libk3bmpcdecoder AUTOMOC ##### other data ################################ -install( FILES k3bmpcdecoder.plugin +tde_create_translated_desktop( + SOURCE k3bmpcdecoder.plugin DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins ) diff --git a/plugins/decoder/musepack/Makefile.am b/plugins/decoder/musepack/Makefile.am deleted file mode 100644 index b412ee6..0000000 --- a/plugins/decoder/musepack/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/plugin \ - -I$(srcdir)/../../../libk3b/core \ - -I$(srcdir)/../../../libk3bdevice \ - $(all_includes) - -kde_module_LTLIBRARIES = libk3bmpcdecoder.la - -libk3bmpcdecoder_la_SOURCES = k3bmpcdecoder.cpp k3bmpcwrapper.cpp - -libk3bmpcdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la ../../../libk3b/plugin/libk3bplugin.la $(MPC_LIBS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -libk3bmpcdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - -pluginsdir = $(kde_datadir)/k3b/plugins -plugins_DATA = k3bmpcdecoder.plugin - -METASOURCES = AUTO diff --git a/plugins/decoder/musepack/configure.in.bot b/plugins/decoder/musepack/configure.in.bot deleted file mode 100644 index 8fb871b..0000000 --- a/plugins/decoder/musepack/configure.in.bot +++ /dev/null @@ -1,12 +0,0 @@ -echo "" - -if test x$have_mpc = xyes; then - echo "K3b - Musepack support: yes" -else - echo "K3b - Musepack support: no" -if test "$ac_cv_use_mpc" = "yes"; then - echo "K3b - You are missing the Musepack headers and libraries >= 1.1." - echo "K3b - The Musepack audio decoding plugin won't be compiled." -fi -fi - diff --git a/plugins/decoder/musepack/configure.in.in b/plugins/decoder/musepack/configure.in.in deleted file mode 100644 index 1500ae3..0000000 --- a/plugins/decoder/musepack/configure.in.in +++ /dev/null @@ -1,66 +0,0 @@ -dnl --------- MUSEPACK CHECK --------------- - -AC_ARG_WITH( - musepack, - AS_HELP_STRING( - [--without-musepack], - [build K3b without Musepack audio support (default=no)]), - [ac_cv_use_mpc=$withval], - [ac_cv_use_mpc=yes] -) - -have_mpc=no -if test "$ac_cv_use_mpc" = "yes"; then - - dnl - search for both the new and the old naming - - - KDE_CHECK_HEADERS(mpcdec/mpcdec.h, [ - KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [ - have_mpc=yes - MPC_LIBS="-lmpcdec" - AC_DEFINE( - MPC_HEADER_FILE, - <mpcdec/mpcdec.h>, - [The header to include for MPC decoding.]) - ], - [], [], []) - ]) - - if test "$have_mpc" = "no"; then - KDE_CHECK_HEADERS(mpc/mpcdec.h, [ - KDE_CHECK_LIB(mpcdec, mpc_decoder_setup, [ - have_mpc=yes - MPC_LIBS="-lmpcdec" - AC_DEFINE( - MPC_HEADER_FILE, - <mpc/mpcdec.h>, - [The header to include for MPC decoding.]) - ], - [], [], []) - ]) - fi - - if test "$have_mpc" = "no"; then - KDE_CHECK_HEADERS(musepack/musepack.h, [ - KDE_CHECK_LIB(musepack, mpc_decoder_setup, [ - have_mpc=yes - MPC_LIBS="-lmusepack" - AC_DEFINE( - MPC_HEADER_FILE, - <musepack/musepack.h>, - [The header to include for MPC decoding.] - ) - AC_DEFINE( - mpc_bool_t, - BOOL, - [backwards compatibility stuff] - ) - ], [], []) - ]) - fi -fi -AC_SUBST(MPC_LIBS) - -AM_CONDITIONAL(include_MPC, [test x$have_mpc = xyes]) - -dnl --------- MUSEPACK CHECK END ----------- diff --git a/plugins/decoder/musepack/k3bmpcdecoder.h b/plugins/decoder/musepack/k3bmpcdecoder.h index a7f8ae7..aac2312 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.h +++ b/plugins/decoder/musepack/k3bmpcdecoder.h @@ -23,7 +23,7 @@ class K3bMpcWrapper; class K3bMpcDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -41,7 +41,7 @@ class K3bMpcDecoderFactory : public K3bAudioDecoderFactory class K3bMpcDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/musepack/k3bmpcdecoder.plugin b/plugins/decoder/musepack/k3bmpcdecoder.plugin index 6e350dc..4404add 100644 --- a/plugins/decoder/musepack/k3bmpcdecoder.plugin +++ b/plugins/decoder/musepack/k3bmpcdecoder.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=libk3bmpcdecoder -Group=AudioDecoder Name=K3b Musepack Decoder +Comment=Decoding module to decode Musepack audio files Author=Sebastian Trueg Email=trueg@k3b.org Version=1.0 -Comment=Decoding module to decode Musepack audio files License=GPL +Group=AudioDecoder +Lib=libk3bmpcdecoder diff --git a/plugins/decoder/ogg/CMakeLists.txt b/plugins/decoder/ogg/CMakeLists.txt index d240d82..6b67679 100644 --- a/plugins/decoder/ogg/CMakeLists.txt +++ b/plugins/decoder/ogg/CMakeLists.txt @@ -41,6 +41,7 @@ tde_add_kpart( libk3boggvorbisdecoder AUTOMOC ##### other data ################################ -install( FILES k3boggvorbisdecoder.plugin +tde_create_translated_desktop( + SOURCE k3boggvorbisdecoder.plugin DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins ) diff --git a/plugins/decoder/ogg/Makefile.am b/plugins/decoder/ogg/Makefile.am deleted file mode 100644 index e76fc5d..0000000 --- a/plugins/decoder/ogg/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3bdevice $(all_includes) - -kde_module_LTLIBRARIES = libk3boggvorbisdecoder.la - -libk3boggvorbisdecoder_la_SOURCES = k3boggvorbisdecoder.cpp - -libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la -logg -lvorbis -lvorbisfile -libk3boggvorbisdecoder_la_LIBADD = ../../../libk3b/libk3b.la ../../../libk3b/plugin/libk3bplugin.la ../../../libk3bdevice/libk3bdevice.la -logg -lvorbis -lvorbisfile $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) - -libk3boggvorbisdecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - -pluginsdir = $(kde_datadir)/k3b/plugins -plugins_DATA = k3boggvorbisdecoder.plugin - -METASOURCES = AUTO diff --git a/plugins/decoder/ogg/configure.in.bot b/plugins/decoder/ogg/configure.in.bot deleted file mode 100644 index b27ab18..0000000 --- a/plugins/decoder/ogg/configure.in.bot +++ /dev/null @@ -1,11 +0,0 @@ -echo "" - -if test x$ogg_vorbis = xyes; then - echo "K3b - Ogg Vorbis support: yes" -else - echo "K3b - Ogg Vorbis support: no" -if test "$ac_cv_use_oggvorbis" = "yes"; then - echo "K3b - You are missing the Ogg-Vorbis headers and libraries." - echo "K3b - The Ogg Vorbis decoding and encoding plugins won't be compiled." -fi -fi diff --git a/plugins/decoder/ogg/configure.in.in b/plugins/decoder/ogg/configure.in.in deleted file mode 100644 index 69b1b9c..0000000 --- a/plugins/decoder/ogg/configure.in.in +++ /dev/null @@ -1,32 +0,0 @@ -dnl === Ogg Vorbis Test - Begin === -AC_ARG_WITH( - oggvorbis, - AS_HELP_STRING([--without-oggvorbis], [build K3b without OggVorbis support (default=no)]), - [ac_cv_use_oggvorbis=$withval], - [ac_cv_use_oggvorbis=yes] -) - -if test "$ac_cv_use_oggvorbis" = "yes"; then - - AC_MSG_CHECKING(for ogg/vorbis headers) - ogg_vorbis=no - AC_TRY_COMPILE([ - #include <vorbis/codec.h> - #include <vorbis/vorbisfile.h> - ],[ - ],[ - ogg_vorbis=yes - ]) - AC_MSG_RESULT($ogg_vorbis) - if test x$ogg_vorbis = xyes; then - dnl we need the ogg_vorbis_lib because otherwise we override LIBS ! - AC_CHECK_LIB(vorbisfile,ov_open,ogg_vorbis_lib=yes, - ogg_vorbis=no,[$all_libraries -lvorbisfile -lvorbis -logg]) - fi - if test x$ogg_vorbis = xyes; then - AC_DEFINE(OGG_VORBIS,1,[Define if you have ogg/vorbis installed]) - fi -fi - -AM_CONDITIONAL(include_OGG, [test x$ogg_vorbis = xyes]) -dnl === Ogg Vorbis Test - End === diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.h b/plugins/decoder/ogg/k3boggvorbisdecoder.h index 6f298bc..8a465e6 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.h +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.h @@ -25,7 +25,7 @@ class KURL; class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ class K3bOggVorbisDecoderFactory : public K3bAudioDecoderFactory */ class K3bOggVorbisDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/ogg/k3boggvorbisdecoder.plugin b/plugins/decoder/ogg/k3boggvorbisdecoder.plugin index 0f1c48e..2da56d0 100644 --- a/plugins/decoder/ogg/k3boggvorbisdecoder.plugin +++ b/plugins/decoder/ogg/k3boggvorbisdecoder.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=libk3boggvorbisdecoder -Group=AudioDecoder Name=K3b Ogg Vorbis Decoder +Comment=Decoding module to decode Ogg Vorbis files Author=Sebastian Trueg Email=trueg@k3b.org Version=3.0 -Comment=Decoding module to decode Ogg Vorbis files License=GPL +Group=AudioDecoder +Lib=libk3boggvorbisdecoder diff --git a/plugins/decoder/skeleton.h b/plugins/decoder/skeleton.h index 19602a6..64cef9d 100644 --- a/plugins/decoder/skeleton.h +++ b/plugins/decoder/skeleton.h @@ -21,7 +21,7 @@ class K3b<name>DecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -39,7 +39,7 @@ class K3b<name>DecoderFactory : public K3bAudioDecoderFactory class K3b<name>Decoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/skeleton.plugin b/plugins/decoder/skeleton.plugin index c9bc0f4..dd3f1b8 100644 --- a/plugins/decoder/skeleton.plugin +++ b/plugins/decoder/skeleton.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=lib<name>decoder -Group=AudioDecoder Name=K3b ??? Decoder +Comment=Decoding module to decode ??? files Author=??? Email=??? Version=0.1 -Comment=Decoding module to decode ??? files License=??? +Group=AudioDecoder +Lib=lib<name>decoder diff --git a/plugins/decoder/wave/CMakeLists.txt b/plugins/decoder/wave/CMakeLists.txt index 570cf4e..917020e 100644 --- a/plugins/decoder/wave/CMakeLists.txt +++ b/plugins/decoder/wave/CMakeLists.txt @@ -36,6 +36,7 @@ tde_add_kpart( libk3bwavedecoder AUTOMOC ##### other data ################################ -install( FILES k3bwavedecoder.plugin +tde_create_translated_desktop( + SOURCE k3bwavedecoder.plugin DESTINATION ${DATA_INSTALL_DIR}/k3b/plugins ) diff --git a/plugins/decoder/wave/Makefile.am b/plugins/decoder/wave/Makefile.am deleted file mode 100644 index 61aa8d6..0000000 --- a/plugins/decoder/wave/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -AM_CPPFLAGS = -I$(srcdir)/../../../libk3b/plugin -I$(srcdir)/../../../libk3b/core -I$(srcdir)/../../../libk3bdevice $(all_includes) - -kde_module_LTLIBRARIES = libk3bwavedecoder.la - -libk3bwavedecoder_la_SOURCES = k3bwavedecoder.cpp - -libk3bwavedecoder_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) ../../../libk3b/libk3b.la ../../../libk3bdevice/libk3bdevice.la -libk3bwavedecoder_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) - -pluginsdir = $(kde_datadir)/k3b/plugins -plugins_DATA = k3bwavedecoder.plugin - -METASOURCES = AUTO diff --git a/plugins/decoder/wave/k3bwavedecoder.h b/plugins/decoder/wave/k3bwavedecoder.h index 892425d..bdd0a8d 100644 --- a/plugins/decoder/wave/k3bwavedecoder.h +++ b/plugins/decoder/wave/k3bwavedecoder.h @@ -28,7 +28,7 @@ class TQFile; class LIBK3B_EXPORT K3bWaveDecoderFactory : public K3bAudioDecoderFactory { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ class LIBK3B_EXPORT K3bWaveDecoderFactory : public K3bAudioDecoderFactory class LIBK3B_EXPORT K3bWaveDecoder : public K3bAudioDecoder { - Q_OBJECT + TQ_OBJECT public: diff --git a/plugins/decoder/wave/k3bwavedecoder.plugin b/plugins/decoder/wave/k3bwavedecoder.plugin index 7b0a4f4..26cfc6e 100644 --- a/plugins/decoder/wave/k3bwavedecoder.plugin +++ b/plugins/decoder/wave/k3bwavedecoder.plugin @@ -1,9 +1,9 @@ [K3b Plugin] -Lib=libk3bwavedecoder -Group=AudioDecoder Name=K3b Wave Decoder +Comment=Decoding module to decode wave files Author=Sebastian Trueg Email=trueg@k3b.org Version=3.0 -Comment=Decoding module to decode wave files License=GPL +Group=AudioDecoder +Lib=libk3bwavedecoder |