No need to pass Application to RadioBackend
This commit is contained in:
parent
d8f0ae0980
commit
dbf18db3a3
|
@ -22,15 +22,13 @@
|
||||||
#include <QMutexLocker>
|
#include <QMutexLocker>
|
||||||
|
|
||||||
#include "core/logging.h"
|
#include "core/logging.h"
|
||||||
#include "core/application.h"
|
|
||||||
#include "core/database.h"
|
#include "core/database.h"
|
||||||
#include "core/song.h"
|
#include "core/song.h"
|
||||||
#include "radiobackend.h"
|
#include "radiobackend.h"
|
||||||
#include "radiochannel.h"
|
#include "radiochannel.h"
|
||||||
|
|
||||||
RadioBackend::RadioBackend(Application *app, Database *db, QObject *parent)
|
RadioBackend::RadioBackend(Database *db, QObject *parent)
|
||||||
: QObject(parent),
|
: QObject(parent),
|
||||||
app_(app),
|
|
||||||
db_(db),
|
db_(db),
|
||||||
original_thread_(thread()) {}
|
original_thread_(thread()) {}
|
||||||
|
|
||||||
|
|
|
@ -24,14 +24,13 @@
|
||||||
|
|
||||||
#include "radiochannel.h"
|
#include "radiochannel.h"
|
||||||
|
|
||||||
class Application;
|
|
||||||
class Database;
|
class Database;
|
||||||
|
|
||||||
class RadioBackend : public QObject {
|
class RadioBackend : public QObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit RadioBackend(Application *app, Database *db, QObject *parent = nullptr);
|
explicit RadioBackend(Database *db, QObject *parent = nullptr);
|
||||||
|
|
||||||
void Close();
|
void Close();
|
||||||
void ExitAsync();
|
void ExitAsync();
|
||||||
|
@ -53,7 +52,6 @@ class RadioBackend : public QObject {
|
||||||
void Exit();
|
void Exit();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Application *app_;
|
|
||||||
Database *db_;
|
Database *db_;
|
||||||
QThread *original_thread_;
|
QThread *original_thread_;
|
||||||
};
|
};
|
||||||
|
|
|
@ -38,7 +38,7 @@ RadioServices::RadioServices(Application *app, QObject *parent)
|
||||||
model_(new RadioModel(app, this)),
|
model_(new RadioModel(app, this)),
|
||||||
channels_refresh_(false) {
|
channels_refresh_(false) {
|
||||||
|
|
||||||
backend_ = new RadioBackend(app, app->database());
|
backend_ = new RadioBackend(app->database());
|
||||||
app->MoveToThread(backend_, app->database()->thread());
|
app->MoveToThread(backend_, app->database()->thread());
|
||||||
|
|
||||||
QObject::connect(backend_, &RadioBackend::NewChannels, this, &RadioServices::GotChannelsFromBackend);
|
QObject::connect(backend_, &RadioBackend::NewChannels, this, &RadioServices::GotChannelsFromBackend);
|
||||||
|
|
Loading…
Reference in New Issue