|
Line
Link Here
|
|
-- |
|
|
| 1 |
ext/libclementine-tagreader/tagreader.cpp | 6 ++++++ |
|
ext/libclementine-tagreader/tagreader.cpp | 6 ++++++ |
| 2 |
ext/libclementine-tagreader/tagreader.h | 1 + |
1 |
ext/libclementine-tagreader/tagreader.h | 1 + |
| 3 |
src/core/database.cpp | 5 ++++- |
2 |
src/core/database.cpp | 5 ++++- |
| 4 |
src/songinfo/ultimatelyricsprovider.cpp | 5 +++++ |
3 |
src/songinfo/ultimatelyricsprovider.cpp | 5 +++++ |
| 5 |
src/songinfo/ultimatelyricsprovider.h | 1 + |
4 |
src/songinfo/ultimatelyricsprovider.h | 1 + |
| 6 |
5 files changed, 17 insertions(+), 1 deletion(-) |
5 |
5 files changed, 17 insertions(+), 1 deletion(-) |
| 7 |
-- a/ext/libclementine-tagreader/tagreader.cpp |
6 |
++ b/ext/libclementine-tagreader/tagreader.cpp |
|
Lines 125-130
TagReader::TagReader()
Link Here
|
| 125 |
network_(new QNetworkAccessManager), |
125 |
network_(new QNetworkAccessManager), |
| 126 |
kEmbeddedCover("(embedded)") {} |
126 |
kEmbeddedCover("(embedded)") {} |
| 127 |
|
127 |
|
|
|
128 |
TagReader::~TagReader() |
| 129 |
{ |
| 130 |
delete factory_; |
| 131 |
delete network_; |
| 132 |
} |
| 133 |
|
| 128 |
void TagReader::ReadFile(const QString& filename, |
134 |
void TagReader::ReadFile(const QString& filename, |
| 129 |
pb::tagreader::SongMetadata* song) const { |
135 |
pb::tagreader::SongMetadata* song) const { |
| 130 |
const QByteArray url(QUrl::fromLocalFile(filename).toEncoded()); |
136 |
const QByteArray url(QUrl::fromLocalFile(filename).toEncoded()); |
| 131 |
-- a/ext/libclementine-tagreader/tagreader.h |
137 |
++ b/ext/libclementine-tagreader/tagreader.h |
|
Lines 50-55
class FileRefFactory;
Link Here
|
| 50 |
class TagReader { |
50 |
class TagReader { |
| 51 |
public: |
51 |
public: |
| 52 |
TagReader(); |
52 |
TagReader(); |
|
|
53 |
~TagReader(); |
| 53 |
|
54 |
|
| 54 |
void ReadFile(const QString& filename, |
55 |
void ReadFile(const QString& filename, |
| 55 |
pb::tagreader::SongMetadata* song) const; |
56 |
pb::tagreader::SongMetadata* song) const; |
| 56 |
-- a/src/core/database.cpp |
57 |
++ b/src/core/database.cpp |
|
Lines 670-679
void Database::BackupFile(const QString&
Link Here
|
| 670 |
sqlite3* source_connection = nullptr; |
670 |
sqlite3* source_connection = nullptr; |
| 671 |
sqlite3* dest_connection = nullptr; |
671 |
sqlite3* dest_connection = nullptr; |
| 672 |
|
672 |
|
| 673 |
BOOST_SCOPE_EXIT((source_connection)(dest_connection)(task_id)(app_)) { |
673 |
BOOST_SCOPE_EXIT((&source_connection)(&dest_connection)(task_id)(app_)) { |
| 674 |
// Harmless to call sqlite3_close() with a nullptr pointer. |
674 |
// Harmless to call sqlite3_close() with a nullptr pointer. |
| 675 |
sqlite3_close(source_connection); |
675 |
sqlite3_close(source_connection); |
| 676 |
sqlite3_close(dest_connection); |
676 |
sqlite3_close(dest_connection); |
|
|
677 |
qLog(Debug) << "Closed databases after backup" << source_connection << |
| 678 |
dest_connection; |
| 677 |
app_->task_manager()->SetTaskFinished(task_id); |
679 |
app_->task_manager()->SetTaskFinished(task_id); |
| 678 |
} |
680 |
} |
| 679 |
BOOST_SCOPE_EXIT_END |
681 |
BOOST_SCOPE_EXIT_END |
|
Lines 709-712
void Database::BackupFile(const QString&
Link Here
|
| 709 |
} |
711 |
} |
| 710 |
|
712 |
|
| 711 |
sqlite3_backup_finish(backup); |
713 |
sqlite3_backup_finish(backup); |
|
|
714 |
qLog(Debug) << "Database backup finished"; |
| 712 |
} |
715 |
} |
| 713 |
-- a/src/songinfo/ultimatelyricsprovider.cpp |
716 |
++ b/src/songinfo/ultimatelyricsprovider.cpp |
|
Lines 34-39
UltimateLyricsProvider::UltimateLyricsPr
Link Here
|
| 34 |
redirect_count_(0), |
34 |
redirect_count_(0), |
| 35 |
url_hop_(false) {} |
35 |
url_hop_(false) {} |
| 36 |
|
36 |
|
|
|
37 |
UltimateLyricsProvider::~UltimateLyricsProvider() |
| 38 |
{ |
| 39 |
delete network_; |
| 40 |
} |
| 41 |
|
| 37 |
void UltimateLyricsProvider::FetchInfo(int id, const Song& metadata) { |
42 |
void UltimateLyricsProvider::FetchInfo(int id, const Song& metadata) { |
| 38 |
// Get the text codec |
43 |
// Get the text codec |
| 39 |
const QTextCodec* codec = |
44 |
const QTextCodec* codec = |
| 40 |
-- a/src/songinfo/ultimatelyricsprovider.h |
45 |
++ b/src/songinfo/ultimatelyricsprovider.h |
|
Lines 33-38
class UltimateLyricsProvider : public So
Link Here
|
| 33 |
|
33 |
|
| 34 |
public: |
34 |
public: |
| 35 |
UltimateLyricsProvider(); |
35 |
UltimateLyricsProvider(); |
|
|
36 |
~UltimateLyricsProvider(); |
| 36 |
|
37 |
|
| 37 |
static const int kRedirectLimit; |
38 |
static const int kRedirectLimit; |
| 38 |
|
39 |
|