Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-28 18:19:42 +01:00
Code Issues Releases Wiki Activity

Oops, don't need this hack any more

Browse Source
This commit is contained in:
David Sansome 2010-08-01 11:05:14 +00:00
parent 02783b1d5d
commit 5517e2a503
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/deletefiles.cpp
View File

@ -72,7 +72,7 @@ void DeleteFiles::ProcessSomeFiles() {
if (progress_ >= songs_.count()) {
task_manager_->SetTaskProgress(task_id_, progress_, songs_.count());
storage_->FinishCopy(false);
storage_->FinishCopy();
task_manager_->SetTaskFinished(task_id_);

4
src/core/musicstorage.h
View File

@ -38,11 +38,11 @@ public:
virtual bool CopyToStorage(const QString& source, const QString& destination,
const Song& metadata, bool overwrite,
bool remove_original) = 0;
virtual void FinishCopy(bool about_to_eject) {}
virtual void FinishCopy() {}
virtual void StartDelete() {}
virtual bool DeleteFromStorage(const Song& metadata) = 0;
virtual void FinishDelete(bool about_to_eject) {}
virtual void FinishDelete() {}
virtual void Eject() {}
};

2
src/core/organise.cpp
View File

@ -67,7 +67,7 @@ void Organise::ProcessSomeFiles() {
if (progress_ >= files_.count()) {
task_manager_->SetTaskProgress(task_id_, progress_, files_.count());
destination_->FinishCopy(eject_after_);
destination_->FinishCopy();
if (eject_after_)
destination_->Eject();

6
src/devices/gpoddevice.cpp
View File

@ -114,7 +114,7 @@ bool GPodDevice::CopyToStorage(
return true;
}
void GPodDevice::FinishCopy(bool about_to_eject) {
void GPodDevice::FinishCopy() {
// Write the itunes database
GError* error = NULL;
itdb_write(db_, &error);
@ -180,7 +180,7 @@ bool GPodDevice::DeleteFromStorage(const Song& metadata) {
return true;
}
void GPodDevice::FinishDelete(bool about_to_eject) {
FinishCopy(about_to_eject);
void GPodDevice::FinishDelete() {
FinishCopy();
}

4
src/devices/gpoddevice.h
View File

@ -42,11 +42,11 @@ public:
void StartCopy();
bool CopyToStorage(const QString &source, const QString &destination,
const Song &metadata, bool overwrite, bool remove_original);
void FinishCopy(bool about_to_eject);
void FinishCopy();
void StartDelete();
bool DeleteFromStorage(const Song& metadata);
void FinishDelete(bool about_to_eject);
void FinishDelete();
private slots:
void LoadFinished(Itdb_iTunesDB* db);