Various bits.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 96656ce097891ef8d8f6d54aaa59c518e52c9118..79b3d982f64b399d78a57c737a5a6d45d9d26b46 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -28,13 +28,13 @@
 #include "lib/format.h"
 #include "lib/util.h"
 #include "lib/job_manager.h"
-#include "lib/options.h"
 #include "lib/subtitle.h"
 #include "lib/image.h"
 #include "lib/scaler.h"
 #include "lib/exceptions.h"
 #include "lib/examine_content_job.h"
 #include "lib/filter.h"
+#include "lib/playlist.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "video_decoder.h"
@@ -51,7 +51,7 @@ FilmViewer::FilmViewer (shared_ptr<Film> f, wxWindow* p)
        : wxPanel (p)
        , _panel (new wxPanel (this))
        , _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
-       , _play_button (new wxToggleButton (this, wxID_ANY, wxT ("Play")))
+       , _play_button (new wxToggleButton (this, wxID_ANY, _("Play")))
        , _display_frame_x (0)
        , _got_frame (false)
        , _clear_required (false)
@@ -97,22 +97,16 @@ FilmViewer::film_changed (Film::Property p)
                break;
        case Film::CONTENT:
        {
-               DecodeOptions o;
-               o.decode_audio = false;
-               o.decode_subtitles = true;
-               o.video_sync = false;
-               _decoders = decoder_factory (_film, o);
-               if (_decoders.video == 0) {
-                       break;
-               }
-               _decoders.video->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
-               _decoders.video->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
-               _decoders.video->set_subtitle_stream (_film->subtitle_stream());
+               _player = _film->player ();
+               _player->disable_audio ();
+               _player->disable_subtitles ();
+               _player->disable_video_sync ();
+
+               _player->Video.connect (bind (&FilmViewer::process_video, this, _1, _2, _3));
+//             _player->OutputChanged.connect (boost::bind (&FilmViewer::decoder_changed, this));
                calculate_sizes ();
                get_frame ();
                _panel->Refresh ();
-               _slider->Show (_film->content_type() == VIDEO);
-               _play_button->Show (_film->content_type() == VIDEO);
                _v_sizer->Layout ();
                break;
        }
@@ -124,9 +118,9 @@ FilmViewer::film_changed (Film::Property p)
                update_from_raw ();
                break;
        case Film::SUBTITLE_STREAM:
-               if (_decoders.video) {
-                       _decoders.video->set_subtitle_stream (_film->subtitle_stream ());
-               }
+//             if (_decoders.video) {
+//                     _decoders.video->set_subtitle_stream (_film->subtitle_stream ());
+//             }
                break;
        default:
                break;
@@ -159,7 +153,7 @@ FilmViewer::set_film (shared_ptr<Film> f)
 void
 FilmViewer::decoder_changed ()
 {
-       if (_decoders.video == 0 || _decoders.video->seek_to_last ()) {
+       if (!_player || _player->seek_to_last ()) {
                return;
        }
 
@@ -171,7 +165,7 @@ FilmViewer::decoder_changed ()
 void
 FilmViewer::timer (wxTimerEvent &)
 {
-       if (!_film || !_decoders.video) {
+       if (!_player) {
                return;
        }
        
@@ -180,8 +174,8 @@ FilmViewer::timer (wxTimerEvent &)
 
        get_frame ();
 
-       if (_film->length()) {
-               int const new_slider_position = 4096 * _decoders.video->last_source_time() / (_film->length().get() / _film->frames_per_second());
+       if (_film->video_length()) {
+               int const new_slider_position = 4096 * _player->last_video_time() / (_film->video_length() / _film->video_frame_rate());
                if (new_slider_position != _slider->GetValue()) {
                        _slider->SetValue (new_slider_position);
                }
@@ -226,11 +220,11 @@ FilmViewer::paint_panel (wxPaintEvent &)
 void
 FilmViewer::slider_moved (wxScrollEvent &)
 {
-       if (!_film || !_film->length() || !_decoders.video) {
+       if (!_film || !_player) {
                return;
        }
        
-       if (_decoders.video->seek (_slider->GetValue() * _film->length().get() / (4096 * _film->frames_per_second()))) {
+       if (_player->seek (_slider->GetValue() * _film->video_length() / (4096 * _film->video_frame_rate()))) {
                return;
        }
        
@@ -287,6 +281,7 @@ FilmViewer::raw_to_display ()
                _clear_required = true;
        }
 
+#if 0  
        if (_raw_sub) {
 
                /* Our output is already cropped by the decoder, so we need to account for that
@@ -307,12 +302,13 @@ FilmViewer::raw_to_display ()
        } else {
                _display_sub.reset ();
        }
+#endif 
 }      
 
 void
 FilmViewer::calculate_sizes ()
 {
-       if (!_film) {
+       if (!_film || !_player) {
                return;
        }
 
@@ -362,7 +358,7 @@ FilmViewer::check_play_state ()
        }
        
        if (_play_button->GetValue()) {
-               _timer.Start (1000 / _film->frames_per_second());
+//             _timer.Start (1000 / _film->source_frame_rate());
        } else {
                _timer.Stop ();
        }
@@ -385,7 +381,7 @@ FilmViewer::get_frame ()
        /* Clear our raw frame in case we don't get a new one */
        _raw_frame.reset ();
 
-       if (_decoders.video == 0) {
+       if (!_player) {
                _display_frame.reset ();
                return;
        }
@@ -393,7 +389,7 @@ FilmViewer::get_frame ()
        try {
                _got_frame = false;
                while (!_got_frame) {
-                       if (_decoders.video->pass ()) {
+                       if (_player->pass ()) {
                                /* We didn't get a frame before the decoder gave up,
                                   so clear our display frame.
                                */
@@ -404,7 +400,7 @@ FilmViewer::get_frame ()
        } catch (DecodeError& e) {
                _play_button->SetValue (false);
                check_play_state ();
-               error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), e.what()));
+               error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
        }
 }