summaryrefslogtreecommitdiffstats
path: root/kioslave/audiocd/plugins/flac/encoderflac.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /kioslave/audiocd/plugins/flac/encoderflac.cpp
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kioslave/audiocd/plugins/flac/encoderflac.cpp')
-rw-r--r--kioslave/audiocd/plugins/flac/encoderflac.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kioslave/audiocd/plugins/flac/encoderflac.cpp b/kioslave/audiocd/plugins/flac/encoderflac.cpp
index 4be1aeb3..fd98f8b4 100644
--- a/kioslave/audiocd/plugins/flac/encoderflac.cpp
+++ b/kioslave/audiocd/plugins/flac/encoderflac.cpp
@@ -53,9 +53,9 @@ public:
};
#ifdef LEGACY_FLAC
-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
+static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
#else
-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
+static FLAC__StreamEncoderWritetqStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
#endif
{
EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
@@ -80,7 +80,7 @@ static void MetadataCallback (const FLAC__StreamEncoder *encoder, const FLAC__St
}
/*
-static FLAC__SeekableStreamEncoderSeekStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
+static FLAC__SeekableStreamEncoderSeektqStatus SeekCallback(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data)
{} ; */
@@ -177,14 +177,14 @@ void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const TQString &c
// d->metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING);
// d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE)
- typedef QPair<TQString, TQVariant> Comment;
+ typedef TQPair<TQString, TQVariant> Comment;
Comment comments[7] = { Comment("Title", info.trackInfoList[track].get("title")),
Comment("Artist", info.get("artist")),
Comment("Album", info.get("title")),
Comment("Genre", info.get("genre")),
Comment("Tracknumber", TQString::number(track+1)),
Comment("Comment", comment),
- Comment("Date", TQString::null )};
+ Comment("Date", TQString() )};
if (info.get("Year").toInt() > 0) {
TQDateTime dt(TQDate(info.get("Year").toInt(), 1, 1));
comments[6] = Comment("Date", dt.toString(Qt::ISODate));