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_));
}

8
src/core/song.h
View File

@@ -44,11 +44,11 @@ namespace Engine {
struct SimpleMetaBundle;
} // namespace Engine
namespace pb {
namespace spb {
namespace tagreader {
class SongMetadata;
} // namespace tagreader
} // namespace pb
} // namespace spb
#ifdef HAVE_LIBGPOD
struct _Itdb_Track;
@@ -155,7 +155,7 @@ class Song {
// Constructors
void Init(const QString &title, const QString &artist, const QString &album, qint64 length_nanosec);
void Init(const QString &title, const QString &artist, const QString &album, qint64 beginning, qint64 end);
void InitFromProtobuf(const pb::tagreader::SongMetadata &pb);
void InitFromProtobuf(const spb::tagreader::SongMetadata &pb);
void InitFromQuery(const SqlRow &query, bool reliable_metadata, int col = 0);
void InitFromFilePartial(const QString &filename); // Just store the filename: incomplete but fast
void InitArtManual(); // Check if there is already a art in the cache and store the filename in art_manual
@@ -180,7 +180,7 @@ class Song {
void BindToQuery(QSqlQuery *query) const;
void BindToFtsQuery(QSqlQuery *query) const;
void ToXesam(QVariantMap *map) const;
void ToProtobuf(pb::tagreader::SongMetadata *pb) const;
void ToProtobuf(spb::tagreader::SongMetadata *pb) const;
// Simple accessors
bool is_valid() const;

20
src/core/tagreaderclient.cpp
View File

@@ -71,8 +71,8 @@ void TagReaderClient::WorkerFailedToStart() {
TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
pb::tagreader::Message message;
pb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
spb::tagreader::Message message;
spb::tagreader::ReadFileRequest *req = message.mutable_read_file_request();
req->set_filename(DataCommaSizeFromQString(filename));
@@ -82,8 +82,8 @@ TagReaderReply *TagReaderClient::ReadFile(const QString &filename) {
TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &metadata) {
pb::tagreader::Message message;
pb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
spb::tagreader::Message message;
spb::tagreader::SaveFileRequest *req = message.mutable_save_file_request();
req->set_filename(DataCommaSizeFromQString(filename));
metadata.ToProtobuf(req->mutable_metadata());
@@ -96,8 +96,8 @@ TagReaderReply *TagReaderClient::SaveFile(const QString &filename, const Song &m
TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
pb::tagreader::Message message;
pb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
spb::tagreader::Message message;
spb::tagreader::IsMediaFileRequest *req = message.mutable_is_media_file_request();
req->set_filename(DataCommaSizeFromQString(filename));
@@ -107,8 +107,8 @@ TagReaderReply *TagReaderClient::IsMediaFile(const QString &filename) {
TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
pb::tagreader::Message message;
pb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
spb::tagreader::Message message;
spb::tagreader::LoadEmbeddedArtRequest *req = message.mutable_load_embedded_art_request();
req->set_filename(DataCommaSizeFromQString(filename));
@@ -118,8 +118,8 @@ TagReaderReply *TagReaderClient::LoadEmbeddedArt(const QString &filename) {
TagReaderReply *TagReaderClient::SaveEmbeddedArt(const QString &filename, const QByteArray &data) {
pb::tagreader::Message message;
pb::tagreader::SaveEmbeddedArtRequest *req = message.mutable_save_embedded_art_request();
spb::tagreader::Message message;
spb::tagreader::SaveEmbeddedArtRequest *req = message.mutable_save_embedded_art_request();
req->set_filename(DataCommaSizeFromQString(filename));
req->set_data(data.constData(), data.size());

4
src/core/tagreaderclient.h
View File

@@ -44,7 +44,7 @@ class TagReaderClient : public QObject {
public:
explicit TagReaderClient(QObject *parent = nullptr);
typedef AbstractMessageHandler<pb::tagreader::Message> HandlerType;
typedef AbstractMessageHandler<spb::tagreader::Message> HandlerType;
typedef HandlerType::ReplyType ReplyType;
static const char *kWorkerExecutableName;
@@ -80,7 +80,7 @@ class TagReaderClient : public QObject {
static TagReaderClient *sInstance;
WorkerPool<HandlerType> *worker_pool_;
QList<pb::tagreader::Message> message_queue_;
QList<spb::tagreader::Message> message_queue_;
QThread *original_thread_;
};