#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"
, _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)
, 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)
, 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;
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;
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) {
}
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
*/