iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct signal

Browse Source
This commit is contained in:
craig.p.drummond
2012-11-07 19:41:58 +00:00
parent cd2258a63d
commit dc13a84d33
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devices/device.h
View File

@@ -190,7 +190,7 @@ Q_SIGNALS:
void disconnected(const QString &udi);
void updating(const QString &udi, bool s);
void actionStatus(int);
void progress(unsigned long percent);
void progress(int pc);
void error(const QString &);
protected:

8
devices/mtpdevice.cpp
View File

@@ -52,7 +52,7 @@
static int progressMonitor(uint64_t const processed, uint64_t const total, void const * const data)
{
((MtpConnection *)data)->emitProgress((unsigned long)(((processed*1.0)/(total*1.0)*100.0)+0.5));
((MtpConnection *)data)->emitProgress((int)(((processed*1.0)/(total*1.0)*100.0)+0.5));
return ((MtpConnection *)data)->abortRequested() ? -1 : 0;
}
@@ -86,7 +86,7 @@ bool MtpConnection::abortRequested() const
return dev->abortRequested();
}
void MtpConnection::emitProgress(unsigned long percent)
void MtpConnection::emitProgress(int percent)
{
emit progress(percent);
}
@@ -541,7 +541,7 @@ MtpDevice::MtpDevice(DevicesModel *m, Solid::Device &dev)
thread->start();
connect(this, SIGNAL(updateLibrary()), connection, SLOT(updateLibrary()));
connect(connection, SIGNAL(libraryUpdated()), this, SLOT(libraryUpdated()));
connect(connection, SIGNAL(progress(unsigned long)), this, SLOT(emitProgress(unsigned long)));
connect(connection, SIGNAL(progress(int)), this, SLOT(emitProgress(int)));
connect(this, SIGNAL(putSong(const Song &, bool)), connection, SLOT(putSong(const Song &, bool)));
connect(connection, SIGNAL(putSongStatus(bool, int, const QString &, bool)), this, SLOT(putSongStatus(bool, int, const QString &, bool)));
connect(this, SIGNAL(getSong(const Song &, const QString &)), connection, SLOT(getSong(const Song &, const QString &)));
@@ -787,7 +787,7 @@ void MtpDevice::transcodePercent(int percent)
emit progress(percent/2);
}
void MtpDevice::emitProgress(unsigned long percent)
void MtpDevice::emitProgress(int percent)
{
if (jobAbortRequested) {
return;

4
devices/mtpdevice.h
View File

@@ -49,7 +49,7 @@ public:
MusicLibraryItemRoot * takeLibrary();
uint64_t capacity() const { return size; }
uint64_t usedSpace() const { return used; }
void emitProgress(unsigned long percent);
void emitProgress(int percent);
bool abortRequested() const;
public Q_SLOTS:
@@ -142,7 +142,7 @@ private Q_SLOTS:
void putSongStatus(bool ok, int id, const QString &file, bool fixedVa);
void transcodeSongResult(int status);
void transcodePercent(int percent);
void emitProgress(unsigned long);
void emitProgress(int);
void getSongStatus(bool ok);
void delSongStatus(bool ok);
void cleanDirsStatus(bool ok);