Fix various problems with the closed caption viewer not being updated properly.

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index afcf5fa876f97b35d0cf66bf9765cf379e0afa13..625652b8c30d2a4dc6dde2326b6ea8b0cfd43134 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -205,6 +205,12 @@ ClosedCaptionsDialog::update ()
                Refresh ();
                _current_in_lines = true;
        }
                Refresh ();
                _current_in_lines = true;
        }

+
+       if (!_current && _tracks.empty()) {
+               for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
+                       _lines[i] = wxString();
+               }
+       }

 }
 
 void
 }
 
 void


@@ -215,8 +221,15 @@ ClosedCaptionsDialog::clear ()
        Refresh ();
 }
 
        Refresh ();
 }
 

+
+void
+ClosedCaptionsDialog::set_butler (weak_ptr<Butler> butler)
+{
+       _butler = butler;
+}
+

 void
 void

-ClosedCaptionsDialog::set_film_and_butler (shared_ptr<Film> film, weak_ptr<Butler> butler)
+ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)

 {
        _tracks.clear ();
 
 {
        _tracks.clear ();
 


@@ -239,5 +252,5 @@ ClosedCaptionsDialog::set_film_and_butler (shared_ptr<Film> film, weak_ptr<Butle
                _track->SetSelection (0);
        }
 
                _track->SetSelection (0);
        }
 

-       _butler = butler;
+       track_selected ();

 }
 }

diff --git a/src/wx/closed_captions_dialog.h b/src/wx/closed_captions_dialog.h
index cfdab5f3c2c39393e7eaefcb5fe1f6b5df991444..4117de2639a55d1e5fa64e64b29d242b0c6ea8b4 100644 (file)
--- a/src/wx/closed_captions_dialog.h
+++ b/src/wx/closed_captions_dialog.h
@@ -35,7 +35,8 @@ public:
        explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
        void clear ();
        explicit ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer);
 
        void clear ();

-       void set_film_and_butler (boost::shared_ptr<Film>, boost::weak_ptr<Butler>);
+       void update_tracks (boost::shared_ptr<const Film> film);
+       void set_butler (boost::weak_ptr<Butler>);

 
 private:
        void shown (wxShowEvent);
 
 private:
        void shown (wxShowEvent);

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 21a35c227465e3631444a9cac687bccc84c77bd3..154b3a5fd394a12d154662da1420e1c805818785 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -47,6 +47,7 @@
 #include "lib/config.h"
 #include "lib/compose.hpp"
 #include "lib/dcpomatic_log.h"
 #include "lib/config.h"
 #include "lib/compose.hpp"
 #include "lib/dcpomatic_log.h"

+#include "lib/text_content.h"

 extern "C" {
 #include <libavutil/pixfmt.h>
 }
 extern "C" {
 #include <libavutil/pixfmt.h>
 }


@@ -179,6 +180,7 @@ FilmViewer::set_film (shared_ptr<Film> film)
        _player->set_play_referenced ();
 
        _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));
        _player->set_play_referenced ();
 
        _film->Change.connect (boost::bind (&FilmViewer::film_change, this, _1, _2));

+       _film->ContentChange.connect (boost::bind(&FilmViewer::content_change, this, _1, _3));

        _film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
        _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 
        _film->LengthChange.connect (boost::bind(&FilmViewer::film_length_change, this));
        _player->Change.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3));
 


@@ -221,7 +223,7 @@ FilmViewer::recreate_butler ()
                _butler->disable_audio ();
        }
 
                _butler->disable_audio ();
        }
 

-       _closed_captions_dialog->set_film_and_butler (_film, _butler);
+       _closed_captions_dialog->set_butler (_butler);

 
        resume ();
 }
 
        resume ();
 }


@@ -408,6 +410,8 @@ FilmViewer::film_change (ChangeType type, Film::Property p)
                _video_view->set_video_frame_rate (_film->video_frame_rate());
        } else if (p == Film::THREE_D) {
                _video_view->set_three_d (_film->three_d());
                _video_view->set_video_frame_rate (_film->video_frame_rate());
        } else if (p == Film::THREE_D) {
                _video_view->set_three_d (_film->three_d());

+       } else if (p == Film::CONTENT) {
+               _closed_captions_dialog->update_tracks (_film);

        }
 }
 
        }
 }
 


@@ -703,3 +707,15 @@ FilmViewer::gets () const
 }
 
 
 }
 
 

+void
+FilmViewer::content_change (ChangeType type, int property)
+{
+       if (type != CHANGE_TYPE_DONE) {
+               return;
+       }
+
+       if (property == TextContentProperty::USE || property == TextContentProperty::TYPE || property == TextContentProperty::DCP_TRACK) {
+               _closed_captions_dialog->update_tracks (_film);
+       }
+}
+

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 6e995813c5c0215751ec2ba52f31df6701330903..11a4731fca82648c1fbf5a47593d1572d51bd526 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -161,6 +161,7 @@ private:
        void idle_handler ();
        void request_idle_display_next_frame ();
        void film_change (ChangeType, Film::Property);
        void idle_handler ();
        void request_idle_display_next_frame ();
        void film_change (ChangeType, Film::Property);

+       void content_change (ChangeType, int property);

        void recreate_butler ();
        void config_changed (Config::Property);
        void film_length_change ();
        void recreate_butler ();
        void config_changed (Config::Property);
        void film_length_change ();