X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=b81414bed9f72b37a0e638cf6545a19440685fae;hb=1db0293ad36605da9ca8daa8736ef581f4f6a34e;hp=3f444f9a4b14b5605fa9e51e41bb532ca093860a;hpb=ec97893127a2d59871d92c9e658b6b1ab3100b40;p=dcpomatic.git

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 3f444f9a4..b81414bed 100644
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -104,18 +104,18 @@ private:
 void
 ClosedCaptionsDialog::update (DCPTime time)
 {
-	if (_current_in_lines && _current->second.to > time) {
+	if (_current_in_lines && _current->period.to > time) {
 		/* Current one is fine */
 		return;
 	}
 
-	if (_current && _current->second.to < time) {
+	if (_current && _current->period.to < time) {
 		/* Current one has finished; clear out */
 		for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) {
 			_lines[j] = "";
 		}
 		Refresh ();
-		_current = optional<pair<PlayerText, DCPTimePeriod> >();
+		_current = optional<TextRingBuffers::Data>();
 	}
 
 	if (!_current) {
@@ -126,10 +126,10 @@ ClosedCaptionsDialog::update (DCPTime time)
 		_current_in_lines = false;
 	}
 
-	if (_current && _current->second.contains(time)) {
+	if (_current && _current->period.contains(time)) {
 		/* We need to set this new one up */
 
-		list<StringText> to_show = _current->first.string;
+		list<StringText> to_show = _current->text.string;
 
 		for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) {
 			_lines[j] = "";
@@ -153,7 +153,7 @@ ClosedCaptionsDialog::update (DCPTime time)
 void
 ClosedCaptionsDialog::clear ()
 {
-	_current = optional<pair<PlayerText, DCPTimePeriod> >();
+	_current = optional<TextRingBuffers::Data>();
 	_current_in_lines = false;
 	Refresh ();
 }