using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL);
- add_label_to_sizer (track_sizer, this, _("Track"), true);
+ add_label_to_sizer (track_sizer, this, _("Track"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
track_sizer->Add (_track, 0, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
if (!_current && !_tracks.empty()) {
/* We have no current one: get another */
shared_ptr<Butler> butler = _butler.lock ();
- DCPOMATIC_ASSERT (butler);
DCPOMATIC_ASSERT (_track->GetSelection() >= 0);
DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size()));
DCPTextTrack track = _tracks[_track->GetSelection()];
- while (true) {
- optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
- if (!d) {
- break;
- }
- if (d->track == track) {
- _current = d;
- break;
+ if (butler) {
+ while (true) {
+ optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
+ if (!d) {
+ break;
+ }
+ if (d->track == track) {
+ _current = d;
+ break;
+ }
}
- }
- _current_in_lines = false;
+ _current_in_lines = false;
+ }
}
if (_current && _current->period.contains(time)) {
Refresh ();
_current_in_lines = true;
}
+
+ if (!_current && _tracks.empty()) {
+ for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
+ _lines[i] = wxString();
+ }
+ }
}
void
Refresh ();
}
+
+void
+ClosedCaptionsDialog::set_butler (weak_ptr<Butler> butler)
+{
+ _butler = butler;
+}
+
void
-ClosedCaptionsDialog::set_film_and_butler (shared_ptr<Film> film, weak_ptr<Butler> butler)
+ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
{
_tracks.clear ();
_track->SetSelection (0);
}
- _butler = butler;
+ track_selected ();
}