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

Fix AudioCdDevice::isDevice hiding Device::isDevice

Browse Source
This commit is contained in:
craig.p.drummond
2013-10-25 20:03:12 +00:00
parent 469ebc0b2a
commit e0c14913ec
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devices/audiocddevice.cpp
View File

@@ -165,7 +165,7 @@ AudioCdDevice::~AudioCdDevice()
#endif
}
bool AudioCdDevice::isDevice(const QString &dev)
bool AudioCdDevice::isAudioDevice(const QString &dev) const
{
return constAnyDev==dev || device==dev;
}

2
devices/audiocddevice.h
View File

@@ -57,7 +57,7 @@ public:
virtual ~AudioCdDevice();
QImage image() const { return cover().img; }
bool isDevice(const QString &dev);
bool isAudioDevice(const QString &dev) const;
bool supportsDisconnect() const { return 0!=drive; }
bool isConnected() const { return !device.isEmpty(); }
void rescan(bool useCddb);

4
models/devicesmodel.cpp
View File

@@ -405,7 +405,7 @@ void DevicesModel::addLocalDevice(const QString &udi)
if (Device::AudioCd==dev->devType()) {
connect(static_cast<AudioCdDevice *>(dev), SIGNAL(matches(const QString &, const QList<CdAlbum> &)),
SIGNAL(matches(const QString &, const QList<CdAlbum> &)));
if (!autoplayCd.isEmpty() && static_cast<AudioCdDevice *>(dev)->isDevice(autoplayCd)) {
if (!autoplayCd.isEmpty() && static_cast<AudioCdDevice *>(dev)->isAudioDevice(autoplayCd)) {
autoplayCd=QString();
static_cast<AudioCdDevice *>(dev)->autoplay();
}
@@ -659,7 +659,7 @@ void DevicesModel::playCd(const QString &dev)
{
foreach (MusicLibraryItemRoot *col, collections) {
Device *d=static_cast<Device *>(col);
if (Device::AudioCd==d->devType() && static_cast<AudioCdDevice *>(d)->isDevice(dev)) {
if (Device::AudioCd==d->devType() && static_cast<AudioCdDevice *>(d)->isAudioDevice(dev)) {
static_cast<AudioCdDevice *>(d)->autoplay();
return;
}