#include <cstdlib>
#include <ctime>
#include <sys/stat.h>
-#include <sys/mman.h>
-
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "pbd/error.h"
#include "pbd/basename.h"
#include "pbd/xml++.h"
#include "pbd/stacktrace.h"
-#include "ardour/ardour.h"
-#include "ardour/audioengine.h"
#include "ardour/debug.h"
#include "ardour/diskstream.h"
-#include "ardour/utils.h"
-#include "ardour/configuration.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/send.h"
+#include "ardour/io.h"
#include "ardour/pannable.h"
-#include "ardour/panner_shell.h"
#include "ardour/playlist.h"
-#include "ardour/cycle_timer.h"
-#include "ardour/region.h"
-#include "ardour/panner.h"
#include "ardour/session.h"
-#include "ardour/io.h"
#include "ardour/track.h"
#include "i18n.h"
* default from configuration_vars.h). 0 is not a good value for
* allocating buffer sizes..
*/
-ARDOUR::framecnt_t Diskstream::disk_io_chunk_frames = 1024 * 256;
+ARDOUR::framecnt_t Diskstream::disk_io_chunk_frames = 1024 * 256 / sizeof (Sample);
PBD::Signal0<void> Diskstream::DiskOverrun;
PBD::Signal0<void> Diskstream::DiskUnderrun;
, _actual_speed (1.0f)
, _buffer_reallocation_required (false)
, _seek_required (false)
- , force_refill (false)
, capture_start_frame (0)
, capture_captured (0)
, was_recording (false)
, last_possibly_recording (0)
, _alignment_style (ExistingMaterial)
, _alignment_choice (Automatic)
- , _scrubbing (false)
, _slaved (false)
, loop_location (0)
, overwrite_frame (0)
, _target_speed (_speed)
, file_frame (0)
, playback_sample (0)
- , playback_distance (0)
- , _read_data_count (0)
- , _write_data_count (0)
, in_set_state (false)
, _flags (flag)
, deprecated_io_node (0)
, _actual_speed (1.0f)
, _buffer_reallocation_required (false)
, _seek_required (false)
- , force_refill (false)
, capture_start_frame (0)
, capture_captured (0)
, was_recording (false)
, last_possibly_recording (0)
, _alignment_style (ExistingMaterial)
, _alignment_choice (Automatic)
- , _scrubbing (false)
, _slaved (false)
, loop_location (0)
, overwrite_frame (0)
, _target_speed (_speed)
, file_frame (0)
, playback_sample (0)
- , playback_distance (0)
- , _read_data_count (0)
- , _write_data_count (0)
, in_set_state (false)
, _flags (Recordable)
, deprecated_io_node (0)
void
Diskstream::handle_input_change (IOChange change, void * /*src*/)
{
- Glib::Mutex::Lock lm (state_lock);
+ Glib::Threads::Mutex::Lock lm (state_lock);
if (change.type & (IOChange::ConfigurationChanged|IOChange::ConnectionsChanged)) {
{
if (_buffer_reallocation_required)
{
- Glib::Mutex::Lock lm (state_lock);
+ Glib::Threads::Mutex::Lock lm (state_lock);
allocate_temporary_buffers ();
_buffer_reallocation_required = false;
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 ((a != _alignment_choice) || force) {
_alignment_choice = a;
- switch (_alignment_choice) {
- case Automatic:
- set_align_style_from_io ();
- break;
- case UseExistingMaterial:
- set_align_style (ExistingMaterial);
- break;
- case UseCaptureTime:
- set_align_style (CaptureTime);
- break;
- }
+ switch (_alignment_choice) {
+ case Automatic:
+ set_align_style_from_io ();
+ break;
+ case UseExistingMaterial:
+ set_align_style (ExistingMaterial);
+ break;
+ case UseCaptureTime:
+ set_align_style (CaptureTime);
+ break;
+ }
}
}
ARDOUR::framepos_t
Diskstream::get_capture_start_frame (uint32_t n) const
{
- Glib::Mutex::Lock lm (capture_info_lock);
+ Glib::Threads::Mutex::Lock lm (capture_info_lock);
if (capture_info.size() > n) {
/* this is a completed capture */
ARDOUR::framecnt_t
Diskstream::get_captured_frames (uint32_t n) const
{
- Glib::Mutex::Lock lm (capture_info_lock);
+ Glib::Threads::Mutex::Lock lm (capture_info_lock);
if (capture_info.size() > n) {
/* this is a completed capture */
bool prior_playlist = false;
{
- Glib::Mutex::Lock lm (state_lock);
+ Glib::Threads::Mutex::Lock lm (state_lock);
if (playlist == _playlist) {
return 0;
playlist()->set_name (str);
SessionObject::set_name(str);
}
- return true;
+ return true;
+}
+
+bool
+Diskstream::set_write_source_name (const std::string& str) {
+ _write_source_name = str;
+ return true;
}
XMLNode&
}
if (deprecated_io_node) {
- if ((prop = deprecated_io_node->property ("id")) != 0) {
- _id = prop->value ();
- }
+ set_id (*deprecated_io_node);
} else {
- if ((prop = node.property ("id")) != 0) {
- _id = prop->value ();
- }
+ set_id (node);
}
if ((prop = node.property ("flags")) != 0) {
return -1;
}
- {
- bool had_playlist = (_playlist != 0);
-
- if (find_and_use_playlist (prop->value())) {
- return -1;
- }
-
- if (!had_playlist) {
- _playlist->set_orig_diskstream_id (id());
- }
+ if (find_and_use_playlist (prop->value())) {
+ return -1;
}
if ((prop = node.property ("speed")) != 0) {
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);
const int transport_rolling = 0x4;
const int track_rec_enabled = 0x2;
const int global_rec_enabled = 0x1;
- const int fully_rec_enabled = (transport_rolling|track_rec_enabled|global_rec_enabled);
+ const int fully_rec_enabled = (transport_rolling|track_rec_enabled|global_rec_enabled);
/* merge together the 3 factors that affect record status, and compute
- what has changed.
- */
+ * what has changed.
+ */
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) {
return;
}
- framecnt_t existing_material_offset = _session.worst_playback_latency();
+ framecnt_t existing_material_offset = _session.worst_playback_latency();
- if (possibly_recording == fully_rec_enabled) {
+ if (possibly_recording == fully_rec_enabled) {
- if (last_possibly_recording == fully_rec_enabled) {
- return;
- }
+ if (last_possibly_recording == fully_rec_enabled) {
+ return;
+ }
capture_start_frame = _session.transport_frame();
first_recordable_frame = capture_start_frame + _capture_offset;
first_recordable_frame));
}
- prepare_record_status (capture_start_frame);
+ prepare_record_status (capture_start_frame);
- } else {
+ } else {
- if (last_possibly_recording == fully_rec_enabled) {
+ if (last_possibly_recording == fully_rec_enabled) {
- /* we were recording last time */
+ /* we were recording last time */
- if (change & transport_rolling) {
+ if (change & transport_rolling) {
- /* transport-change (stopped rolling): last_recordable_frame was set in ::prepare_to_stop(). We
- had to set it there because we likely rolled past the stopping point to declick out,
- and then backed up.
- */
+ /* transport-change (stopped rolling): last_recordable_frame was set in ::prepare_to_stop(). We
+ * had to set it there because we likely rolled past the stopping point to declick out,
+ * and then backed up.
+ */
- } else {
- /* punch out */
+ } else {
+ /* punch out */
- last_recordable_frame = _session.transport_frame() + _capture_offset;
+ last_recordable_frame = _session.transport_frame() + _capture_offset;
- if (_alignment_style == ExistingMaterial) {
- last_recordable_frame += existing_material_offset;
- }
- }
- }
- }
+ if (_alignment_style == ExistingMaterial) {
+ last_recordable_frame += existing_material_offset;
+ }
+ }
+ }
+ }
last_possibly_recording = possibly_recording;
}
}
void
-Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, framecnt_t nframes,
- framecnt_t & rec_nframes, framecnt_t & rec_offset)
+Diskstream::calculate_record_range (Evoral::OverlapType ot, framepos_t transport_frame, framecnt_t nframes,
+ framecnt_t & rec_nframes, framecnt_t & rec_offset)
{
switch (ot) {
- case OverlapNone:
+ case Evoral::OverlapNone:
rec_nframes = 0;
break;
- case OverlapInternal:
+ case Evoral::OverlapInternal:
/* ---------- recrange
|---| transrange
*/
rec_offset = 0;
break;
- case OverlapStart:
+ case Evoral::OverlapStart:
/* |--------| recrange
-----| transrange
*/
}
break;
- case OverlapEnd:
+ case Evoral::OverlapEnd:
/* |--------| recrange
|-------- transrange
*/
rec_offset = 0;
break;
- case OverlapExternal:
+ case Evoral::OverlapExternal:
/* |--------| recrange
-------------- transrange
*/
{
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);
+}
projects / ardour.git / blobdiff