mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-17 12:16:30 +01:00
Some fixes for GCC 4.7.0
git-svn-id: svn://localhost/ardour2/branches/3.0@11767 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e31e238927
commit
8ae1880e33
4 changed files with 4 additions and 3 deletions
|
|
@ -43,7 +43,7 @@ class SndfileReader
|
||||||
if (frames_read < context.frames()) {
|
if (frames_read < context.frames()) {
|
||||||
c_out.set_flag (ProcessContext<T>::EndOfInput);
|
c_out.set_flag (ProcessContext<T>::EndOfInput);
|
||||||
}
|
}
|
||||||
output (c_out);
|
this->output (c_out);
|
||||||
return frames_read;
|
return frames_read;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,7 @@ SampleFormatConverter<TOut>::process (ProcessContext<float> const & c_in)
|
||||||
/* Write forward */
|
/* Write forward */
|
||||||
|
|
||||||
ProcessContext<TOut> c_out(c_in, data_out);
|
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 */
|
/* Basic non-const version of process(), calls the const one */
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ public:
|
||||||
EventList() {}
|
EventList() {}
|
||||||
|
|
||||||
uint32_t write(Time time, EventType type, uint32_t size, const uint8_t* buf) {
|
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
|
type, time, size, const_cast<uint8_t*>(buf), true)); // Event copies buffer
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@
|
||||||
#else
|
#else
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "Profiler.h"
|
#include "Profiler.h"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue