summaryrefslogtreecommitdiffstats
path: root/plugins/decoder/flac/k3bflacdecoder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/decoder/flac/k3bflacdecoder.cpp')
-rw-r--r--plugins/decoder/flac/k3bflacdecoder.cpp11
1 files changed, 6 insertions, 5 deletions
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