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

Rename Cdda to CDDA

Browse Source
This commit is contained in:
Jonas Kvinge
2025-06-09 04:21:17 +02:00
parent ae13fe7f52
commit bf0704f6b2
9 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/songloader.cpp
View File

@@ -178,9 +178,9 @@ SongLoader::Result SongLoader::LoadLocalPartial(const QString &filename) {
SongLoader::Result SongLoader::LoadAudioCD() { SongLoader::Result SongLoader::LoadAudioCD() {
#ifdef HAVE_AUDIOCD #ifdef HAVE_AUDIOCD
CddaSongLoader *cdda_song_loader = new CddaSongLoader(QUrl(), this); CDDASongLoader *cdda_song_loader = new CDDASongLoader(QUrl(), this);
QObject::connect(cdda_song_loader, &CddaSongLoader::SongsDurationLoaded, this, &SongLoader::AudioCDTracksLoadFinishedSlot); QObject::connect(cdda_song_loader, &CDDASongLoader::SongsDurationLoaded, this, &SongLoader::AudioCDTracksLoadFinishedSlot);
QObject::connect(cdda_song_loader, &CddaSongLoader::SongsMetadataLoaded, this, &SongLoader::AudioCDTracksTagsLoaded); QObject::connect(cdda_song_loader, &CDDASongLoader::SongsMetadataLoaded, this, &SongLoader::AudioCDTracksTagsLoaded);
cdda_song_loader->LoadSongs(); cdda_song_loader->LoadSongs();
return Result::Success; return Result::Success;
#else #else
@@ -202,7 +202,7 @@ void SongLoader::AudioCDTracksLoadFinishedSlot(const SongList &songs, const QStr
void SongLoader::AudioCDTracksTagsLoaded(const SongList &songs) { void SongLoader::AudioCDTracksTagsLoaded(const SongList &songs) {
CddaSongLoader *cdda_song_loader = qobject_cast<CddaSongLoader*>(sender()); CDDASongLoader *cdda_song_loader = qobject_cast<CDDASongLoader*>(sender());
cdda_song_loader->deleteLater(); cdda_song_loader->deleteLater();
songs_ = songs; songs_ = songs;
Q_EMIT LoadAudioCDFinished(true); Q_EMIT LoadAudioCDFinished(true);

2
src/core/songloader.h
View File

@@ -50,7 +50,7 @@ class ParserBase;
class CueParser; class CueParser;
#ifdef HAVE_AUDIOCD #ifdef HAVE_AUDIOCD
class CddaSongLoader; class CDDASongLoader;
#endif #endif
class SongLoader : public QObject { class SongLoader : public QObject {

28
src/device/cddadevice.cpp
View File

@@ -44,7 +44,7 @@ class DeviceManager;
using namespace std::chrono_literals; using namespace std::chrono_literals;
CddaDevice::CddaDevice(const QUrl &url, CDDADevice::CDDADevice(const QUrl &url,
DeviceLister *lister, DeviceLister *lister,
const QString &unique_id, const QString &unique_id,
DeviceManager *device_manager, DeviceManager *device_manager,
@@ -62,16 +62,16 @@ CddaDevice::CddaDevice(const QUrl &url,
timer_disc_changed_->setInterval(1s); timer_disc_changed_->setInterval(1s);
QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongsLoaded, this, &CddaDevice::SongsLoaded); QObject::connect(&cdda_song_loader_, &CDDASongLoader::SongsLoaded, this, &CDDADevice::SongsLoaded);
QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongsDurationLoaded, this, &CddaDevice::SongsLoaded); QObject::connect(&cdda_song_loader_, &CDDASongLoader::SongsDurationLoaded, this, &CDDADevice::SongsLoaded);
QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongsMetadataLoaded, this, &CddaDevice::SongsLoaded); QObject::connect(&cdda_song_loader_, &CDDASongLoader::SongsMetadataLoaded, this, &CDDADevice::SongsLoaded);
QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongLoadingFinished, this, &CddaDevice::SongLoadingFinished); QObject::connect(&cdda_song_loader_, &CDDASongLoader::SongLoadingFinished, this, &CDDADevice::SongLoadingFinished);
QObject::connect(this, &CddaDevice::SongsDiscovered, collection_model_, &CollectionModel::AddReAddOrUpdate); QObject::connect(this, &CDDADevice::SongsDiscovered, collection_model_, &CollectionModel::AddReAddOrUpdate);
QObject::connect(timer_disc_changed_, &QTimer::timeout, this, &CddaDevice::CheckDiscChanged); QObject::connect(timer_disc_changed_, &QTimer::timeout, this, &CDDADevice::CheckDiscChanged);
} }
CddaDevice::~CddaDevice() { CDDADevice::~CDDADevice() {
if (cdio_) { if (cdio_) {
cdio_destroy(cdio_); cdio_destroy(cdio_);
@@ -80,7 +80,7 @@ CddaDevice::~CddaDevice() {
} }
bool CddaDevice::Init() { bool CDDADevice::Init() {
if (!cdio_) { if (!cdio_) {
cdio_ = cdio_open(url_.path().toLocal8Bit().constData(), DRIVER_DEVICE); cdio_ = cdio_open(url_.path().toLocal8Bit().constData(), DRIVER_DEVICE);
@@ -95,7 +95,7 @@ bool CddaDevice::Init() {
} }
void CddaDevice::WatchForDiscChanges(const bool watch) { void CDDADevice::WatchForDiscChanges(const bool watch) {
if (watch && !timer_disc_changed_->isActive()) { if (watch && !timer_disc_changed_->isActive()) {
timer_disc_changed_->start(); timer_disc_changed_->start();
@@ -106,7 +106,7 @@ void CddaDevice::WatchForDiscChanges(const bool watch) {
} }
void CddaDevice::CheckDiscChanged() { void CDDADevice::CheckDiscChanged() {
if (!cdio_ || cdda_song_loader_.IsActive()) return; if (!cdio_ || cdda_song_loader_.IsActive()) return;
@@ -118,14 +118,14 @@ void CddaDevice::CheckDiscChanged() {
} }
void CddaDevice::LoadSongs() { void CDDADevice::LoadSongs() {
cdda_song_loader_.LoadSongs(); cdda_song_loader_.LoadSongs();
WatchForDiscChanges(false); WatchForDiscChanges(false);
} }
void CddaDevice::SongsLoaded(const SongList &songs) { void CDDADevice::SongsLoaded(const SongList &songs) {
collection_model_->Reset(); collection_model_->Reset();
Q_EMIT SongsDiscovered(songs); Q_EMIT SongsDiscovered(songs);
@@ -134,7 +134,7 @@ void CddaDevice::SongsLoaded(const SongList &songs) {
} }
void CddaDevice::SongLoadingFinished() { void CDDADevice::SongLoadingFinished() {
WatchForDiscChanges(true); WatchForDiscChanges(true);

8
src/device/cddadevice.h
View File

@@ -49,11 +49,11 @@ class Database;
class TagReaderClient; class TagReaderClient;
class AlbumCoverLoader; class AlbumCoverLoader;
class CddaDevice : public ConnectedDevice { class CDDADevice : public ConnectedDevice {
Q_OBJECT Q_OBJECT
public: public:
Q_INVOKABLE explicit CddaDevice(const QUrl &url, Q_INVOKABLE explicit CDDADevice(const QUrl &url,
DeviceLister *lister, DeviceLister *lister,
const QString &unique_id, const QString &unique_id,
DeviceManager *device_manager, DeviceManager *device_manager,
@@ -65,7 +65,7 @@ class CddaDevice : public ConnectedDevice {
const bool first_time, const bool first_time,
QObject *parent = nullptr); QObject *parent = nullptr);
~CddaDevice(); ~CDDADevice();
bool Init() override; bool Init() override;
bool CopyToStorage(const CopyJob&, QString&) override { return false; } bool CopyToStorage(const CopyJob&, QString&) override { return false; }
@@ -85,7 +85,7 @@ class CddaDevice : public ConnectedDevice {
void SongLoadingFinished(); void SongLoadingFinished();
private: private:
CddaSongLoader cdda_song_loader_; CDDASongLoader cdda_song_loader_;
CdIo_t *cdio_; CdIo_t *cdio_;
QTimer *timer_disc_changed_; QTimer *timer_disc_changed_;
}; };

24
src/device/cddalister.cpp
View File

@@ -40,9 +40,9 @@
using namespace Qt::Literals::StringLiterals; using namespace Qt::Literals::StringLiterals;
QStringList CddaLister::DeviceUniqueIDs() { return devices_list_; } QStringList CDDALister::DeviceUniqueIDs() { return devices_list_; }
QVariantList CddaLister::DeviceIcons(const QString &id) { QVariantList CDDALister::DeviceIcons(const QString &id) {
Q_UNUSED(id) Q_UNUSED(id)
@@ -52,7 +52,7 @@ QVariantList CddaLister::DeviceIcons(const QString &id) {
} }
QString CddaLister::DeviceManufacturer(const QString &id) { QString CDDALister::DeviceManufacturer(const QString &id) {
CdIo_t *cdio = cdio_open(id.toLocal8Bit().constData(), DRIVER_DEVICE); CdIo_t *cdio = cdio_open(id.toLocal8Bit().constData(), DRIVER_DEVICE);
cdio_hwinfo_t cd_info; cdio_hwinfo_t cd_info;
@@ -65,7 +65,7 @@ QString CddaLister::DeviceManufacturer(const QString &id) {
} }
QString CddaLister::DeviceModel(const QString &id) { QString CDDALister::DeviceModel(const QString &id) {
CdIo_t *cdio = cdio_open(id.toLocal8Bit().constData(), DRIVER_DEVICE); CdIo_t *cdio = cdio_open(id.toLocal8Bit().constData(), DRIVER_DEVICE);
cdio_hwinfo_t cd_info; cdio_hwinfo_t cd_info;
@@ -78,7 +78,7 @@ QString CddaLister::DeviceModel(const QString &id) {
} }
quint64 CddaLister::DeviceCapacity(const QString &id) { quint64 CDDALister::DeviceCapacity(const QString &id) {
Q_UNUSED(id) Q_UNUSED(id)
@@ -86,7 +86,7 @@ quint64 CddaLister::DeviceCapacity(const QString &id) {
} }
quint64 CddaLister::DeviceFreeSpace(const QString &id) { quint64 CDDALister::DeviceFreeSpace(const QString &id) {
Q_UNUSED(id) Q_UNUSED(id)
@@ -94,12 +94,12 @@ quint64 CddaLister::DeviceFreeSpace(const QString &id) {
} }
QVariantMap CddaLister::DeviceHardwareInfo(const QString &id) { QVariantMap CDDALister::DeviceHardwareInfo(const QString &id) {
Q_UNUSED(id) Q_UNUSED(id)
return QVariantMap(); return QVariantMap();
} }
QString CddaLister::MakeFriendlyName(const QString &id) { QString CDDALister::MakeFriendlyName(const QString &id) {
CdIo_t *cdio = cdio_open(id.toLocal8Bit().constData(), DRIVER_DEVICE); CdIo_t *cdio = cdio_open(id.toLocal8Bit().constData(), DRIVER_DEVICE);
cdio_hwinfo_t cd_info; cdio_hwinfo_t cd_info;
@@ -112,19 +112,19 @@ QString CddaLister::MakeFriendlyName(const QString &id) {
} }
QList<QUrl> CddaLister::MakeDeviceUrls(const QString &id) { QList<QUrl> CDDALister::MakeDeviceUrls(const QString &id) {
return QList<QUrl>() << QUrl(u"cdda://"_s + id); return QList<QUrl>() << QUrl(u"cdda://"_s + id);
} }
void CddaLister::UnmountDevice(const QString &id) { void CDDALister::UnmountDevice(const QString &id) {
cdio_eject_media_drive(id.toLocal8Bit().constData()); cdio_eject_media_drive(id.toLocal8Bit().constData());
} }
void CddaLister::UpdateDeviceFreeSpace(const QString &id) { void CDDALister::UpdateDeviceFreeSpace(const QString &id) {
Q_UNUSED(id) Q_UNUSED(id)
} }
bool CddaLister::Init() { bool CDDALister::Init() {
cdio_init(); cdio_init();
#ifdef Q_OS_MACOS #ifdef Q_OS_MACOS

4
src/device/cddalister.h
View File

@@ -34,11 +34,11 @@
#include "devicelister.h" #include "devicelister.h"
class CddaLister : public DeviceLister { class CDDALister : public DeviceLister {
Q_OBJECT Q_OBJECT
public: public:
explicit CddaLister(QObject *parent = nullptr) : DeviceLister(parent) {} explicit CDDALister(QObject *parent = nullptr) : DeviceLister(parent) {}
QStringList DeviceUniqueIDs() override; QStringList DeviceUniqueIDs() override;
QVariantList DeviceIcons(const QString &id) override; QVariantList DeviceIcons(const QString &id) override;

22
src/device/cddasongloader.cpp
View File

@@ -49,21 +49,21 @@ using std::make_shared;
using namespace Qt::Literals::StringLiterals; using namespace Qt::Literals::StringLiterals;
CddaSongLoader::CddaSongLoader(const QUrl &url, QObject *parent) CDDASongLoader::CDDASongLoader(const QUrl &url, QObject *parent)
: QObject(parent), : QObject(parent),
url_(url), url_(url),
network_(make_shared<NetworkAccessManager>()), network_(make_shared<NetworkAccessManager>()),
cdda_(nullptr) { cdda_(nullptr) {
QObject::connect(this, &CddaSongLoader::MusicBrainzDiscIdLoaded, this, &CddaSongLoader::LoadMusicBrainzCDTags); QObject::connect(this, &CDDASongLoader::MusicBrainzDiscIdLoaded, this, &CDDASongLoader::LoadMusicBrainzCDTags);
} }
CddaSongLoader::~CddaSongLoader() { CDDASongLoader::~CDDASongLoader() {
loading_future_.waitForFinished(); loading_future_.waitForFinished();
} }
QUrl CddaSongLoader::GetUrlFromTrack(int track_number) const { QUrl CDDASongLoader::GetUrlFromTrack(int track_number) const {
if (url_.isEmpty()) { if (url_.isEmpty()) {
return QUrl(QStringLiteral("cdda://%1a").arg(track_number)); return QUrl(QStringLiteral("cdda://%1a").arg(track_number));
@@ -73,17 +73,17 @@ QUrl CddaSongLoader::GetUrlFromTrack(int track_number) const {
} }
void CddaSongLoader::LoadSongs() { void CDDASongLoader::LoadSongs() {
if (IsActive()) { if (IsActive()) {
return; return;
} }
loading_future_ = QtConcurrent::run(&CddaSongLoader::LoadSongsFromCDDA, this); loading_future_ = QtConcurrent::run(&CDDASongLoader::LoadSongsFromCDDA, this);
} }
void CddaSongLoader::LoadSongsFromCDDA() { void CDDASongLoader::LoadSongsFromCDDA() {
QMutexLocker l(&mutex_load_); QMutexLocker l(&mutex_load_);
@@ -243,15 +243,15 @@ void CddaSongLoader::LoadSongsFromCDDA() {
#ifdef HAVE_MUSICBRAINZ #ifdef HAVE_MUSICBRAINZ
void CddaSongLoader::LoadMusicBrainzCDTags(const QString &musicbrainz_discid) const { void CDDASongLoader::LoadMusicBrainzCDTags(const QString &musicbrainz_discid) const {
MusicBrainzClient *musicbrainz_client = new MusicBrainzClient(network_); MusicBrainzClient *musicbrainz_client = new MusicBrainzClient(network_);
QObject::connect(musicbrainz_client, &MusicBrainzClient::DiscIdFinished, this, &CddaSongLoader::MusicBrainzCDTagsLoaded); QObject::connect(musicbrainz_client, &MusicBrainzClient::DiscIdFinished, this, &CDDASongLoader::MusicBrainzCDTagsLoaded);
musicbrainz_client->StartDiscIdRequest(musicbrainz_discid); musicbrainz_client->StartDiscIdRequest(musicbrainz_discid);
} }
void CddaSongLoader::MusicBrainzCDTagsLoaded(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results) { void CDDASongLoader::MusicBrainzCDTagsLoaded(const QString &artist, const QString &album, const MusicBrainzClient::ResultList &results) {
MusicBrainzClient *musicbrainz_client = qobject_cast<MusicBrainzClient*>(sender()); MusicBrainzClient *musicbrainz_client = qobject_cast<MusicBrainzClient*>(sender());
musicbrainz_client->deleteLater(); musicbrainz_client->deleteLater();
@@ -287,7 +287,7 @@ void CddaSongLoader::MusicBrainzCDTagsLoaded(const QString &artist, const QStrin
#endif // HAVE_MUSICBRAINZ #endif // HAVE_MUSICBRAINZ
void CddaSongLoader::Error(const QString &error) { void CDDASongLoader::Error(const QString &error) {
qLog(Error) << error; qLog(Error) << error;
Q_EMIT SongsDurationLoaded(SongList(), error); Q_EMIT SongsDurationLoaded(SongList(), error);

6
src/device/cddasongloader.h
View File

@@ -41,12 +41,12 @@
class NetworkAccessManager; class NetworkAccessManager;
class CddaSongLoader : public QObject { class CDDASongLoader : public QObject {
Q_OBJECT Q_OBJECT
public: public:
explicit CddaSongLoader(const QUrl &url, QObject *parent = nullptr); explicit CDDASongLoader(const QUrl &url, QObject *parent = nullptr);
~CddaSongLoader() override; ~CDDASongLoader() override;
void LoadSongs(); void LoadSongs();

4
src/device/devicemanager.cpp
View File

@@ -120,7 +120,7 @@ DeviceManager::DeviceManager(const SharedPtr<TaskManager> task_manager,
// CD devices are detected via the DiskArbitration framework instead on MacOs. // CD devices are detected via the DiskArbitration framework instead on MacOs.
#if defined(HAVE_AUDIOCD) && !defined(Q_OS_MACOS) #if defined(HAVE_AUDIOCD) && !defined(Q_OS_MACOS)
AddLister(new CddaLister); AddLister(new CDDALister);
#endif #endif
#ifdef HAVE_UDISKS2 #ifdef HAVE_UDISKS2
AddLister(new Udisks2Lister); AddLister(new Udisks2Lister);
@@ -133,7 +133,7 @@ DeviceManager::DeviceManager(const SharedPtr<TaskManager> task_manager,
#endif #endif
#ifdef HAVE_AUDIOCD #ifdef HAVE_AUDIOCD
AddDeviceClass<CddaDevice>(); AddDeviceClass<CDDADevice>();
#endif #endif
AddDeviceClass<FilesystemDevice>(); AddDeviceClass<FilesystemDevice>();