projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix logic so that soloing a bus does not mute things that feed it.
[ardour.git]
/
libs
/
ardour
/
internal_return.cc
diff --git
a/libs/ardour/internal_return.cc
b/libs/ardour/internal_return.cc
index 807582c37956748edf89dc05fa5a2460042d1da7..279472e02d18cda39eef14d6236aed6f56303eeb 100644
(file)
--- a/
libs/ardour/internal_return.cc
+++ b/
libs/ardour/internal_return.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2009 Paul Davis
+ Copyright (C) 2009 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-27,24
+27,24
@@
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
-
sigc::signal
<void,nframes_t> InternalReturn::CycleStart;
+
PBD::Signal1
<void,nframes_t> InternalReturn::CycleStart;
InternalReturn::InternalReturn (Session& s)
: Return (s, true)
, user_count (0)
{
InternalReturn::InternalReturn (Session& s)
: Return (s, true)
, user_count (0)
{
- CycleStart.connect
(mem_fun (*this, &InternalReturn::cycle_start
));
+ CycleStart.connect
_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1
));
}
InternalReturn::InternalReturn (Session& s, const XMLNode& node)
: Return (s, node, true)
, user_count (0)
{
}
InternalReturn::InternalReturn (Session& s, const XMLNode& node)
: Return (s, node, true)
, user_count (0)
{
- CycleStart.connect
(mem_fun (*this, &InternalReturn::cycle_start
));
+ CycleStart.connect
_same_thread (*this, boost::bind (&InternalReturn::cycle_start, this, _1
));
}
void
}
void
-InternalReturn::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes)
+InternalReturn::run (BufferSet& bufs, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t nframes
, bool
)
{
if (!_active && !_pending_active) {
return;
{
if (!_active && !_pending_active) {
return;
@@
-69,7
+69,7
@@
InternalReturn::configure_io (ChanCount in, ChanCount out)
return true;
}
return true;
}
-void
+void
InternalReturn::set_block_size (nframes_t nframes)
{
allocate_buffers (nframes);
InternalReturn::set_block_size (nframes_t nframes)
{
allocate_buffers (nframes);
@@
-131,12
+131,12
@@
InternalReturn::get_state()
}
int
}
int
-InternalReturn::set_state (const XMLNode& node)
+InternalReturn::set_state (const XMLNode& node
, int version
)
{
{
- return Return::set_state (node);
+ return Return::set_state (node
, version
);
}
}
-bool
+bool
InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
{
out = in;
InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
{
out = in;
@@
-146,5
+146,5
@@
InternalReturn::can_support_io_configuration (const ChanCount& in, ChanCount& ou
bool
InternalReturn::visible () const
{
bool
InternalReturn::visible () const
{
- return false;
+ return false;
}
}