diff --git a/autotests/databaseinterfacetest.cpp b/autotests/databaseinterfacetest.cpp index 6a1d3563cd55dc15a17c2d2fd80a690e92ef5fdd..05c7bfdf286e0097e5b8705f8e878312e750d14d 100644 --- a/autotests/databaseinterfacetest.cpp +++ b/autotests/databaseinterfacetest.cpp @@ -5170,7 +5170,7 @@ private Q_SLOTS: QCOMPARE(newAlbum.artist(), QStringLiteral("Various Artists")); QCOMPARE(newAlbum[DatabaseInterface::ColumnsRoles::SecondaryTextRole], QStringLiteral("Various Artists")); - const auto oneAlbum = musicDb.allAlbumsData()[0]; + const auto oneAlbum = musicDb.allAlbumsData().at(0); QCOMPARE(oneAlbum.title(), QStringLiteral("album3")); QCOMPARE(oneAlbum.artist(), QStringLiteral("Various Artists")); QCOMPARE(oneAlbum[DatabaseInterface::ColumnsRoles::SecondaryTextRole], QStringLiteral("Various Artists")); diff --git a/src/audiowrapper.h b/src/audiowrapper.h index dde7d0d4966bbe7a3d71170a9408b3b9aff36de0..5f469b6cb46807871fe38e0ac06bec8859eb46ca 100644 --- a/src/audiowrapper.h +++ b/src/audiowrapper.h @@ -122,7 +122,7 @@ Q_SIGNALS: void positionChanged(qint64 position); - void currentPlayingForRadiosChanged(QString title, QString nowPlaying); + void currentPlayingForRadiosChanged(const QString &title, const QString &nowPlaying); void seekableChanged(bool seekable); diff --git a/src/audiowrapper_libvlc.cpp b/src/audiowrapper_libvlc.cpp index fc2341d49fc1f3100b05a4e07516f6e589d1df40..ba0b72cc7d2b096d24e9c0a53227b61b4a3ded6f 100644 --- a/src/audiowrapper_libvlc.cpp +++ b/src/audiowrapper_libvlc.cpp @@ -238,8 +238,7 @@ void AudioWrapper::setSource(const QUrl &source) d->mMedia = libvlc_media_new_path(d->mInstance, QDir::toNativeSeparators(source.toLocalFile()).toUtf8().constData()); } else { qCDebug(orgKdeElisaPlayerVlc) << "AudioWrapper::setSource reading remote resource"; - const char * charUrl = source.url().toUtf8().constData(); - d->mMedia = libvlc_media_new_location(d->mInstance, charUrl); + d->mMedia = libvlc_media_new_location(d->mInstance, source.url().toUtf8().constData()); } if (!d->mMedia) { @@ -337,6 +336,7 @@ void AudioWrapper::seek(qint64 position) void AudioWrapper::setAudioRole(QAudio::Role audioRole) { + Q_UNUSED(audioRole) // d->mPlayer.setAudioRole(audioRole); } diff --git a/src/databaseinterface.cpp b/src/databaseinterface.cpp index 44ecb2792446c5b35d44861b1c0dae15d91de0c3..7a90663517fcc51b5c05494b84b9456de34d9007 100644 --- a/src/databaseinterface.cpp +++ b/src/databaseinterface.cpp @@ -6147,8 +6147,6 @@ qulonglong DatabaseInterface::internalInsertTrack(const MusicAudioTrack &oneTrac resultId = existingTrackId; - const auto &albumData = internalOneAlbumPartialData(albumId); - d->mInsertTrackQuery.bindValue(QStringLiteral(":trackId"), existingTrackId); d->mInsertTrackQuery.bindValue(QStringLiteral(":fileName"), oneTrack.resourceURI()); d->mInsertTrackQuery.bindValue(QStringLiteral(":priority"), priority); diff --git a/src/databaseinterface.h b/src/databaseinterface.h index 9ee5968908d1cfc8d54ad537681a271c7fbbcc0a..449b0a3404221f19646be49e19e575dac47628d5 100644 --- a/src/databaseinterface.h +++ b/src/databaseinterface.h @@ -423,7 +423,7 @@ Q_SIGNALS: void databaseError(); - void restoredTracks(QHash allFiles); + void restoredTracks(const QHash &allFiles); void cleanedDatabase(); @@ -431,9 +431,9 @@ Q_SIGNALS: void finishRemovingTracksList(); - void radioAdded(const DatabaseInterface::TrackDataType radio); + void radioAdded(const DatabaseInterface::TrackDataType &radio); - void radioModified(const DatabaseInterface::TrackDataType radio); + void radioModified(const DatabaseInterface::TrackDataType &radio); void radioRemoved(qulonglong radioId); @@ -449,7 +449,7 @@ public Q_SLOTS: void clearData(); - void insertRadio(const TrackDataType &oneTrack); + void insertRadio(const DatabaseInterface::TrackDataType &oneTrack); void removeRadio(qulonglong radioId); diff --git a/src/manageaudioplayer.cpp b/src/manageaudioplayer.cpp index e8179794504302ceafd9da07ca96abaed07ab6ee..469685d3354fec7156c6e9ed5cdc07b8b9ca0285 100644 --- a/src/manageaudioplayer.cpp +++ b/src/manageaudioplayer.cpp @@ -413,7 +413,8 @@ void ManageAudioPlayer::setPlayerPosition(qint64 playerPosition) QTimer::singleShot(0, [this]() {Q_EMIT playControlPositionChanged();}); } -void ManageAudioPlayer::setCurrentPlayingForRadios(const QString title, const QString nowPlaying){ +void ManageAudioPlayer::setCurrentPlayingForRadios(QString title, QString nowPlaying) +{ if (mPlayListModel && mCurrentTrack.isValid()) { Q_EMIT currentPlayingForRadiosChanged(title, MediaPlayList::TitleRole); Q_EMIT currentPlayingForRadiosChanged(nowPlaying, MediaPlayList::ArtistRole); diff --git a/src/manageaudioplayer.h b/src/manageaudioplayer.h index 5b7751a163b65f8f22779d85fe0b2bd54b175560..d451d0654db04bfd116590ff59274fba36edfda7 100644 --- a/src/manageaudioplayer.h +++ b/src/manageaudioplayer.h @@ -239,7 +239,7 @@ public Q_SLOTS: void setPlayerPosition(qint64 playerPosition); - void setCurrentPlayingForRadios(const QString title, const QString nowPlaying); + void setCurrentPlayingForRadios(QString title, QString nowPlaying); void setPlayControlPosition(int playerPosition); diff --git a/src/manageheaderbar.h b/src/manageheaderbar.h index 14410f241f84b17007f9c0a96877119639957f4a..9df9c84c6a952a8c6aba25ceaa45c55937fc6ca7 100644 --- a/src/manageheaderbar.h +++ b/src/manageheaderbar.h @@ -279,8 +279,6 @@ private: bool mOldIsValid = false; - int mOldRemainingTracks = 0; - }; diff --git a/src/mediaplaylist.h b/src/mediaplaylist.h index a83f628c66910bd73d1cc3c729ec7e089fb6c25b..b3914ea773d3235c93c30f7d4031fbefe460a1f7 100644 --- a/src/mediaplaylist.h +++ b/src/mediaplaylist.h @@ -207,11 +207,11 @@ Q_SIGNALS: void tracksCountChanged(); - void previousTrackChanged(QPersistentModelIndex previousTrack); + void previousTrackChanged(const QPersistentModelIndex &previousTrack); - void currentTrackChanged(QPersistentModelIndex currentTrack); + void currentTrackChanged(const QPersistentModelIndex ¤tTrack); - void nextTrackChanged(QPersistentModelIndex nextTrack); + void nextTrackChanged(const QPersistentModelIndex &nextTrack); void clearPlayListPlayer(); diff --git a/src/modeldataloader.cpp b/src/modeldataloader.cpp index 1b0dc0ccde8c5da8a9dd159c9d38e42132b2faae..a3eb4c8f0b164e52af17ad402ba59e7b0fb104ec 100644 --- a/src/modeldataloader.cpp +++ b/src/modeldataloader.cpp @@ -462,7 +462,7 @@ void ModelDataLoader::databaseAlbumModified(const AlbumDataType &modifiedAlbum) Q_EMIT albumModified(modifiedAlbum); } -void ModelDataLoader::updateRadioData(TrackDataType trackDataType) +void ModelDataLoader::updateRadioData(const TrackDataType &trackDataType) { Q_EMIT saveRadioModified(trackDataType); } diff --git a/src/modeldataloader.h b/src/modeldataloader.h index db9f9f7f9f4df8a302c5ef8cc4ec1dd34557f372..033cd444769d383355b4acee601d19dd8157de54 100644 --- a/src/modeldataloader.h +++ b/src/modeldataloader.h @@ -65,33 +65,33 @@ Q_SIGNALS: void allRadiosData(const ModelDataLoader::ListRadioDataType &radiosData); - void radioAdded(const ModelDataLoader::TrackDataType radiosData); + void radioAdded(const ModelDataLoader::TrackDataType &radiosData); - void radioModified(const ModelDataLoader::TrackDataType radiosData); + void radioModified(const ModelDataLoader::TrackDataType &radiosData); void allTrackData(const ModelDataLoader::TrackDataType &allData); void allRadioData(const ModelDataLoader::TrackDataType &allData); - void tracksAdded(ModelDataLoader::ListTrackDataType newData); + void tracksAdded(const ModelDataLoader::ListTrackDataType &newData); void trackModified(const ModelDataLoader::TrackDataType &modifiedTrack); void trackRemoved(qulonglong removedTrackId); - void genresAdded(ModelDataLoader::ListGenreDataType newData); + void genresAdded(const ModelDataLoader::ListGenreDataType &newData); - void artistsAdded(ModelDataLoader::ListArtistDataType newData); + void artistsAdded(const ModelDataLoader::ListArtistDataType &newData); void artistRemoved(qulonglong removedDatabaseId); - void albumsAdded(ModelDataLoader::ListAlbumDataType newData); + void albumsAdded(const ModelDataLoader::ListAlbumDataType &newData); void albumRemoved(qulonglong removedDatabaseId); void albumModified(const ModelDataLoader::AlbumDataType &modifiedAlbum); - void saveRadioModified(const ModelDataLoader::TrackDataType trackDataType); + void saveRadioModified(const ModelDataLoader::TrackDataType &trackDataType); void removeRadio(qulonglong radioId); @@ -122,7 +122,7 @@ public Q_SLOTS: void loadFrequentlyPlayedData(ElisaUtils::PlayListEntryType dataType); - void updateRadioData(ModelDataLoader::TrackDataType trackDataType); + void updateRadioData(const ModelDataLoader::TrackDataType &trackDataType); void deleteRadioData(qulonglong radioId); diff --git a/src/models/trackmetadatamodel.cpp b/src/models/trackmetadatamodel.cpp index 35c494e7991f1b6c665a1ddde303fd5835bb2136..ab1fcceb2a58998f0a0322670c9009f324aadf88 100644 --- a/src/models/trackmetadatamodel.cpp +++ b/src/models/trackmetadatamodel.cpp @@ -23,15 +23,6 @@ #include -const QList mFieldsForClassicTrack({DatabaseInterface::TitleRole, DatabaseInterface::ArtistRole, DatabaseInterface::AlbumRole, - DatabaseInterface::AlbumArtistRole, DatabaseInterface::TrackNumberRole, DatabaseInterface::DiscNumberRole, - DatabaseInterface::RatingRole, DatabaseInterface::GenreRole, DatabaseInterface::LyricistRole, - DatabaseInterface::ComposerRole, DatabaseInterface::CommentRole, DatabaseInterface::YearRole, - DatabaseInterface::LastPlayDate, DatabaseInterface::PlayCounter}); - -const QList mFieldsForRadioTrack({DatabaseInterface::TitleRole,DatabaseInterface::ResourceRole, DatabaseInterface::CommentRole, DatabaseInterface::DatabaseIdRole, - DatabaseInterface::ArtistRole, DatabaseInterface::AlbumRole}); - TrackMetadataModel::TrackMetadataModel(QObject *parent) : QAbstractListModel(parent) @@ -340,6 +331,7 @@ QVariant TrackMetadataModel::dataRadio(const QModelIndex &index, int role) const case DatabaseInterface::FirstPlayDate: case DatabaseInterface::PlayFrequency: case DatabaseInterface::ElementTypeRole: + case DatabaseInterface::IsValidAlbumArtistRole: break; } break; @@ -391,6 +383,7 @@ QVariant TrackMetadataModel::dataRadio(const QModelIndex &index, int role) const case DatabaseInterface::FirstPlayDate: case DatabaseInterface::PlayFrequency: case DatabaseInterface::ElementTypeRole: + case DatabaseInterface::IsValidAlbumArtistRole: break; } break; @@ -464,6 +457,15 @@ void TrackMetadataModel::trackData(const TrackMetadataModel::TrackDataType &trac void TrackMetadataModel::fillDataFromTrackData(const TrackMetadataModel::TrackDataType &trackData) { + const QList mFieldsForClassicTrack({DatabaseInterface::TitleRole, DatabaseInterface::ArtistRole, DatabaseInterface::AlbumRole, + DatabaseInterface::AlbumArtistRole, DatabaseInterface::TrackNumberRole, DatabaseInterface::DiscNumberRole, + DatabaseInterface::RatingRole, DatabaseInterface::GenreRole, DatabaseInterface::LyricistRole, + DatabaseInterface::ComposerRole, DatabaseInterface::CommentRole, DatabaseInterface::YearRole, + DatabaseInterface::LastPlayDate, DatabaseInterface::PlayCounter}); + + const QList mFieldsForRadioTrack({DatabaseInterface::TitleRole,DatabaseInterface::ResourceRole, DatabaseInterface::CommentRole, DatabaseInterface::DatabaseIdRole, + DatabaseInterface::ArtistRole, DatabaseInterface::AlbumRole}); + beginResetModel(); mFullData = trackData; mTrackData.clear(); @@ -630,7 +632,7 @@ void TrackMetadataModel::fillDataForNewRadio() mTrackData[role] = -1; Q_EMIT hideDeleteButton(); } else { - mTrackData[role] = QStringLiteral(""); + mTrackData[role] = QString(); } } @@ -657,6 +659,8 @@ void TrackMetadataModel::setManager(MusicListenersManager *newManager) void TrackMetadataModel::setIsRadio(bool isRadio){ this->mIsRadio = isRadio; + + Q_EMIT isRadioChanged(); } void TrackMetadataModel::setDatabase(DatabaseInterface *trackDatabase) @@ -680,7 +684,7 @@ void TrackMetadataModel::deleteRadio() } } -void TrackMetadataModel::radioAdded(TrackDataType radiosData){ +void TrackMetadataModel::radioAdded(const TrackDataType &radiosData){ mTrackData[DatabaseInterface::DatabaseIdRole] = radiosData[DatabaseInterface::DatabaseIdRole]; Q_EMIT showDeleteButton(); radioModified(); diff --git a/src/models/trackmetadatamodel.h b/src/models/trackmetadatamodel.h index 95444c07777bd91c8dc5f1523322936fd4e490a8..291674c74a19a84f369b4396edba40311f606bb8 100644 --- a/src/models/trackmetadatamodel.h +++ b/src/models/trackmetadatamodel.h @@ -55,7 +55,8 @@ class ELISALIB_EXPORT TrackMetadataModel : public QAbstractListModel Q_PROPERTY(bool isRadio READ isRadio - WRITE setIsRadio) + WRITE setIsRadio + NOTIFY isRadioChanged) public: @@ -115,7 +116,7 @@ Q_SIGNALS: void lyricsChanged(); - void saveRadioData(DatabaseInterface::TrackDataType trackDataType); + void saveRadioData(const DatabaseInterface::TrackDataType &trackDataType); void deleteRadioData(qulonglong radioId); @@ -127,6 +128,8 @@ Q_SIGNALS: void closeWindow(); + void isRadioChanged(); + public Q_SLOTS: void trackData(const TrackMetadataModel::TrackDataType &trackData); @@ -147,7 +150,7 @@ public Q_SLOTS: void deleteRadio(); - void radioAdded(TrackMetadataModel::TrackDataType radiosData); + void radioAdded(const TrackMetadataModel::TrackDataType &radiosData); void radioModified(); diff --git a/src/musiclistenersmanager.h b/src/musiclistenersmanager.h index 15e350fa975b52204e0e2868340a7468f7499493..8589e7628748f84a91c76b4c79a4ef9f638f5558 100644 --- a/src/musiclistenersmanager.h +++ b/src/musiclistenersmanager.h @@ -110,7 +110,7 @@ Q_SIGNALS: void elisaApplicationChanged(); - void removeTracksInError(QList tracks); + void removeTracksInError(const QList &tracks); void displayTrackError(const QString &fileName);