Apply fader-based gain calculations to the current gain, not 0dB.

[dcpomatic.git] / src / wx / content_menu.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 19c54abcc33529375563d6c452df17fdc5670f41..c5dc1606d790bb577a0a5ba5382b218febc45867 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -126,7 +126,7 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
                        _kdm->Enable (dcp->encrypted ());
                        _ov->Enable (dcp->needs_assets ());
                        try {
-                               DCPExaminer ex (dcp);
+                               DCPExaminer ex (dcp, true);
                                list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
                                _choose_cpl->Enable (cpls.size() > 1);
                                /* We can't have 0 as a menu item ID on OS X */
@@ -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 {
@@ -433,7 +433,7 @@ ContentMenu::cpl_selected (wxCommandEvent& ev)
        shared_ptr<DCPContent> dcp = dynamic_pointer_cast<DCPContent> (_content.front ());
        DCPOMATIC_ASSERT (dcp);
 
-       DCPExaminer ex (dcp);
+       DCPExaminer ex (dcp, true);
        list<shared_ptr<dcp::CPL> > cpls = ex.cpls ();
        DCPOMATIC_ASSERT (ev.GetId() > 0);
        DCPOMATIC_ASSERT (ev.GetId() <= int (cpls.size()));