diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-15 12:30:17 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-03-15 12:30:17 +0000 |
| commit | a1960ba3c0c751e9f5fef4ccae70c46ae713c7cb (patch) | |
| tree | 79489a7019acd2ab3730eed504095328afd3b344 /libs/ardour/ardour | |
| parent | 44502336c876ea4bf5f1b8ffdc4ec21a3d8abdd3 (diff) | |
padding patch for mutex problem; better x86_64 alignment patch from mike taht; fixes for ringbuffer types for x86_64 from mike taht
git-svn-id: svn://localhost/ardour2/trunk@1593 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/diskstream.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index 5165a6943d..7335ee729b 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -33,7 +33,6 @@ #include <pbd/fastlog.h> #include <pbd/ringbufferNPT.h> #include <pbd/stateful.h> -#include <pbd/mutex.h> #include <pbd/statefuldestructible.h> #include <ardour/ardour.h> @@ -237,8 +236,9 @@ class IO; virtual void use_destructive_playlist () = 0; static nframes_t disk_io_chunk_frames; - vector<CaptureInfo*> capture_info; - PBDMutex capture_info_lock; + std::vector<CaptureInfo*> capture_info; + char pad1[1024]; + Glib::Mutex capture_info_lock; uint32_t i_am_the_modifier; @@ -293,7 +293,8 @@ class IO; AlignStyle _persistent_alignment_style; bool first_input_change; - PBDMutex state_lock; + char pad2[1024]; + Glib::Mutex state_lock; nframes_t scrub_start; nframes_t scrub_buffer_size; |