mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-27 02:20:05 +00:00
Code Activity

More string tidying-up. Possible fix for win32 mutexes failing under strange circumstances.

Browse source
This commit is contained in:
Julian Storer 2011-02-23 17:02:58 +00:00
parent ef36a42ee6
commit 04351861ae
18 changed files with 357 additions and 533 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/juce_Time.cpp
View file

@ -116,24 +116,24 @@ namespace TimeHelpers
: (value - ((value / modulo) + 1) * modulo));
}
int doFTime (juce_wchar* const dest, const int maxChars, const String& format, const struct tm* const tm) throw()
int doFTime (CharPointer_UTF32 dest, const int maxChars, const String& format, const struct tm* const tm) throw()
{
#if JUCE_ANDROID
HeapBlock <char> tempDest;
tempDest.calloc (maxChars + 2);
const int result = (int) strftime (tempDest, maxChars, format.toUTF8(), tm);
if (result > 0)
CharPointer_UTF32 (dest).writeAll (CharPointer_UTF8 (tempDest.getData()));
dest.writeAll (CharPointer_UTF8 (tempDest.getData()));
return result;
#elif JUCE_WINDOWS
HeapBlock <wchar_t> tempDest;
tempDest.calloc (maxChars + 2);
const int result = (int) wcsftime (tempDest, maxChars, format.toUTF16(), tm);
if (result > 0)
CharPointer_UTF32 (dest).writeAll (CharPointer_UTF16 (tempDest.getData()));
dest.writeAll (CharPointer_UTF16 (tempDest.getData()));
return result;
#else
return (int) wcsftime (dest, maxChars, format.toUTF32(), tm);
return (int) wcsftime (dest.getAddress(), maxChars, format.toUTF32(), tm);
#endif
}
@ -368,13 +368,13 @@ const String Time::formatted (const String& format) const
struct tm t (TimeHelpers::millisToLocal (millisSinceEpoch));
while (TimeHelpers::doFTime (buffer.getData(), bufferSize, format, &t) <= 0)
while (TimeHelpers::doFTime (CharPointer_UTF32 (buffer.getData()), bufferSize, format, &t) <= 0)
{
bufferSize += 128;
buffer.malloc (bufferSize);
}
return String (buffer);
return CharPointer_UTF32 (buffer.getData());
}
//==============================================================================