diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-08-13 17:37:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-08-14 00:05:06 +0100 |
| commit | 1fe6bd7f8ba059322b8357b2210f0fd590567ce2 (patch) | |
| tree | 2c76fbf24b9b520f94f741040f11dc920d3bab91 /src/lib/audio_content.cc | |
| parent | f30ad4dec0a3fa5f1770fba93106a3e8910d66ba (diff) | |
More fixes for errors / crashes / misbehaviour with content changes
and the butler.
Here we signal both before and after a change in content. Before,
the player disables itself so that any pass()/seek() will be no-ops.
After, the player rebuilds its pieces and the butler re-seeks to
get back to where it was before the change.
Diffstat (limited to 'src/lib/audio_content.cc')
| -rw-r--r-- | src/lib/audio_content.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 7f0ec1fd6..703696a44 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -146,6 +146,8 @@ AudioContent::technical_summary () const void AudioContent::set_mapping (AudioMapping mapping) { + ContentChange cc (_parent, AudioContentProperty::STREAMS); + int c = 0; BOOST_FOREACH (AudioStreamPtr i, streams ()) { AudioMapping stream_mapping (i->channels (), MAX_DCP_AUDIO_CHANNELS); @@ -157,8 +159,6 @@ AudioContent::set_mapping (AudioMapping mapping) } i->set_mapping (stream_mapping); } - - _parent->signal_changed (AudioContentProperty::STREAMS); } AudioMapping @@ -341,12 +341,12 @@ AudioContent::add_properties (list<UserProperty>& p) const void AudioContent::set_streams (vector<AudioStreamPtr> streams) { + ContentChange cc (_parent, AudioContentProperty::STREAMS); + { boost::mutex::scoped_lock lm (_mutex); _streams = streams; } - - _parent->signal_changed (AudioContentProperty::STREAMS); } AudioStreamPtr @@ -360,24 +360,24 @@ AudioContent::stream () const void AudioContent::add_stream (AudioStreamPtr stream) { + ContentChange cc (_parent, AudioContentProperty::STREAMS); + { boost::mutex::scoped_lock lm (_mutex); _streams.push_back (stream); } - - _parent->signal_changed (AudioContentProperty::STREAMS); } void AudioContent::set_stream (AudioStreamPtr stream) { + ContentChange cc (_parent, AudioContentProperty::STREAMS); + { boost::mutex::scoped_lock lm (_mutex); _streams.clear (); _streams.push_back (stream); } - - _parent->signal_changed (AudioContentProperty::STREAMS); } void |