projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various changes to colour conversion specification to use chromaticities.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index ef5c78f24ae2b628751b493fb9a2f618c7ec047a..26f135d48eed0b480e4736a6c01feda55b874132 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-21,16
+21,11
@@
* @brief A wx widget to view a preview of a Film.
*/
* @brief A wx widget to view a preview of a Film.
*/
-#include <iostream>
-#include <iomanip>
-#include <wx/tglbtn.h>
-#include <dcp/exceptions.h>
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/job_manager.h"
#include "lib/image.h"
#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/util.h"
#include "lib/job_manager.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/exceptions.h"
#include "lib/examine_content_job.h"
#include "lib/filter.h"
@@
-39,8
+34,13
@@
#include "lib/video_content.h"
#include "lib/video_decoder.h"
#include "lib/timer.h"
#include "lib/video_content.h"
#include "lib/video_decoder.h"
#include "lib/timer.h"
+#include "lib/log.h"
#include "film_viewer.h"
#include "wx_util.h"
#include "film_viewer.h"
#include "wx_util.h"
+#include <dcp/exceptions.h>
+#include <wx/tglbtn.h>
+#include <iostream>
+#include <iomanip>
using std::string;
using std::pair;
using std::string;
using std::pair;
@@
-50,6
+50,7
@@
using std::cout;
using std::list;
using std::bad_alloc;
using std::make_pair;
using std::list;
using std::bad_alloc;
using std::make_pair;
+using std::exception;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
@@
-151,6
+152,8
@@
FilmViewer::set_film (shared_ptr<Film> f)
calculate_sizes ();
get (_position, _last_get_accurate);
calculate_sizes ();
get (_position, _last_get_accurate);
+
+ setup_sensitivity ();
}
void
}
void
@@
-167,11
+170,17
@@
FilmViewer::get (DCPTime p, bool accurate)
return;
}
return;
}
- list<shared_ptr<PlayerVideo> > pvf = _player->get_video (p, accurate);
+ list<shared_ptr<PlayerVideo> > pvf;
+ try {
+ pvf = _player->get_video (p, accurate);
+ } catch (exception& e) {
+ error_dialog (this, wxString::Format (_("Could not get video for view (%s)"), std_to_wx(e.what()).data()));
+ }
+
if (!pvf.empty ()) {
try {
if (!pvf.empty ()) {
try {
- _frame = pvf.front()->image (
true
);
- _frame = _frame->scale (_frame->size(),
Scaler::from_id ("fastbilinear"),
PIX_FMT_RGB24, false);
+ _frame = pvf.front()->image (
PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)
);
+ _frame = _frame->scale (_frame->size(), PIX_FMT_RGB24, false);
_position = pvf.front()->time ();
_inter_position = pvf.front()->inter_position ();
_inter_size = pvf.front()->inter_size ();
_position = pvf.front()->time ();
_inter_position = pvf.front()->inter_position ();
_inter_size = pvf.front()->inter_size ();