diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 19:43:04 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-01-21 19:43:04 +0000 |
commit | 422e462c12bcea577a530bbdf4c2b651ba9f7ea4 (patch) | |
tree | bb24bcc3aae864461bad85fe761a38ad4e8fbf6d | |
parent | 63376189ad41cceea491debce1c22950aaf32ac8 (diff) |
volatile in stupid
git-svn-id: svn://localhost/ardour2/branches/3.0@13957 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | libs/ardour/ardour/midi_diskstream.h | 4 | ||||
-rw-r--r-- | libs/ardour/midi_diskstream.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index be0e0fe48c..309c275434 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -192,8 +192,8 @@ class MidiDiskstream : public Diskstream boost::weak_ptr<MidiPort> _source_port; boost::shared_ptr<SMFSource> _write_source; NoteMode _note_mode; - volatile gint _frames_written_to_ringbuffer; - volatile gint _frames_read_from_ringbuffer; + gint _frames_written_to_ringbuffer; + gint _frames_read_from_ringbuffer; volatile gint _frames_pending_write; volatile gint _num_captured_loops; diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index d8429fdcd1..34547cfbf7 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -494,8 +494,8 @@ MidiDiskstream::commit (framecnt_t playback_distance) adjust_capture_position = 0; } - uint32_t frames_read = g_atomic_int_get(&_frames_read_from_ringbuffer); - uint32_t frames_written = g_atomic_int_get(&_frames_written_to_ringbuffer); + uint32_t frames_read = g_atomic_int_get(const_cast<gint*>(&_frames_read_from_ringbuffer)); + uint32_t frames_written = g_atomic_int_get(const_cast<gint*>(&_frames_written_to_ringbuffer)); /* cerr << name() << " MDS written: " << frames_written << " - read: " << frames_read << |