Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Change message reply ID's back to int32 

Fixes #653
This commit is contained in:
Jonas Kvinge 2021-02-20 16:16:17 +01:00
parent 0ab214fd5d
commit 3a7cecac31
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/libstrawberry-common/core/messagehandler.h
View File

@ -111,7 +111,7 @@ class AbstractMessageHandler : public _MessageHandlerBase {
void AbortAll() override; void AbortAll() override;
private: private:
QMap<qint64, ReplyType*> pending_replies_; QMap<int, ReplyType*> pending_replies_;
}; };
template <typename MT> template <typename MT>

4
ext/libstrawberry-common/core/messagereply.h
View File

@ -34,7 +34,7 @@ class _MessageReplyBase : public QObject {
public: public:
explicit _MessageReplyBase(QObject *parent = nullptr); explicit _MessageReplyBase(QObject *parent = nullptr);
virtual qint64 id() const = 0; virtual int id() const = 0;
bool is_finished() const { return finished_; } bool is_finished() const { return finished_; }
bool is_successful() const { return success_; } bool is_successful() const { return success_; }
@ -60,7 +60,7 @@ class MessageReply : public _MessageReplyBase {
public: public:
explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr); explicit MessageReply(const MessageType &request_message, QObject *parent = nullptr);
qint64 id() const override { return request_message_.id(); } int id() const override { return request_message_.id(); }
const MessageType &request_message() const { return request_message_; } const MessageType &request_message() const { return request_message_; }
const MessageType &message() const { return reply_message_; } const MessageType &message() const { return reply_message_; }

6
ext/libstrawberry-common/core/workerpool.h
View File

@ -32,7 +32,7 @@
#include <QQueue> #include <QQueue>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QAtomicInteger> #include <QAtomicInt>
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
# include <QRandomGenerator> # include <QRandomGenerator>
#endif #endif
@ -147,7 +147,7 @@ class WorkerPool : public _WorkerPoolBase {
mutable int next_worker_; mutable int next_worker_;
QList<Worker> workers_; QList<Worker> workers_;
QAtomicInteger<qint64> next_id_; QAtomicInt next_id_;
QMutex message_queue_mutex_; QMutex message_queue_mutex_;
QQueue<ReplyType*> message_queue_; QQueue<ReplyType*> message_queue_;
@ -356,7 +356,7 @@ template <typename HandlerType>
typename WorkerPool<HandlerType>::ReplyType* typename WorkerPool<HandlerType>::ReplyType*
WorkerPool<HandlerType>::NewReply(MessageType *message) { WorkerPool<HandlerType>::NewReply(MessageType *message) {
const qint64 id = next_id_.fetchAndAddOrdered(1); const int id = next_id_.fetchAndAddOrdered(1);
message->set_id(id); message->set_id(id);
return new ReplyType(*message); return new ReplyType(*message);

2
ext/libstrawberry-tagreader/tagreadermessages.proto
View File

@ -110,7 +110,7 @@ message SaveEmbeddedArtResponse {
} }
message Message { message Message {
optional int64 id = 1; optional int32 id = 1;
optional ReadFileRequest read_file_request = 2; optional ReadFileRequest read_file_request = 2;
optional ReadFileResponse read_file_response = 3; optional ReadFileResponse read_file_response = 3;