projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
midi_clock_slave: fix wrong calculation of loop error
[ardour.git]
/
libs
/
ardour
/
internal_return.cc
diff --git
a/libs/ardour/internal_return.cc
b/libs/ardour/internal_return.cc
index ad2ed81194ece50b686f74c68aa0f1fda352ec43..fc5963603b5ac572d7d9313b3211b0b2c07bacc4 100644
(file)
--- a/
libs/ardour/internal_return.cc
+++ b/
libs/ardour/internal_return.cc
@@
-16,7
+16,7
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <glibmm/thread.h>
+#include <glibmm/thread
s
.h>
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
#include "ardour/internal_return.h"
#include "ardour/internal_send.h"
@@
-37,7
+37,7
@@
InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*e
return;
}
return;
}
- Glib::
Mutex::Lock lm (_sends_mutex, Glib
::TRY_LOCK);
+ Glib::
Threads::Mutex::Lock lm (_sends_mutex, Glib::Threads
::TRY_LOCK);
if (lm.locked ()) {
for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
if (lm.locked ()) {
for (list<InternalSend*>::iterator i = _sends.begin(); i != _sends.end(); ++i) {
@@
-53,14
+53,14
@@
InternalReturn::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*e
void
InternalReturn::add_send (InternalSend* send)
{
void
InternalReturn::add_send (InternalSend* send)
{
- Glib::Mutex::Lock lm (_sends_mutex);
+ Glib::
Threads::
Mutex::Lock lm (_sends_mutex);
_sends.push_back (send);
}
void
InternalReturn::remove_send (InternalSend* send)
{
_sends.push_back (send);
}
void
InternalReturn::remove_send (InternalSend* send)
{
- Glib::Mutex::Lock lm (_sends_mutex);
+ Glib::
Threads::
Mutex::Lock lm (_sends_mutex);
_sends.remove (send);
}
_sends.remove (send);
}
@@
-80,7
+80,7
@@
InternalReturn::get_state()
}
bool
}
bool
-InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out)
const
+InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out)
{
out = in;
return true;
{
out = in;
return true;