easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send PTP_RC_GeneralError when cancelling object transfers.

Browse Source 
Moved back uint64 to unsigned long to avoid variable truncation with the vitamtp library.
Astyle format dds.cpp.
This commit is contained in:
codestation
2014-01-07 18:33:21 -04:30
parent 5fb47de3da
commit 019d2a03a4
6 changed files with 90 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/httpdownloader.cpp
View File

@@ -30,8 +30,8 @@ QMutex HTTPDownloader::dataAvailable;
QMutex HTTPDownloader::dataRead;
char *HTTPDownloader::buffer = NULL;
qint64 HTTPDownloader::bufferSize = 0;
qint64 HTTPDownloader::downloadLeft = 0;
unsigned long HTTPDownloader::bufferSize = 0;
unsigned long HTTPDownloader::downloadLeft = 0;
HTTPDownloader::HTTPDownloader(const QString &url, QObject *parent) :
QObject(parent), remote_url(url), firstRead(true)
@@ -111,7 +111,7 @@ void HTTPDownloader::readyRead()
dataRead.unlock();
}
int HTTPDownloader::readCallback(unsigned char *data, int64_t wantlen, int64_t *gotlen)
int HTTPDownloader::readCallback(unsigned char *data, unsigned long wantlen, unsigned long *gotlen)
{
if(!dataAvailable.tryLock(30000)) {
qWarning("Connection timeout while receiving data from network, aborting");