mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix wxGTK assertion failure when opening the TPP dialog

Browse source 
Originally committed to SVN as r5842.
This commit is contained in:
Thomas Goyne 2011-11-09 03:47:26 +00:00
parent a0b74f4424
commit c4369a092f
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
aegisub/src/Makefile
View file

@ -99,14 +99,15 @@ endif
##################### #####################
# SOURCE-LEVEL CFLAGS # SOURCE-LEVEL CFLAGS
##################### #####################
audio_player.o: CXXFLAGS += $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL) audio_player.o: CXXFLAGS += $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
audio_provider.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) audio_provider.o: CXXFLAGS += $(CFLAGS_FFMPEGSOURCE)
auto4_base.o: CXXFLAGS += $(CFLAGS_FREETYPE) auto4_base.o: CXXFLAGS += $(CFLAGS_FREETYPE)
charset_detect.o: CXXFLAGS += -D_X86_ charset_detect.o: CXXFLAGS += -D_X86_
font_file_lister_fontconfig.o: CXXFLAGS += $(CFLAGS_FONTCONFIG) $(CFLAGS_FREETYPE) dialog_timing_processor.o: CXXFLAGS += -D__STDC_FORMAT_MACROS
font_file_lister.o: CXXFLAGS += $(CFLAGS_FREETYPE) font_file_lister_fontconfig.o: CXXFLAGS += $(CFLAGS_FONTCONFIG) $(CFLAGS_FREETYPE)
text_file_reader.o: CXXFLAGS += -D_X86_ font_file_lister.o: CXXFLAGS += $(CFLAGS_FREETYPE)
video_provider_manager.o: CXXFLAGS += $(CFLAGS_FFMS) text_file_reader.o: CXXFLAGS += -D_X86_
video_provider_manager.o: CXXFLAGS += $(CFLAGS_FFMS)
# Ensure any optional source files above are added for compilation. # Ensure any optional source files above are added for compilation.

15
aegisub/src/dialog_timing_processor.cpp
View file

@ -38,6 +38,7 @@
#ifndef AGI_PRE #ifndef AGI_PRE
#include <algorithm> #include <algorithm>
#include <inttypes.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/stattext.h> #include <wx/stattext.h>
@ -74,13 +75,13 @@ DialogTimingProcessor::DialogTimingProcessor(agi::Context *c)
SetIcon(BitmapToIcon(GETIMAGE(timing_processor_toolbutton_24))); SetIcon(BitmapToIcon(GETIMAGE(timing_processor_toolbutton_24)));
// Set variables // Set variables
wxString leadInTime(wxString::Format("%d", OPT_GET("Audio/Lead/IN")->GetInt())); wxString leadInTime(wxString::Format("%" PRId64, OPT_GET("Audio/Lead/IN")->GetInt()));
wxString leadOutTime(wxString::Format("%d", OPT_GET("Audio/Lead/OUT")->GetInt())); wxString leadOutTime(wxString::Format("%" PRId64, OPT_GET("Audio/Lead/OUT")->GetInt()));
wxString thresStartBefore(wxString::Format("%d", OPT_GET("Tool/Timing Post Processor/Threshold/Key Start Before")->GetInt())); wxString thresStartBefore(wxString::Format("%" PRId64, 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 thresStartAfter(wxString::Format("%" PRId64, 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 thresEndBefore(wxString::Format("%" PRId64, 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 thresEndAfter(wxString::Format("%" PRId64, 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 adjsThresTime(wxString::Format("%" PRId64, OPT_GET("Tool/Timing Post Processor/Threshold/Adjacent")->GetInt()));
// Styles box // Styles box
wxSizer *LeftSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Apply to styles")); wxSizer *LeftSizer = new wxStaticBoxSizer(wxVERTICAL,this,_("Apply to styles"));