Skip to content

Commit

Permalink
Fix usage of deprecated TagLib functions
Browse files Browse the repository at this point in the history
  • Loading branch information
@bilde2910 @hatstand
bilde2910 authored and hatstand committed Jan 9, 2025
1 parent c3daf0a commit 9549e2b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
14 changes: 7 additions & 7 deletions ext/libclementine-tagreader/cloudstream.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void CloudStream::Precache() {
clear();
}

TagLib::ByteVector CloudStream::readBlock(ulong length) {
TagLib::ByteVector CloudStream::readBlock(size_t length) {
const uint start = cursor_;
const uint end = qMin(cursor_ + length - 1, length_ - 1);

Expand Down Expand Up @@ -144,11 +144,11 @@ void CloudStream::writeBlock(const TagLib::ByteVector&) {
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}

void CloudStream::insert(const TagLib::ByteVector&, ulong, ulong) {
void CloudStream::insert(const TagLib::ByteVector&, TagLib::offset_t, size_t) {
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}

void CloudStream::removeBlock(ulong, ulong) {
void CloudStream::removeBlock(TagLib::offset_t, size_t) {
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}

Expand All @@ -159,7 +159,7 @@ bool CloudStream::readOnly() const {

bool CloudStream::isOpen() const { return true; }

void CloudStream::seek(long offset, TagLib::IOStream::Position p) {
void CloudStream::seek(TagLib::offset_t offset, TagLib::IOStream::Position p) {
switch (p) {
case TagLib::IOStream::Beginning:
cursor_ = offset;
Expand All @@ -178,11 +178,11 @@ void CloudStream::seek(long offset, TagLib::IOStream::Position p) {

void CloudStream::clear() { cursor_ = 0; }

long CloudStream::tell() const { return cursor_; }
TagLib::offset_t CloudStream::tell() const { return cursor_; }

long CloudStream::length() { return length_; }
TagLib::offset_t CloudStream::length() { return length_; }

void CloudStream::truncate(long) {
void CloudStream::truncate(TagLib::offset_t) {
qLog(Debug) << Q_FUNC_INFO << "not implemented";
}

Expand Down
14 changes: 7 additions & 7 deletions ext/libclementine-tagreader/cloudstream.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,17 @@ class CloudStream : public QObject, public TagLib::IOStream {

// Taglib::IOStream
virtual TagLib::FileName name() const;
virtual TagLib::ByteVector readBlock(ulong length);
virtual TagLib::ByteVector readBlock(size_t length);
virtual void writeBlock(const TagLib::ByteVector&);
virtual void insert(const TagLib::ByteVector&, ulong, ulong);
virtual void removeBlock(ulong, ulong);
virtual void insert(const TagLib::ByteVector&, TagLib::offset_t, size_t);
virtual void removeBlock(TagLib::offset_t, size_t);
virtual bool readOnly() const;
virtual bool isOpen() const;
virtual void seek(long offset, TagLib::IOStream::Position p);
virtual void seek(TagLib::offset_t offset, TagLib::IOStream::Position p);
virtual void clear();
virtual long tell() const;
virtual long length();
virtual void truncate(long);
virtual TagLib::offset_t tell() const;
virtual TagLib::offset_t length();
virtual void truncate(TagLib::offset_t);

google::sparsetable<char>::size_type cached_bytes() const {
return cache_.num_nonempty();
Expand Down
28 changes: 14 additions & 14 deletions ext/libclementine-tagreader/tagreader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ void TagReader::ReadFile(const QString& filename,
// Find album artists
TagLib::APE::ItemListMap::ConstIterator it = items.find("ALBUM ARTIST");
if (it != items.end()) {
TagLib::StringList album_artists = it->second.toStringList();
TagLib::StringList album_artists = it->second.values();
if (!album_artists.isEmpty()) {
Decode(album_artists.front(), nullptr, song->mutable_albumartist());
}
Expand Down Expand Up @@ -243,22 +243,22 @@ void TagReader::ReadFile(const QString& filename,
}

if (items.contains("BPM")) {
Decode(items["BPM"].toStringList().toString(", "), nullptr,
Decode(items["BPM"].values().toString(", "), nullptr,
song->mutable_performer());
}

if (items.contains("PERFORMER")) {
Decode(items["PERFORMER"].toStringList().toString(", "), nullptr,
Decode(items["PERFORMER"].values().toString(", "), nullptr,
song->mutable_performer());
}

if (items.contains("COMPOSER")) {
Decode(items["COMPOSER"].toStringList().toString(", "), nullptr,
Decode(items["COMPOSER"].values().toString(", "), nullptr,
song->mutable_composer());
}

if (items.contains("GROUPING")) {
Decode(items["GROUPING"].toStringList().toString(" "), nullptr,
Decode(items["GROUPING"].values().toString(" "), nullptr,
song->mutable_grouping());
}

Expand Down Expand Up @@ -565,8 +565,8 @@ void TagReader::ReadFile(const QString& filename,
if (fileref->audioProperties()) {
song->set_bitrate(fileref->audioProperties()->bitrate());
song->set_samplerate(fileref->audioProperties()->sampleRate());
song->set_length_nanosec(fileref->audioProperties()->length() *
kNsecPerSec);
song->set_length_nanosec(fileref->audioProperties()->lengthInMilliseconds() *
kNsecPerMsec);
}

// Get the filetype if we can
Expand Down Expand Up @@ -1376,9 +1376,9 @@ bool TagReader::ReadCloudFile(const QUrl& download_url, const QString& title,
std::unique_ptr<TagLib::File> tag;
if (mime_type == "audio/mpeg" &&
title.endsWith(".mp3", Qt::CaseInsensitive)) {
tag.reset(new TagLib::MPEG::File(stream.get(),
TagLib::ID3v2::FrameFactory::instance(),
TagLib::AudioProperties::Accurate));
tag.reset(new TagLib::MPEG::File(stream.get(), true,
TagLib::AudioProperties::Accurate,
TagLib::ID3v2::FrameFactory::instance()));
} else if (mime_type == "audio/mp4" ||
(mime_type == "audio/mpeg" &&
title.endsWith(".m4a", Qt::CaseInsensitive))) {
Expand All @@ -1398,9 +1398,9 @@ bool TagReader::ReadCloudFile(const QUrl& download_url, const QString& title,
TagLib::AudioProperties::Accurate));
} else if (mime_type == "application/x-flac" || mime_type == "audio/flac" ||
mime_type == "audio/x-flac") {
tag.reset(new TagLib::FLAC::File(stream.get(),
TagLib::ID3v2::FrameFactory::instance(),
true, TagLib::AudioProperties::Accurate));
tag.reset(new TagLib::FLAC::File(stream.get(), true,
TagLib::AudioProperties::Accurate,
TagLib::ID3v2::FrameFactory::instance()));
} else if (mime_type == "audio/x-ms-wma") {
tag.reset(new TagLib::ASF::File(stream.get(), true,
TagLib::AudioProperties::Accurate));
Expand Down Expand Up @@ -1431,7 +1431,7 @@ bool TagReader::ReadCloudFile(const QUrl& download_url, const QString& title,
song->set_type(cpb::tagreader::SongMetadata_Type_STREAM);

if (tag->audioProperties()) {
song->set_length_nanosec(tag->audioProperties()->length() * kNsecPerSec);
song->set_length_nanosec(tag->audioProperties()->lengthInMilliseconds() * kNsecPerMsec);
}
return true;
}
Expand Down

0 comments on commit 9549e2b

Please sign in to comment.