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

Fix macos build

Browse Source
This commit is contained in:
Jonas Kvinge
2018-07-01 22:26:46 +02:00
parent c4e75dea65
commit ada7325a04
51 changed files with 453 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/collection/collection.cpp
View File

@@ -38,12 +38,12 @@
#include "collectionmodel.h"
#include "playlist/playlistmanager.h"
const char *Collection::kSongsTable = "songs";
const char *Collection::kDirsTable = "directories";
const char *Collection::kSubdirsTable = "subdirectories";
const char *Collection::kFtsTable = "songs_fts";
const char *SCollection::kSongsTable = "songs";
const char *SCollection::kDirsTable = "directories";
const char *SCollection::kSubdirsTable = "subdirectories";
const char *SCollection::kFtsTable = "songs_fts";
Collection::Collection(Application *app, QObject *parent)
SCollection::SCollection(Application *app, QObject *parent)
: QObject(parent),
app_(app),
backend_(nullptr),
@@ -63,14 +63,14 @@ Collection::Collection(Application *app, QObject *parent)
}
Collection::~Collection() {
SCollection::~SCollection() {
watcher_->deleteLater();
watcher_thread_->exit();
watcher_thread_->wait(5000 /* five seconds */);
}
void Collection::Init() {
void SCollection::Init() {
watcher_ = new CollectionWatcher;
watcher_thread_ = new Thread(this);
@@ -98,26 +98,26 @@ void Collection::Init() {
backend_->LoadDirectoriesAsync();
}
void Collection::IncrementalScan() { watcher_->IncrementalScanAsync(); }
void SCollection::IncrementalScan() { watcher_->IncrementalScanAsync(); }
void Collection::FullScan() { watcher_->FullScanAsync(); }
void SCollection::FullScan() { watcher_->FullScanAsync(); }
void Collection::PauseWatcher() { watcher_->SetRescanPausedAsync(true); }
void SCollection::PauseWatcher() { watcher_->SetRescanPausedAsync(true); }
void Collection::ResumeWatcher() { watcher_->SetRescanPausedAsync(false); }
void SCollection::ResumeWatcher() { watcher_->SetRescanPausedAsync(false); }
void SCollection::ReloadSettings() {
void Collection::ReloadSettings() {
watcher_->ReloadSettingsAsync();
}
void Collection::Stopped() {
void SCollection::Stopped() {
CurrentSongChanged(Song());
}
void Collection::CurrentSongChanged(const Song &song) {
void SCollection::CurrentSongChanged(const Song &song) {
TagReaderReply *reply = nullptr;

6
src/collection/collection.h
View File

@@ -36,12 +36,12 @@ class CollectionBackend;
class CollectionModel;
class CollectionWatcher;
class Collection : public QObject {
class SCollection : public QObject {
Q_OBJECT
public:
Collection(Application* app, QObject* parent);
~Collection();
SCollection(Application *app, QObject *parent);
~SCollection();
static const char *kSongsTable;
static const char *kDirsTable;