mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-24 01:54:22 +00:00
Code Activity

Cleaned up some namespace issues, and tweaked the plugin host demo to avoid namespace clashes with juce plugins

Browse source
This commit is contained in:
Julian Storer 2009-12-01 13:16:55 +00:00
parent 32d36148a0
commit 3e77725594
8 changed files with 52 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/browser plugins/wrapper/juce_NPAPI_GlueCode.cpp
View file

@ -85,7 +85,7 @@ static void log (const String& s)
//==============================================================================
#if JUCE_MAC
static const String nsStringToJuce (NSString* s) { return String::fromUTF8 ((juce::uint8*) [s UTF8String]); }
static const String nsStringToJuce (NSString* s) { return String::fromUTF8 ((JUCE_NAMESPACE::uint8*) [s UTF8String]); }
static NSString* juceStringToNS (const String& s) { return [NSString stringWithUTF8String: (const char*) s.toUTF8()]; }
#pragma export on
@ -845,10 +845,10 @@ static const var createValueFromNPVariant (NPP npp, const NPVariant& v)
return var (NPVARIANT_TO_DOUBLE (v));
else if (NPVARIANT_IS_STRING (v))
#if JUCE_MAC
return var (String::fromUTF8 ((const juce::uint8*) (NPVARIANT_TO_STRING (v).UTF8Characters),
return var (String::fromUTF8 ((const JUCE_NAMESPACE::uint8*) (NPVARIANT_TO_STRING (v).UTF8Characters),
(int) NPVARIANT_TO_STRING (v).UTF8Length));
#else
return var (String::fromUTF8 ((const juce::uint8*) (NPVARIANT_TO_STRING (v).utf8characters),
return var (String::fromUTF8 ((const JUCE_NAMESPACE::uint8*) (NPVARIANT_TO_STRING (v).utf8characters),
(int) NPVARIANT_TO_STRING (v).utf8length));
#endif
else if (NPVARIANT_IS_OBJECT (v))