Mercurial > hg > svcore
changeset 1219:794b64e62e58 msvc2015_64
Tidy and re-fix for Linux
| author | Chris Cannam |
|---|---|
| date | Wed, 19 Oct 2016 09:11:51 +0100 |
| parents | 6b847a59d908 |
| children | a68d407f9752 |
| files | base/TempDirectory.cpp data/fileio/FileSource.cpp data/fileio/MP3FileReader.cpp data/midi/MIDIInput.cpp system/System.h |
| diffstat | 5 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/base/TempDirectory.cpp Tue Oct 18 15:54:56 2016 +0100 +++ b/base/TempDirectory.cpp Wed Oct 19 09:11:51 2016 +0100 @@ -25,7 +25,7 @@ #include <iostream> #include <cassert> -//#include <unistd.h> + #include <time.h> TempDirectory *
--- a/data/fileio/FileSource.cpp Tue Oct 18 15:54:56 2016 +0100 +++ b/data/fileio/FileSource.cpp Wed Oct 19 09:11:51 2016 +0100 @@ -30,8 +30,6 @@ #include <iostream> #include <cstdlib> -//#include <unistd.h> - //#define DEBUG_FILE_SOURCE 1 int
--- a/data/fileio/MP3FileReader.cpp Tue Oct 18 15:54:56 2016 +0100 +++ b/data/fileio/MP3FileReader.cpp Wed Oct 19 09:11:51 2016 +0100 @@ -27,7 +27,6 @@ #include <iostream> #include <cstdlib> -//#include <unistd.h> #ifdef HAVE_ID3TAG #include <id3tag.h>
--- a/data/midi/MIDIInput.cpp Tue Oct 18 15:54:56 2016 +0100 +++ b/data/midi/MIDIInput.cpp Wed Oct 19 09:11:51 2016 +0100 @@ -17,7 +17,7 @@ #include "rtmidi/RtMidi.h" -//#include <unistd.h> +#include "system/System.h" MIDIInput::MIDIInput(QString name, FrameTimer *timer) : m_rtmidi(),
--- a/system/System.h Tue Oct 18 15:54:56 2016 +0100 +++ b/system/System.h Wed Oct 19 09:11:51 2016 +0100 @@ -82,6 +82,7 @@ #include <dlfcn.h> #include <stdio.h> // for perror #include <cmath> +#include <unistd.h> // sleep + usleep primarily #define MLOCK(a,b) ::mlock((a),(b)) #define MUNLOCK(a,b) (::munlock((a),(b)) ? (::perror("munlock failed"), 0) : 0)