volatile in stupid

git-svn-id: svn://localhost/ardour2/branches/3.0@13957 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index be0e0fe48c53f82ccf19b589179f51d90c33dcb3..309c275434b9304689bf7320d895a34538235ca5 100644 (file)
--- 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 d8429fdcd15a18359d65916ee37df54a62d4d2c8..34547cfbf7d41f259325edcecbebbb65210e791c 100644 (file)
--- 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 <<