From c4369a092f57425eb4ee39a80581778d549439e9 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 9 Nov 2011 03:47:26 +0000 Subject: [PATCH] Fix wxGTK assertion failure when opening the TPP dialog Originally committed to SVN as r5842. --- aegisub/src/Makefile | 17 +++++++++-------- aegisub/src/dialog_timing_processor.cpp | 15 ++++++++------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/aegisub/src/Makefile b/aegisub/src/Makefile index 2c3547567..e1e1b92f9 100644 --- a/aegisub/src/Makefile +++ b/aegisub/src/Makefile @@ -99,14 +99,15 @@ endif ##################### # SOURCE-LEVEL CFLAGS ##################### -audio_player.o: CXXFLAGS += $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) -audio_provider.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) -auto4_base.o: CXXFLAGS += $(CFLAGS_FREETYPE) -charset_detect.o: CXXFLAGS += -D_X86_ -font_file_lister_fontconfig.o: CXXFLAGS += $(CFLAGS_FONTCONFIG) $(CFLAGS_FREETYPE) -font_file_lister.o: CXXFLAGS += $(CFLAGS_FREETYPE) -text_file_reader.o: CXXFLAGS += -D_X86_ -video_provider_manager.o: CXXFLAGS += $(CFLAGS_FFMS) +audio_player.o: CXXFLAGS += $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) +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_ +video_provider_manager.o: CXXFLAGS += $(CFLAGS_FFMS) # Ensure any optional source files above are added for compilation. diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp index a0b19fc06..cd155d764 100644 --- a/aegisub/src/dialog_timing_processor.cpp +++ b/aegisub/src/dialog_timing_processor.cpp @@ -38,6 +38,7 @@ #ifndef AGI_PRE #include +#include #include #include @@ -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"));