projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accessor for ClosedCaptionsDialog.
[dcpomatic.git]
/
src
/
wx
/
kdm_output_panel.cc
diff --git
a/src/wx/kdm_output_panel.cc
b/src/wx/kdm_output_panel.cc
index 8763291234a8d9787c17f9b379c1c62ea7bc4f8f..d76a2735902d97923466f8ce1bac34b7ad391b1e 100644
(file)
--- a/
src/wx/kdm_output_panel.cc
+++ b/
src/wx/kdm_output_panel.cc
@@
-49,8
+49,9
@@
using boost::function;
KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
: wxPanel (parent, wxID_ANY)
KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
: wxPanel (parent, wxID_ANY)
- , _forensic_mark_video (false)
- , _forensic_mark_audio (false)
+ , _forensic_mark_video (true)
+ , _forensic_mark_audio (true)
+ , _forensic_mark_audio_up_to (12)
{
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
{
wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, 0);
@@
-160,10
+161,11
@@
KDMOutputPanel::setup_sensitivity ()
void
KDMOutputPanel::advanced_clicked ()
{
void
KDMOutputPanel::advanced_clicked ()
{
- KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio);
+ KDMAdvancedDialog* d = new KDMAdvancedDialog (this, _forensic_mark_video, _forensic_mark_audio
, _forensic_mark_audio_up_to
);
d->ShowModal ();
_forensic_mark_video = d->forensic_mark_video ();
_forensic_mark_audio = d->forensic_mark_audio ();
d->ShowModal ();
_forensic_mark_video = d->forensic_mark_video ();
_forensic_mark_audio = d->forensic_mark_audio ();
+ _forensic_mark_audio_up_to = d->forensic_mark_audio_up_to ();
d->Destroy ();
}
d->Destroy ();
}
@@
-181,7
+183,7
@@
KDMOutputPanel::kdm_write_type_changed ()
pair<shared_ptr<Job>, int>
KDMOutputPanel::make (
pair<shared_ptr<Job>, int>
KDMOutputPanel::make (
- list<
ScreenKDM
> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
+ list<
shared_ptr<ScreenKDM>
> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
)
{
list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
)
{
list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);