projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c92acd4
)
Remove some unused things in PlayerVideo.
author
Carl Hetherington
<cth@carlh.net>
Thu, 19 Dec 2019 13:55:22 +0000
(14:55 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 12 Jan 2020 21:47:45 +0000
(22:47 +0100)
src/lib/player.cc
patch
|
blob
|
history
src/lib/player_video.cc
patch
|
blob
|
history
src/lib/player_video.h
patch
|
blob
|
history
src/wx/film_viewer.cc
patch
|
blob
|
history
src/wx/video_view.cc
patch
|
blob
|
history
src/wx/video_view.h
patch
|
blob
|
history
test/client_server_test.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 79db7cc2c76d1695ac3201a09a1a470ecc360b30..67fbd87387300a0e618f74f00832255ea3c3dc57 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-344,8
+344,7
@@
Player::black_player_video_frame (Eyes eyes) const
PART_WHOLE,
PresetColourConversion::all().front().conversion,
VIDEO_RANGE_FULL,
PART_WHOLE,
PresetColourConversion::all().front().conversion,
VIDEO_RANGE_FULL,
- boost::weak_ptr<Content>(),
- boost::optional<Frame>()
+ boost::weak_ptr<Content>()
)
);
}
)
);
}
@@
-847,8
+846,7
@@
Player::video (weak_ptr<Piece> wp, ContentVideo video)
video.part,
piece->content->video->colour_conversion(),
piece->content->video->range(),
video.part,
piece->content->video->colour_conversion(),
piece->content->video->range(),
- piece->content,
- video.frame
+ piece->content
)
);
)
);
diff --git
a/src/lib/player_video.cc
b/src/lib/player_video.cc
index ec1cfca9c99cecf54e47e2b03541278d30fa179b..74692b054dbbf3c1f21100f5e49579738c698d81 100644
(file)
--- a/
src/lib/player_video.cc
+++ b/
src/lib/player_video.cc
@@
-53,8
+53,7
@@
PlayerVideo::PlayerVideo (
Part part,
optional<ColourConversion> colour_conversion,
VideoRange video_range,
Part part,
optional<ColourConversion> colour_conversion,
VideoRange video_range,
- weak_ptr<Content> content,
- optional<Frame> video_frame
+ weak_ptr<Content> content
)
: _in (in)
, _crop (crop)
)
: _in (in)
, _crop (crop)
@@
-66,7
+65,6
@@
PlayerVideo::PlayerVideo (
, _colour_conversion (colour_conversion)
, _video_range (video_range)
, _content (content)
, _colour_conversion (colour_conversion)
, _video_range (video_range)
, _content (content)
- , _video_frame (video_frame)
{
}
{
}
@@
-314,8
+312,7
@@
PlayerVideo::shallow_copy () const
_part,
_colour_conversion,
_video_range,
_part,
_colour_conversion,
_video_range,
- _content,
- _video_frame
+ _content
)
);
}
)
);
}
@@
-324,10
+321,10
@@
PlayerVideo::shallow_copy () const
* @return true if this was possible, false if not.
*/
bool
* @return true if this was possible, false if not.
*/
bool
-PlayerVideo::reset_metadata (
shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame
_size)
+PlayerVideo::reset_metadata (
dcp::Size video_container
_size)
{
shared_ptr<Content> content = _content.lock();
{
shared_ptr<Content> content = _content.lock();
- if (!content
|| !_video_frame
) {
+ if (!content) {
return false;
}
return false;
}
diff --git
a/src/lib/player_video.h
b/src/lib/player_video.h
index 4b1a84e01f838b0d5e887a7b724132193ba262fb..cefb5cdb84da93afd2f7bcf5db1073023fe8c298 100644
(file)
--- a/
src/lib/player_video.h
+++ b/
src/lib/player_video.h
@@
-55,8
+55,7
@@
public:
Part,
boost::optional<ColourConversion>,
VideoRange video_range,
Part,
boost::optional<ColourConversion>,
VideoRange video_range,
- boost::weak_ptr<Content>,
- boost::optional<Frame>
+ boost::weak_ptr<Content>
);
PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
);
PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
@@
-74,7
+73,7
@@
public:
void add_metadata (xmlpp::Node* node) const;
void send_binary (boost::shared_ptr<Socket> socket) const;
void add_metadata (xmlpp::Node* node) const;
void send_binary (boost::shared_ptr<Socket> socket) const;
- bool reset_metadata (
boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame
_size);
+ bool reset_metadata (
dcp::Size video_container
_size);
bool has_j2k () const;
dcp::Data j2k () const;
bool has_j2k () const;
dcp::Data j2k () const;
@@
-124,8
+123,6
@@
private:
* for variant:swaroop's non-skippable ads.
*/
boost::weak_ptr<Content> _content;
* for variant:swaroop's non-skippable ads.
*/
boost::weak_ptr<Content> _content;
- /** Video frame that we came from. Again, this is for reset_metadata() */
- boost::optional<Frame> _video_frame;
mutable boost::mutex _mutex;
mutable boost::shared_ptr<Image> _image;
mutable boost::mutex _mutex;
mutable boost::shared_ptr<Image> _image;
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 9c3a9c81e0ca8d5b11a10c4ac7cbda386b655c73..16c825175c16ab31d3fa44e9aee0a661b4e198cb 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-425,7
+425,7
@@
FilmViewer::quick_refresh ()
if (!_video_view || !_film) {
return true;
}
if (!_video_view || !_film) {
return true;
}
- return _video_view->refresh_metadata (_
film, _player->video_container_size(), _film->frame
_size());
+ return _video_view->refresh_metadata (_
player->video_container
_size());
}
void
}
void
diff --git
a/src/wx/video_view.cc
b/src/wx/video_view.cc
index 014524757169cfad6140ee5b541f2a6ab0f46856..657b68cf642e05e64144d937f22c03515d0d6518 100644
(file)
--- a/
src/wx/video_view.cc
+++ b/
src/wx/video_view.cc
@@
-117,14
+117,14
@@
VideoView::start ()
}
bool
}
bool
-VideoView::refresh_metadata (
shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame
_size)
+VideoView::refresh_metadata (
dcp::Size video_container
_size)
{
pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video ();
if (!pv.first) {
return false;
}
{
pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = player_video ();
if (!pv.first) {
return false;
}
- if (!pv.first->reset_metadata (
film, video_container_size, film_frame
_size)) {
+ if (!pv.first->reset_metadata (
video_container
_size)) {
return false;
}
return false;
}
diff --git
a/src/wx/video_view.h
b/src/wx/video_view.h
index f9e0670435ed13edaa2e919cc373e11d12a0a48d..73de8282c9c9f9c281090779f878686e4afcd905 100644
(file)
--- a/
src/wx/video_view.h
+++ b/
src/wx/video_view.h
@@
-53,7
+53,7
@@
public:
virtual bool display_next_frame (bool) = 0;
void clear ();
virtual bool display_next_frame (bool) = 0;
void clear ();
- bool refresh_metadata (
boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame
_size);
+ bool refresh_metadata (
dcp::Size video_container
_size);
/** Emitted from the GUI thread when our display changes in size */
boost::signals2::signal<void()> Sized;
/** Emitted from the GUI thread when our display changes in size */
boost::signals2::signal<void()> Sized;
diff --git
a/test/client_server_test.cc
b/test/client_server_test.cc
index df854f9f3efec8bbb364e0ecbec2aedcb2fe7037..77a66ccad0cd974b8e3e590a8e050cafc3138234 100644
(file)
--- a/
test/client_server_test.cc
+++ b/
test/client_server_test.cc
@@
-98,8
+98,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_rgb)
PART_WHOLE,
ColourConversion(),
VIDEO_RANGE_FULL,
PART_WHOLE,
ColourConversion(),
VIDEO_RANGE_FULL,
- weak_ptr<Content>(),
- optional<Frame>()
+ weak_ptr<Content>()
)
);
)
);
@@
-183,8
+182,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_yuv)
PART_WHOLE,
ColourConversion(),
VIDEO_RANGE_FULL,
PART_WHOLE,
ColourConversion(),
VIDEO_RANGE_FULL,
- weak_ptr<Content>(),
- optional<Frame>()
+ weak_ptr<Content>()
)
);
)
);
@@
-255,8
+253,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
PART_WHOLE,
ColourConversion(),
VIDEO_RANGE_FULL,
PART_WHOLE,
ColourConversion(),
VIDEO_RANGE_FULL,
- weak_ptr<Content>(),
- optional<Frame>()
+ weak_ptr<Content>()
)
);
)
);
@@
-283,8
+280,7
@@
BOOST_AUTO_TEST_CASE (client_server_test_j2k)
PART_WHOLE,
PresetColourConversion::all().front().conversion,
VIDEO_RANGE_FULL,
PART_WHOLE,
PresetColourConversion::all().front().conversion,
VIDEO_RANGE_FULL,
- weak_ptr<Content>(),
- optional<Frame>()
+ weak_ptr<Content>()
)
);
)
);