diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-06-13 14:38:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-06-13 14:38:12 +0100 |
| commit | 13aae5d8ff27886656ab7ea3ef1194987954bb3f (patch) | |
| tree | 315d023a86f16fa8c0ae2e2c87fbc20071316fe8 /src/wx | |
| parent | 1daaa67c21d4d28757cdcb06c5e26aec3817867c (diff) | |
Remove caching of old ImageDecoder objects.
This breaks things when there is a 3D ImageContent. When
you change the video frame type on this content the view
does not update because the re-used ImageDecoder recycles
the same video without noticing that the frame type has changed.
I guess this is sort of `because' the video frame type is used
in VideoDecoder::give, which sets up the cache.
Unfortunately I can't remember the case which the caching
of ImageDecoders was meant to speed up. Maybe this will
now become apparent.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/subtitle_panel.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/wx/subtitle_panel.cc b/src/wx/subtitle_panel.cc index 840d3dad5..4efc4eee4 100644 --- a/src/wx/subtitle_panel.cc +++ b/src/wx/subtitle_panel.cc @@ -386,8 +386,7 @@ SubtitlePanel::subtitle_view_clicked () ContentList c = _parent->selected_subtitle (); DCPOMATIC_ASSERT (c.size() == 1); - list<shared_ptr<ImageDecoder> > image_decoders; - shared_ptr<Decoder> decoder = decoder_factory (c.front(), image_decoders, _parent->film()->log(), false); + shared_ptr<Decoder> decoder = decoder_factory (c.front(), _parent->film()->log(), false); if (decoder) { _subtitle_view = new SubtitleView (this, _parent->film(), decoder, c.front()->position ()); |