forked from mia/Aegisub
Fix wxGTK assertion failure when opening the TPP dialog
Originally committed to SVN as r5842.
This commit is contained in:
parent
a0b74f4424
commit
c4369a092f
2 changed files with 17 additions and 15 deletions
|
@ -103,6 +103,7 @@ audio_player.o: CXXFLAGS += $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBP
|
|||
audio_provider.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE)
|
||||
auto4_base.o: CXXFLAGS += $(CFLAGS_FREETYPE)
|
||||
charset_detect.o: CXXFLAGS += -D_X86_
|
||||
dialog_timing_processor.o: CXXFLAGS += -D__STDC_FORMAT_MACROS
|
||||
font_file_lister_fontconfig.o: CXXFLAGS += $(CFLAGS_FONTCONFIG) $(CFLAGS_FREETYPE)
|
||||
font_file_lister.o: CXXFLAGS += $(CFLAGS_FREETYPE)
|
||||
text_file_reader.o: CXXFLAGS += -D_X86_
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
|
||||
#ifndef AGI_PRE
|
||||
#include <algorithm>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include <wx/msgdlg.h>
|
||||
#include <wx/stattext.h>
|
||||
|
@ -74,13 +75,13 @@ DialogTimingProcessor::DialogTimingProcessor(agi::Context *c)
|
|||
SetIcon(BitmapToIcon(GETIMAGE(timing_processor_toolbutton_24)));
|
||||
|
||||
// Set variables
|
||||
wxString leadInTime(wxString::Format("%d", OPT_GET("Audio/Lead/IN")->GetInt()));
|
||||
wxString leadOutTime(wxString::Format("%d", OPT_GET("Audio/Lead/OUT")->GetInt()));
|
||||
wxString thresStartBefore(wxString::Format("%d", OPT_GET("Tool/Timing Post Processor/Threshold/Key Start Before")->GetInt()));
|
||||
wxString thresStartAfter(wxString::Format("%d", OPT_GET("Tool/Timing Post Processor/Threshold/Key Start After")->GetInt()));
|
||||
wxString thresEndBefore(wxString::Format("%d", OPT_GET("Tool/Timing Post Processor/Threshold/Key End Before")->GetInt()));
|
||||
wxString thresEndAfter(wxString::Format("%d", OPT_GET("Tool/Timing Post Processor/Threshold/Key End After")->GetInt()));
|
||||
wxString adjsThresTime(wxString::Format("%d", OPT_GET("Tool/Timing Post Processor/Threshold/Adjacent")->GetInt()));
|
||||
wxString leadInTime(wxString::Format("%" PRId64, OPT_GET("Audio/Lead/IN")->GetInt()));
|
||||
wxString leadOutTime(wxString::Format("%" PRId64, OPT_GET("Audio/Lead/OUT")->GetInt()));
|
||||
wxString thresStartBefore(wxString::Format("%" PRId64, OPT_GET("Tool/Timing Post Processor/Threshold/Key Start Before")->GetInt()));
|
||||
wxString thresStartAfter(wxString::Format("%" PRId64, OPT_GET("Tool/Timing Post Processor/Threshold/Key Start After")->GetInt()));
|
||||
wxString thresEndBefore(wxString::Format("%" PRId64, OPT_GET("Tool/Timing Post Processor/Threshold/Key End Before")->GetInt()));
|
||||
wxString thresEndAfter(wxString::Format("%" PRId64, OPT_GET("Tool/Timing Post Processor/Threshold/Key End After")->GetInt()));
|
||||
wxString adjsThresTime(wxString::Format("%" PRId64, OPT_GET("Tool/Timing Post Processor/Threshold/Adjacent")->GetInt()));
|
||||
|
||||
// Styles box
|
||||
wxSizer *LeftSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Apply to styles"));
|
||||
|
|
Loading…
Reference in a new issue