From 26ccf0b8e5374973b3a5edfe2bd958a1a2040da1 Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Sat, 17 Nov 2018 19:27:25 -0500 Subject: [PATCH] Divorce stored TPP lead-in/out values from config There's no real reason to link these as far as I can tell, and plenty of valid reasons not to --- src/dialog_timing_processor.cpp | 8 ++++---- src/libresrc/default_config.json | 4 ++++ src/libresrc/osx/default_config.json | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/dialog_timing_processor.cpp b/src/dialog_timing_processor.cpp index 00719c51c..e0b7dc00b 100644 --- a/src/dialog_timing_processor.cpp +++ b/src/dialog_timing_processor.cpp @@ -144,8 +144,8 @@ DialogTimingProcessor::DialogTimingProcessor(agi::Context *c) d.SetIcon(GETICON(timing_processor_toolbutton_16)); // Read options - leadIn = OPT_GET("Audio/Lead/IN")->GetInt(); - leadOut = OPT_GET("Audio/Lead/OUT")->GetInt(); + leadIn = OPT_GET("Tool/Timing Post Processor/Lead/IN")->GetInt(); + leadOut = OPT_GET("Tool/Timing Post Processor/Lead/OUT")->GetInt(); beforeStart = OPT_GET("Tool/Timing Post Processor/Threshold/Key Start Before")->GetInt(); beforeEnd = OPT_GET("Tool/Timing Post Processor/Threshold/Key End Before")->GetInt(); afterStart = OPT_GET("Tool/Timing Post Processor/Threshold/Key Start After")->GetInt(); @@ -305,8 +305,8 @@ void DialogTimingProcessor::UpdateControls() { void DialogTimingProcessor::OnApply(wxCommandEvent &) { d.TransferDataFromWindow(); // Save settings - OPT_SET("Audio/Lead/IN")->SetInt(leadIn); - OPT_SET("Audio/Lead/OUT")->SetInt(leadOut); + OPT_SET("Tool/Timing Post Processor/Lead/IN")->SetInt(leadIn); + OPT_SET("Tool/Timing Post Processor/Lead/OUT")->SetInt(leadOut); OPT_SET("Tool/Timing Post Processor/Threshold/Key Start Before")->SetInt(beforeStart); OPT_SET("Tool/Timing Post Processor/Threshold/Key Start After")->SetInt(afterStart); OPT_SET("Tool/Timing Post Processor/Threshold/Key End Before")->SetInt(beforeEnd); diff --git a/src/libresrc/default_config.json b/src/libresrc/default_config.json index 61921d0b0..318f8d3ee 100644 --- a/src/libresrc/default_config.json +++ b/src/libresrc/default_config.json @@ -552,6 +552,10 @@ } }, "Only Selection" : false, + "Lead" : { + "IN" : 100, + "OUT" : 350 + }, "Threshold" : { "Adjacent Gap" : 300, "Adjacent Overlap" : 50, diff --git a/src/libresrc/osx/default_config.json b/src/libresrc/osx/default_config.json index 62d04874e..59f2ed05f 100644 --- a/src/libresrc/osx/default_config.json +++ b/src/libresrc/osx/default_config.json @@ -552,6 +552,10 @@ } }, "Only Selection" : false, + "Lead" : { + "IN" : 100, + "OUT" : 350 + }, "Threshold" : { "Adjacent Gap" : 300, "Adjacent Overlap" : 50,