} else {
emit (boost::bind (boost::ref(Change), c, shared_from_this(), p, _change_signals_frequent));
}
- } catch (boost::bad_weak_ptr) {
+ } catch (boost::bad_weak_ptr &) {
/* This must be during construction; never mind */
}
}
list<DCPTimePeriod> reel_list;
try {
reel_list = reels (film);
- } catch (dcp::DCPReadError) {
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP; it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
shared_ptr<DCPDecoder> decoder;
try {
decoder.reset (new DCPDecoder (film, shared_from_this(), false));
- } catch (dcp::DCPReadError) {
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (DCPError) {
+ } catch (DCPError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
shared_ptr<DCPDecoder> decoder;
try {
decoder.reset (new DCPDecoder (film, shared_from_this(), false));
- } catch (dcp::DCPReadError) {
-
+ } catch (dcp::DCPReadError &) {
/* We couldn't read the DCP, so it's probably missing */
return false;
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
return false;
}
try {
boost::algorithm::replace_all (s, ",", ".");
return lexical_cast<float> (s);
- } catch (bad_lexical_cast) {
+ } catch (bad_lexical_cast &) {
boost::algorithm::replace_all (s, ".", ",");
return lexical_cast<float> (s);
}
);
item->Check (dcp->cpl() && dcp->cpl() == i->id());
}
- } catch (dcp::DCPReadError) {
+ } catch (dcp::DCPReadError &) {
/* The DCP is probably missing */
- } catch (dcp::KDMDecryptionError) {
+ } catch (dcp::KDMDecryptionError &) {
/* We have an incorrect KDM */
- } catch (KDMError) {
+ } catch (KDMError &) {
/* We have an incorrect KDM */
}
} else {
if (_dcp_decode_reduction) {
_player->set_dcp_decode_reduction (_dcp_decode_reduction);
}
- } catch (bad_alloc) {
+ } catch (bad_alloc &) {
error_dialog (_panel, _("There is not enough free memory to do that."));
_film.reset ();
return;
}
bool
+#ifdef DCPOMATIC_VARIANT_SWAROOP
FilmViewer::maybe_draw_background_image (wxPaintDC& dc)
{
-#ifdef DCPOMATIC_VARIANT_SWAROOP
optional<boost::filesystem::path> bg = Config::instance()->player_background_image();
if (bg) {
wxImage image (std_to_wx(bg->string()));
dc.DrawBitmap (bitmap, max(0, (_panel_size.width - image.GetSize().GetWidth()) / 2), max(0, (_panel_size.height - image.GetSize().GetHeight()) / 2));
return true;
}
-#endif
return false;
}
+#else
+FilmViewer::maybe_draw_background_image (wxPaintDC &)
+{
+ return false;
+}
+#endif
void
FilmViewer::paint_panel ()
# Remove auto_ptr warnings from libxml++-2.6
'-Wno-deprecated-declarations',
'-Wno-ignored-qualifiers',
+ '-Wno-parantheses',
'-D_FILE_OFFSET_BITS=64'])
if conf.options.force_cpp11: