diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-03-30 00:03:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-03-30 00:03:53 +0000 |
| commit | 8ae1880e33803a41f9095a3f9e146bd6a96a3441 (patch) | |
| tree | 74c9111c57bfebfa8612e26eb5bc059e5e4b5154 | |
| parent | e31e23892772afe3b1c077649652f0304ee3ab31 (diff) | |
Some fixes for GCC 4.7.0
git-svn-id: svn://localhost/ardour2/branches/3.0@11767 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/audiographer/audiographer/sndfile/sndfile_reader.h | 2 | ||||
| -rw-r--r-- | libs/audiographer/src/general/sample_format_converter.cc | 2 | ||||
| -rw-r--r-- | libs/evoral/evoral/EventList.hpp | 2 | ||||
| -rw-r--r-- | libs/rubberband/src/main.cpp | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/libs/audiographer/audiographer/sndfile/sndfile_reader.h b/libs/audiographer/audiographer/sndfile/sndfile_reader.h index f7a04f22d6..aa3c0cc899 100644 --- a/libs/audiographer/audiographer/sndfile/sndfile_reader.h +++ b/libs/audiographer/audiographer/sndfile/sndfile_reader.h @@ -43,7 +43,7 @@ class SndfileReader if (frames_read < context.frames()) { c_out.set_flag (ProcessContext<T>::EndOfInput); } - output (c_out); + this->output (c_out); return frames_read; } diff --git a/libs/audiographer/src/general/sample_format_converter.cc b/libs/audiographer/src/general/sample_format_converter.cc index a1aa4d88a9..0dab2689dd 100644 --- a/libs/audiographer/src/general/sample_format_converter.cc +++ b/libs/audiographer/src/general/sample_format_converter.cc @@ -125,7 +125,7 @@ SampleFormatConverter<TOut>::process (ProcessContext<float> const & c_in) /* Write forward */ ProcessContext<TOut> c_out(c_in, data_out); - output (c_out); + this->output (c_out); } /* Basic non-const version of process(), calls the const one */ diff --git a/libs/evoral/evoral/EventList.hpp b/libs/evoral/evoral/EventList.hpp index 81243f8cbb..e1a2679ce7 100644 --- a/libs/evoral/evoral/EventList.hpp +++ b/libs/evoral/evoral/EventList.hpp @@ -36,7 +36,7 @@ public: EventList() {} uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf) { - push_back(new Evoral::Event<Time>( + this->push_back(new Evoral::Event<Time>( type, time, size, const_cast<uint8_t*>(buf), true)); // Event copies buffer return size; } diff --git a/libs/rubberband/src/main.cpp b/libs/rubberband/src/main.cpp index 811d64a708..f6c1a3d69f 100644 --- a/libs/rubberband/src/main.cpp +++ b/libs/rubberband/src/main.cpp @@ -28,6 +28,7 @@ #else #include <getopt.h> #include <sys/time.h> +#include <unistd.h> #endif #include "Profiler.h" |