projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a couple of visibility specifiers that were missing
[ardour.git]
/
libs
/
ardour
/
diskstream.cc
diff --git
a/libs/ardour/diskstream.cc
b/libs/ardour/diskstream.cc
index 553e29244f026c104f21d167d06bad5087320621..e046d5a830beda849f45ab7a77208f8de90a18ba 100644
(file)
--- a/
libs/ardour/diskstream.cc
+++ b/
libs/ardour/diskstream.cc
@@
-29,7
+29,6
@@
#include <cstdlib>
#include <ctime>
#include <sys/stat.h>
#include <cstdlib>
#include <ctime>
#include <sys/stat.h>
-#include <sys/mman.h>
#include <glibmm/threads.h>
#include <glibmm/threads.h>
@@
-224,8
+223,8
@@
Diskstream::realtime_set_speed (double sp, bool global)
if (new_speed != _actual_speed) {
if (new_speed != _actual_speed) {
- framecnt_t required_wrap_size = (framecnt_t)
floor
(_session.get_block_size() *
- fabs (new_speed)) +
1
;
+ framecnt_t required_wrap_size = (framecnt_t)
ceil
(_session.get_block_size() *
+ fabs (new_speed)) +
2
;
if (required_wrap_size > wrap_buffer_size) {
_buffer_reallocation_required = true;
if (required_wrap_size > wrap_buffer_size) {
_buffer_reallocation_required = true;
@@
-571,7
+570,7
@@
Diskstream::move_processor_automation (boost::weak_ptr<Processor> p, list< Evora
set<Evoral::Parameter> const a = processor->what_can_be_automated ();
set<Evoral::Parameter> const a = processor->what_can_be_automated ();
- for (set<Evoral::Parameter>::iterator i = a.begin (); i != a.end (); ++i) {
+ for (set<Evoral::Parameter>::
const_
iterator i = a.begin (); i != a.end (); ++i) {
boost::shared_ptr<AutomationList> al = processor->automation_control(*i)->alist();
XMLNode & before = al->get_state ();
bool const things_moved = al->move_ranges (movements);
boost::shared_ptr<AutomationList> al = processor->automation_control(*i)->alist();
XMLNode & before = al->get_state ();
bool const things_moved = al->move_ranges (movements);
@@
-601,7
+600,7
@@
Diskstream::check_record_status (framepos_t transport_frame, bool can_record)
*/
rolling = _session.transport_speed() != 0.0f;
*/
rolling = _session.transport_speed() != 0.0f;
- possibly_recording = (rolling << 2) | (
record_enabled() << 1) |
can_record;
+ possibly_recording = (rolling << 2) | (
(int)record_enabled() << 1) | (int)
can_record;
change = possibly_recording ^ last_possibly_recording;
if (possibly_recording == last_possibly_recording) {
change = possibly_recording ^ last_possibly_recording;
if (possibly_recording == last_possibly_recording) {
@@
-727,3
+726,16
@@
Diskstream::prepare_to_stop (framepos_t pos)
{
last_recordable_frame = pos + _capture_offset;
}
{
last_recordable_frame = pos + _capture_offset;
}
+
+void
+Diskstream::engage_record_enable ()
+{
+ g_atomic_int_set (&_record_enabled, 1);
+}
+
+void
+Diskstream::disengage_record_enable ()
+{
+ g_atomic_int_set (&_record_enabled, 0);
+}
+