Merge branch 'master' into windows

[ardour.git] / libs / ardour / diskstream.cc

diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index d5ecd3713bdd63e9d0cb4b78785959e8a59afa29..6ef4327343069aa309950246dee9420190347c91 100644 (file)
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -29,10 +29,8 @@
 #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"
@@ -40,22 +38,12 @@
 #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"
@@ -182,7 +170,7 @@ Diskstream::set_track (Track* t)
 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)) {
 
@@ -204,7 +192,7 @@ Diskstream::non_realtime_set_speed ()
 {
        if (_buffer_reallocation_required)
        {
-               Glib::Mutex::Lock lm (state_lock);
+               Glib::Threads::Mutex::Lock lm (state_lock);
                allocate_temporary_buffers ();
 
                _buffer_reallocation_required = false;
@@ -235,8 +223,8 @@ Diskstream::realtime_set_speed (double sp, bool global)
 
        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;
@@ -326,7 +314,7 @@ Diskstream::set_loop (Location *location)
 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 */
@@ -340,7 +328,7 @@ Diskstream::get_capture_start_frame (uint32_t n) const
 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 */
@@ -367,7 +355,7 @@ Diskstream::use_playlist (boost::shared_ptr<Playlist> playlist)
         bool prior_playlist = false;
 
        {
-               Glib::Mutex::Lock lm (state_lock);
+               Glib::Threads::Mutex::Lock lm (state_lock);
 
                if (playlist == _playlist) {
                        return 0;
@@ -504,16 +492,8 @@ Diskstream::set_state (const XMLNode& node, int /*version*/)
                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) {
@@ -693,15 +673,15 @@ Diskstream::route_going_away ()
 }
 
 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
                */
@@ -709,7 +689,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f
                rec_offset = 0;
                break;
 
-       case OverlapStart:
+       case Evoral::OverlapStart:
                /*    |--------|    recrange
                -----|          transrange
                */
@@ -719,7 +699,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f
                }
                break;
 
-       case OverlapEnd:
+       case Evoral::OverlapEnd:
                /*    |--------|    recrange
                         |--------  transrange
                */
@@ -727,7 +707,7 @@ Diskstream::calculate_record_range(OverlapType ot, framepos_t transport_frame, f
                rec_offset = 0;
                break;
 
-       case OverlapExternal:
+       case Evoral::OverlapExternal:
                /*    |--------|    recrange
                    --------------  transrange
                */
@@ -746,3 +726,16 @@ Diskstream::prepare_to_stop (framepos_t pos)
 {
         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);
+}
+