projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use PBD::copy_file in Session::create() to copy the template file.
[ardour.git]
/
libs
/
ardour
/
diskstream.cc
diff --git
a/libs/ardour/diskstream.cc
b/libs/ardour/diskstream.cc
index 135718bb52a6c3a7b14556757ecfdc63a01d948f..18aeb329310bd7b739fb9e0862e7811b12fb2c5b 100644
(file)
--- a/
libs/ardour/diskstream.cc
+++ b/
libs/ardour/diskstream.cc
@@
-61,7
+61,7
@@
using namespace PBD;
* default from configuration_vars.h). 0 is not a good value for
* allocating buffer sizes..
*/
* default from configuration_vars.h). 0 is not a good value for
* allocating buffer sizes..
*/
-nframes_t Diskstream::disk_io_chunk_frames = 1024 * 256;
+
ARDOUR::
nframes_t Diskstream::disk_io_chunk_frames = 1024 * 256;
sigc::signal<void> Diskstream::DiskOverrun;
sigc::signal<void> Diskstream::DiskUnderrun;
sigc::signal<void> Diskstream::DiskOverrun;
sigc::signal<void> Diskstream::DiskUnderrun;
@@
-114,13
+114,12
@@
Diskstream::init (Flag f)
playback_distance = 0;
_read_data_count = 0;
_write_data_count = 0;
playback_distance = 0;
_read_data_count = 0;
_write_data_count = 0;
+ commit_should_unlock = false;
pending_overwrite = false;
overwrite_frame = 0;
overwrite_queued = false;
input_change_pending = NoChange;
pending_overwrite = false;
overwrite_frame = 0;
overwrite_queued = false;
input_change_pending = NoChange;
-
- _n_channels = 0;
}
Diskstream::~Diskstream ()
}
Diskstream::~Diskstream ()
@@
-214,7
+213,9
@@
Diskstream::prepare ()
void
Diskstream::recover ()
{
void
Diskstream::recover ()
{
- state_lock.unlock();
+ if (commit_should_unlock) {
+ state_lock.unlock();
+ }
_processed = false;
}
_processed = false;
}
@@
-258,7
+259,7
@@
Diskstream::set_loop (Location *location)
return 0;
}
return 0;
}
-nframes_t
+
ARDOUR::
nframes_t
Diskstream::get_capture_start_frame (uint32_t n)
{
Glib::Mutex::Lock lm (capture_info_lock);
Diskstream::get_capture_start_frame (uint32_t n)
{
Glib::Mutex::Lock lm (capture_info_lock);
@@
-271,7
+272,7
@@
Diskstream::get_capture_start_frame (uint32_t n)
}
}
}
}
-nframes_t
+
ARDOUR::
nframes_t
Diskstream::get_captured_frames (uint32_t n)
{
Glib::Mutex::Lock lm (capture_info_lock);
Diskstream::get_captured_frames (uint32_t n)
{
Glib::Mutex::Lock lm (capture_info_lock);
@@
-285,7
+286,7
@@
Diskstream::get_captured_frames (uint32_t n)
}
void
}
void
-Diskstream::set_roll_delay (nframes_t nframes)
+Diskstream::set_roll_delay (
ARDOUR::
nframes_t nframes)
{
_roll_delay = nframes;
}
{
_roll_delay = nframes;
}