Mercurial > hg > svcore
comparison data/fileio/FileSource.cpp @ 1069:32ab6c48efaa
Merge from branch tonioni
author | Chris Cannam |
---|---|
date | Mon, 20 Apr 2015 09:11:34 +0100 |
parents | 24c48323c662 |
children | 6b847a59d908 |
comparison
equal
deleted
inserted
replaced
1036:682d64f05e72 | 1069:32ab6c48efaa |
---|---|
30 #include <iostream> | 30 #include <iostream> |
31 #include <cstdlib> | 31 #include <cstdlib> |
32 | 32 |
33 #include <unistd.h> | 33 #include <unistd.h> |
34 | 34 |
35 #define DEBUG_FILE_SOURCE 1 | 35 //#define DEBUG_FILE_SOURCE 1 |
36 | 36 |
37 int | 37 int |
38 FileSource::m_count = 0; | 38 FileSource::m_count = 0; |
39 | 39 |
40 QMutex | 40 QMutex |