diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-02-12 21:39:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-02-12 21:39:01 +0000 |
| commit | cfcb0f5d66cc68d8d395480a95d4fe95c63e214e (patch) | |
| tree | 9a4c394b38fc4f5934ce8a9808f7ce165422f459 /src/wx | |
| parent | 5dfecc0dd8a3dae75a9bfff95d3448ba4c3f4998 (diff) | |
| parent | 6f856af55898f94b45e3be28aa4f7c962de8a398 (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_menu.cc | 6 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 19c54abcc..e5cadd794 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -142,11 +142,11 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList ); 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 { diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index cb9e0aa2e..fee5605da 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -143,7 +143,7 @@ FilmViewer::set_film (shared_ptr<Film> film) 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; @@ -311,9 +311,9 @@ FilmViewer::timer () } 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())); @@ -321,10 +321,15 @@ FilmViewer::maybe_draw_background_image (wxPaintDC& dc) 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 () |