Get closed caption view data from the butler, rather than the player.

You can't introduce the butler (so that the player is ahead of time)
and then ask the player what should be in the frame that is being
displayed "now"; the player will already have moved on.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index e3f13f62f..3da7f6522 100644
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -22,7 +22,7 @@
 #include "lib/player.h"
 #include <wx/wx.h>
 
-class Player;
+class Butler;
 
 class ClosedCaptionsDialog : public wxDialog
 {
@@ -31,11 +31,13 @@ public:
 
 	void update (DCPTime);
 	void clear ();
-	void set_player (boost::weak_ptr<Player>);
+	void set_butler (boost::weak_ptr<Butler>);
 
 private:
 	void paint ();
 
+	boost::optional<std::pair<PlayerText, DCPTimePeriod> > _current;
+	bool _current_in_lines;
 	std::vector<wxString> _lines;
-	boost::weak_ptr<Player> _player;
+	boost::weak_ptr<Butler> _butler;
 };