dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename protobuf namespace

Browse Source 
Fixes #654
This commit is contained in:
Jonas Kvinge
2021-02-20 17:06:55 +01:00
parent 75c2a630f6
commit 193cf1c750
10 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/song.cpp
View File

@@ -744,7 +744,7 @@ void Song::set_genre_id3(int id) {
set_genre(TStringToQString(TagLib::ID3v1::genre(id)));
}
void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
void Song::InitFromProtobuf(const spb::tagreader::SongMetadata &pb) {
if (d->source_ == Source_Unknown) d->source_ = Source_LocalFile;
@@ -791,7 +791,7 @@ void Song::InitFromProtobuf(const pb::tagreader::SongMetadata &pb) {
}
void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
void Song::ToProtobuf(spb::tagreader::SongMetadata *pb) const {
const QByteArray url(d->url_.toEncoded());
const QByteArray art_automatic(d->art_automatic_.toEncoded());
@@ -826,7 +826,7 @@ void Song::ToProtobuf(pb::tagreader::SongMetadata *pb) const {
pb->set_filesize(d->filesize_);
pb->set_suspicious_tags(d->suspicious_tags_);
pb->set_art_automatic(art_automatic.constData(), art_automatic.size());
pb->set_filetype(static_cast<pb::tagreader::SongMetadata_FileType>(d->filetype_));
pb->set_filetype(static_cast<spb::tagreader::SongMetadata_FileType>(d->filetype_));
}