Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Elisa
Commits
31180640
Commit
31180640
authored
May 19, 2021
by
Nate Graham
Browse files
Merge branch 'release/21.04'
parents
59a85d8e
7b8a7e3d
Pipeline
#62489
passed with stage
in 8 minutes and 19 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
autotests/databaseinterfacetest.cpp
View file @
31180640
...
...
@@ -4656,7 +4656,7 @@ private Q_SLOTS:
QCOMPARE
(
musicDbAlbumRemovedSpy
.
count
(),
0
);
QCOMPARE
(
musicDbTrackRemovedSpy
.
count
(),
0
);
QCOMPARE
(
musicDbAlbumModifiedSpy
.
count
(),
0
);
QCOMPARE
(
musicDbTrackModifiedSpy
.
count
(),
1
0
);
QCOMPARE
(
musicDbTrackModifiedSpy
.
count
(),
0
);
QCOMPARE
(
musicDbDatabaseErrorSpy
.
count
(),
0
);
auto
recentlyPlayedTracksData
=
musicDb
.
recentlyPlayedTracksData
(
10
);
...
...
autotests/trackmetadatamodeltest.cpp
View file @
31180640
...
...
@@ -124,17 +124,6 @@ private Q_SLOTS:
QCOMPARE
(
beginRemovedRowsSpy
.
count
(),
0
);
QCOMPARE
(
endRemovedRowsSpy
.
count
(),
0
);
QCOMPARE
(
myModel
.
rowCount
(),
12
);
musicDb
.
trackHasStartedPlaying
(
QUrl
::
fromLocalFile
(
QStringLiteral
(
"/$1"
)),
QDateTime
::
currentDateTime
());
QCOMPARE
(
beginResetSpy
.
count
(),
2
);
QCOMPARE
(
endResetSpy
.
count
(),
2
);
QCOMPARE
(
beginInsertRowsSpy
.
count
(),
0
);
QCOMPARE
(
endInsertRowsSpy
.
count
(),
0
);
QCOMPARE
(
dataChangedSpy
.
count
(),
0
);
QCOMPARE
(
beginRemovedRowsSpy
.
count
(),
0
);
QCOMPARE
(
endRemovedRowsSpy
.
count
(),
0
);
QCOMPARE
(
myModel
.
rowCount
(),
13
);
}
};
...
...
src/databaseinterface.cpp
View file @
31180640
...
...
@@ -949,10 +949,6 @@ void DatabaseInterface::trackHasStartedPlaying(const QUrl &fileName, const QDate
}
updateTrackStatistics
(
fileName
,
time
);
auto
trackId
=
internalTrackIdFromFileName
(
fileName
);
if
(
trackId
!=
0
)
{
Q_EMIT
trackModified
(
internalOneTrackPartialData
(
trackId
));
}
transactionResult
=
finishTransaction
();
if
(
!
transactionResult
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment