smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 20:29:35 +01:00
Code Issues Projects Releases Wiki Activity

Remove some thought-to-be-useless volatile qualifiers.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8147 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-12-01 20:49:32 +00:00
parent a5ea47ff0d
commit 6c76a275e1
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libs/ardour/ardour/session.h
View file

@ -844,21 +844,21 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
nframes_t _nominal_frame_rate; //ignores audioengine setting, "native" SR
int transport_sub_state;
mutable gint _record_status;
volatile framepos_t _transport_frame;
framepos_t _transport_frame;
Location* _session_range_location; ///< session range, or 0 if there is nothing in the session yet
Slave* _slave;
bool _silent;
// varispeed playback
volatile double _transport_speed;
double _last_transport_speed;
double _target_transport_speed;
CubicInterpolation interpolation;
// varispeed playback
double _transport_speed;
double _last_transport_speed;
double _target_transport_speed;
CubicInterpolation interpolation;
bool auto_play_legal;
framepos_t _last_slave_transport_frame;
framepos_t _last_slave_transport_frame;
nframes_t maximum_output_latency;
volatile framepos_t _requested_return_frame;
framepos_t _requested_return_frame;
nframes_t current_block_size;
nframes_t _worst_output_latency;
nframes_t _worst_input_latency;

8
libs/ardour/session_transport.cc
View file

@ -593,9 +593,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
play_loop = false;
}
// can't cast away volatile so copy and emit that
framepos_t tframe = _transport_frame;
PositionChanged (tframe); /* EMIT SIGNAL */
PositionChanged (_transport_frame); /* EMIT SIGNAL */
TransportStateChange (); /* EMIT SIGNAL */
/* and start it up again if relevant */
@ -1443,9 +1441,7 @@ Session::engine_halted ()
void
Session::xrun_recovery ()
{
// can't cast away volatile so copy and emit that
framepos_t tframe = _transport_frame;
Xrun (tframe); //EMIT SIGNAL
Xrun (_transport_frame); //EMIT SIGNAL
if (Config->get_stop_recording_on_xrun() && actively_recording()) {