Same thing with inter_size.

diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index 5c2f7cb11b174860be1e6ec767aa1bd45928011e..8cacf80d3f050bfb79f83865e5e2f81d7d75028b 100644 (file)
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -123,9 +123,6 @@ public:
        dcp::Size out_size () const {
                return _out_size;
        }
        dcp::Size out_size () const {
                return _out_size;
        }

-       dcp::Size inter_size () const {
-               return _inter_size;
-       }

        bool outline_content () const {
                return _outline_content;
        }
        bool outline_content () const {
                return _outline_content;
        }


@@ -177,8 +174,6 @@ private:
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 
        bool _coalesce_player_changes;
        std::list<int> _pending_player_changes;
 

-       dcp::Size _inter_size;
-

        /** Size of our output (including padding if we have any) */
        dcp::Size _out_size;
 
        /** Size of our output (including padding if we have any) */
        dcp::Size _out_size;
 

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index 93a53b4111a1472113c7501041efc69942cee950..ce152787a971fc31cc7e3ecdc29c54350e19764e 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -140,7 +140,7 @@ GLVideoView::update ()
 }
 
 void
 }
 
 void

-GLVideoView::draw (Position<int> inter_position)
+GLVideoView::draw (Position<int> inter_position, dcp::Size inter_size)

 {
        glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
        check_gl_error ("glClear");
 {
        glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
        check_gl_error ("glClear");


@@ -232,7 +232,6 @@ GLVideoView::draw (Position<int> inter_position)
        if (_viewer->outline_content()) {
                glColor3ub (255, 0, 0);
                glBegin (GL_LINE_LOOP);
        if (_viewer->outline_content()) {
                glColor3ub (255, 0, 0);
                glBegin (GL_LINE_LOOP);

-               dcp::Size inter_size = _viewer->inter_size ();

                glVertex2f (inter_position.x, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
                glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
                glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2 + inter_size.height);
                glVertex2f (inter_position.x, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
                glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2);
                glVertex2f (inter_position.x + inter_size.width, inter_position.y + (canvas_size.GetHeight() - out_size.height) / 2 + inter_size.height);


@@ -305,6 +304,7 @@ try
                lm.unlock ();
 
                Position<int> inter_position;
                lm.unlock ();
 
                Position<int> inter_position;

+               dcp::Size inter_size;

                if (length() != dcpomatic::DCPTime()) {
                        dcpomatic::DCPTime const next = position() + one_video_frame();
 
                if (length() != dcpomatic::DCPTime()) {
                        dcpomatic::DCPTime const next = position() + one_video_frame();
 


@@ -317,8 +317,9 @@ try
                        get_next_frame (false);
                        set_image (player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
                        inter_position = player_video().first->inter_position();
                        get_next_frame (false);
                        set_image (player_video().first->image(bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24), false, true));
                        inter_position = player_video().first->inter_position();

+                       inter_size = player_video().first->inter_size();

                }
                }

-               draw (inter_position);
+               draw (inter_position, inter_size);

 
                while (time_until_next_frame() < 5) {
                        get_next_frame (true);
 
                while (time_until_next_frame() < 5) {
                        get_next_frame (true);

diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h
index 01434d56915b0e8a03688c59a6075dbbb0c05f52..4f509049b3d4d954b60fd748f36f7188c24f9dff 100644 (file)
--- a/src/wx/gl_video_view.h
+++ b/src/wx/gl_video_view.h
@@ -51,7 +51,7 @@ public:
        }
 
 private:
        }
 
 private:

-       void draw (Position<int> inter_position);
+       void draw (Position<int> inter_position, dcp::Size inter_size);

        void thread ();
        void request_one_shot ();
        void create ();
        void thread ();
        void request_one_shot ();
        void create ();

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index 6a8a863d71c22a961bb7a62708d48b74782d1fb8..c8fe7b9ad8a8a54aab3fe60a14c8cc53bd42bafe 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -125,11 +125,10 @@ SimpleVideoView::paint ()
        }
 
        if (_viewer->outline_content()) {
        }
 
        if (_viewer->outline_content()) {

-               dcp::Size inter_size = _viewer->inter_size ();

                wxPen p (wxColour (255, 0, 0), 2);
                dc.SetPen (p);
                dc.SetBrush (*wxTRANSPARENT_BRUSH);
                wxPen p (wxColour (255, 0, 0), 2);
                dc.SetPen (p);
                dc.SetBrush (*wxTRANSPARENT_BRUSH);

-               dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, inter_size.width, inter_size.height);
+               dc.DrawRectangle (_inter_position.x, _inter_position.y + (panel_size.GetHeight() - out_size.height) / 2, _inter_size.width, _inter_size.height);

        }
         _viewer->state_timer().unset();
 }
        }
         _viewer->state_timer().unset();
 }


@@ -249,7 +248,7 @@ SimpleVideoView::display_player_video ()
        _viewer->_state_timer.unset ();
 
        _inter_position = player_video().first->inter_position ();
        _viewer->_state_timer.unset ();
 
        _inter_position = player_video().first->inter_position ();

-       _viewer->_inter_size = player_video().first->inter_size ();
+       _inter_size = player_video().first->inter_size ();

 
        _viewer->refresh_view ();
 
 
        _viewer->refresh_view ();
 

diff --git a/src/wx/simple_video_view.h b/src/wx/simple_video_view.h
index f318e778b36db9517812aa90a0b4cdb5d0d6c469..86451fa66c5e7f80073e4c648d1a793e7e256ea3 100644 (file)
--- a/src/wx/simple_video_view.h
+++ b/src/wx/simple_video_view.h
@@ -20,6 +20,7 @@
 
 #include "video_view.h"
 #include "lib/position.h"
 
 #include "video_view.h"
 #include "lib/position.h"

+#include <dcp/types.h>

 #include <wx/wx.h>
 
 class FilmViewer;
 #include <wx/wx.h>
 
 class FilmViewer;


@@ -50,4 +51,5 @@ private:
        boost::shared_ptr<const Image> _image;
        wxTimer _timer;
        Position<int> _inter_position;
        boost::shared_ptr<const Image> _image;
        wxTimer _timer;
        Position<int> _inter_position;

+       dcp::Size _inter_size;

 };
 };