iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove AudioCD tracks from playqueue when device removed

Browse Source
This commit is contained in:
Craig Drummond
2015-08-18 23:45:03 +01:00
parent 673716921e
commit 6fdae108b8
5 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devices/audiocddevice.cpp
View File

@@ -149,7 +149,7 @@ AudioCdDevice::~AudioCdDevice()
}
if (!tracks.isEmpty()) {
emit invalid(tracks);
PlayQueueModel::self()->remove(tracks);
}
#ifdef CDDB_FOUND

1
devices/device.h
View File

@@ -192,7 +192,6 @@ Q_SIGNALS:
void cover(const Song &song, const QImage &img);
void cacheSaved();
void configurationChanged();
void invalid(const QList<Song> &songs);
void play(const QList<Song> &songs);
void updatedDetails(const QList<Song> &songs);
void renamed();

1
models/devicesmodel.cpp
View File

@@ -455,7 +455,6 @@ void DevicesModel::addLocalDevice(const QString &udi)
connect(dev, SIGNAL(updating(const QString &, bool)), SLOT(deviceUpdating(const QString &, bool)));
connect(dev, SIGNAL(error(const QString &)), SIGNAL(error(const QString &)));
connect(dev, SIGNAL(cover(const Song &, const QImage &)), SLOT(setCover(const Song &, const QImage &)));
connect(dev, SIGNAL(invalid(QList<Song>)), SIGNAL(invalid(QList<Song>)));
connect(dev, SIGNAL(updatedDetails(QList<Song>)), SIGNAL(updatedDetails(QList<Song>)));
connect(dev, SIGNAL(play(QList<Song>)), SLOT(play(QList<Song>)));
connect(dev, SIGNAL(renamed()), this, SLOT(updateItemMenu()));

1
models/playqueuemodel.cpp
View File

@@ -227,7 +227,6 @@ PlayQueueModel::PlayQueueModel(QObject *parent)
connect(MPDConnection::self(), SIGNAL(rating(QString,quint8)), SLOT(ratingResult(QString,quint8)));
connect(MPDConnection::self(), SIGNAL(stickerDbChanged()), SLOT(stickerDbChanged()));
#ifdef ENABLE_DEVICES_SUPPORT //TODO: Problems here with devices support!!!
connect(DevicesModel::self(), SIGNAL(invalid(QList<Song>)), SLOT(remove(QList<Song>)));
connect(DevicesModel::self(), SIGNAL(updatedDetails(QList<Song>)), SLOT(updateDetails(QList<Song>)));
#endif
#if defined ENABLE_MODEL_TEST

2
models/playqueuemodel.h
View File

@@ -140,6 +140,7 @@ public:
void enableUndo(bool e);
bool lastCommandWasUnodOrRedo() const { return Cmd_Other!=lastCommand; }
qint32 totalTime() const { return time; }
void remove(const QList<Song> &rem);
private:
void saveHistory(const QList<Song> &prevList);
@@ -160,7 +161,6 @@ public Q_SLOTS:
private Q_SLOTS:
void sortBy();
void stopAfterCurrentChanged(bool afterCurrent);
void remove(const QList<Song> &rem);
void updateDetails(const QList<Song> &updated);
void undo();
void redo();