iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Type casts to make wxArgNormalizer happy. 

Originally committed to SVN as r5580.
This commit is contained in:
Kevin Ollivier 2011-09-01 05:37:23 +00:00
parent 8d6fa32ee2
commit 2c6bee6d19
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aegisub/src/audio_player_openal.cpp
View File

@ -235,7 +235,7 @@ void OpenALPlayer::FillBuffers(ALsizei count)
ALsizei fill_len = buffer_length;
if (fill_len > (ALsizei)(end_frame - cur_frame)) fill_len = (ALsizei)(end_frame - cur_frame);
if (fill_len < 0) fill_len = 0;
wxLogDebug(_T("buffer_length=%d, fill_len=%d, end_frame-cur_frame=%d"), buffer_length, fill_len, end_frame-cur_frame);
wxLogDebug(_T("buffer_length=%d, fill_len=%d, end_frame-cur_frame=%d"), (int)buffer_length, (int)fill_len, (int)(end_frame-cur_frame));
if (fill_len > 0)
// Get fill_len frames of audio
@ -285,7 +285,7 @@ void OpenALPlayer::Notify()
FillBuffers(newplayed);
}
wxLogDebug(_T("frames played=%d, num frames=%d"), (buffers_played - num_buffers) * buffer_length, end_frame - start_frame);
wxLogDebug(_T("frames played=%d, num frames=%d"), (int)((buffers_played - num_buffers) * buffer_length), (int)(end_frame - start_frame));
// Check that all of the selected audio plus one full set of buffers has been queued
if ((buffers_played - num_buffers) * buffer_length > (ALsizei)(end_frame - start_frame)) {
// Then stop

2
aegisub/src/ffmpegsource_common.cpp
View File

@ -198,7 +198,7 @@ wxString FFmpegSourceProvider::GetCacheFilename(const wxString& filename)
}
// Generate string to be hashed
wxString toHash = filename + wxString::Format(_T(":%i"),len);
wxString toHash = filename + wxString::Format(_T(":%i"),(int)len);
// Get the MD5 digest of the string
const wchar_t *tmp = toHash.wc_str();

2
aegisub/src/font_file_lister_fontconfig.cpp
View File

@ -68,7 +68,7 @@ wxArrayString FontConfigFontFileLister::DoGetFilesWithFace(wxString facename) {
if (!final) return results;
if (FcPatternGetString(final, FC_FILE, 0, &filename) == FcResultMatch && FcPatternGetInteger(final, FC_INDEX, 0, &fontindex) == FcResultMatch) {
FcPatternGetString(final, FC_FAMILY, fontindex, &gotfamily);
if (strcmp(gotfamily,buffer) == 0) {
if (strcmp((char *)gotfamily,buffer) == 0) {
results.Add(wxString((char*) filename,wxConvLocal));
}
}

2
aegisub/src/frame_main_events.cpp
View File

@ -262,7 +262,7 @@ void FrameMain::RebuildRecentList(wxString listName,wxMenu *menu,int startID) {
wxString n;
wxArrayString entries = Options.GetRecentList(listName);
for (size_t i=0;i<entries.Count();i++) {
n = wxString::Format(_T("%i"),i+1);
n = wxString::Format(_T("%i"),(int)i+1);
if (i < 9) n = _T("&") + n;
wxFileName shortname(entries[i]);
wxString filename = shortname.GetFullName();