Subversion Repositories svn.mios32

Compare Revisions

Ignore whitespace Rev 2180 → Rev 2251

/trunk/tools/mios_studio/Builds/MacOSX/Info.plist
15,9 → 15,9
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>2.4.3</string>
<string>2.4.7</string>
<key>CFBundleVersion</key>
<string>2.4.3</string>
<string>2.4.7</string>
<key>NSHumanReadableCopyright</key>
<string>MIDIbox</string>
<key>NSHighResolutionCapable</key>
/trunk/tools/mios_studio/Builds/MacOSX/MIOS_Studio.xcodeproj/project.pbxproj
2650,6 → 2650,7
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
2662,7 → 2663,7
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = MIOS_Studio_Debug;
SDKROOT = macosx10.9;
SDKROOT = macosx10.8;
WARNING_CFLAGS = "-Wreorder";
ZERO_LINK = NO;
};
2673,6 → 2674,7
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_LINK_OBJC_RUNTIME = NO;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
2691,7 → 2693,7
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx10.9;
SDKROOT = macosx10.8;
SDKROOT_ppc = macosx10.5;
};
name = Debug;
2701,6 → 2703,7
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
2713,7 → 2716,7
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = MIOS_Studio;
SDKROOT = macosx10.9;
SDKROOT = macosx10.8;
WARNING_CFLAGS = "-Wreorder";
ZERO_LINK = NO;
};
2724,6 → 2727,7
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_LINK_OBJC_RUNTIME = NO;
COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = s;
2741,7 → 2745,7
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET_ppc = 10.4;
SDKROOT = macosx10.9;
SDKROOT = macosx10.8;
SDKROOT_ppc = macosx10.5;
};
name = Release;
/trunk/tools/mios_studio/src/OscHelper.cpp
242,7 → 242,7
#if JUCE_MAJOR_VERSION == 1 && JUCE_MINOR_VERSION < 51
endPtr = putString(buffer, (const char *)str);
#else
endPtr = putString(buffer, str.toUTF8().getAddress());
endPtr = putString(buffer, (const char *)str.toUTF8());
#endif
Array<uint8> tmp = Array<uint8>(buffer, endPtr-buffer);
delete buffer;
280,7 → 280,7
unsigned char *OscHelper::putBlob(unsigned char *buffer, unsigned char *data, unsigned len)
{
// ensure that length considers word alignment
unsigned aligned_len = (len+3) & 0xfffffffc;
unsigned aligned_len = (len+3) & ~3;
 
// add length
buffer = putWord(buffer, aligned_len);
557,7 → 557,7
 
// tags are starting at word aligned offset
// add +1 to pathLen, since \0 terminator is counted as well
size_t tagsPos = (pathLen+1 + 3) & 0xfffffc;
size_t tagsPos = (pathLen+1 + 3) & ~3;
 
// check that tags are at valid position
if( tagsPos >= len )
584,7 → 584,7
 
// arguments are starting at word aligned offset
// add +1 to tagsLen, since \0 terminator is counted as well
size_t argPos = (tagsPos + tagsLen+1 + 3) & 0xfffffc;
size_t argPos = (tagsPos + tagsLen+1 + 3) & ~3;
 
// parse arguments
oscArgs->numArgs = 0;
620,7 → 620,7
return -2; // invalid element format
// next argument at word aligned offset
// add +1 to strLen, since \0 terminator is counted as well
argPos = (argPos + strLen+1 + 3) & 0xfffffc;
argPos = (argPos + strLen+1 + 3) & ~3;
} break;
 
case 'b': { // OSC-blob
627,7 → 627,7
knownArg = 1;
unsigned blobLen = getBlobLength((unsigned char *)(buffer + argPos));
// next argument at word aligned offset
argPos = (argPos + 4 + blobLen + 3) & 0xfffffc;
argPos = (argPos + 4 + blobLen + 3) & ~3;
} break;
 
case 'h': // long64
924,7 → 924,7
#if JUCE_MAJOR_VERSION == 1 && JUCE_MINOR_VERSION < 51
if( sscanf((const char*)word, "@%u.%u", &seconds, &fraction) != 2 ) {
#else
if( sscanf((const char*)word.toUTF8().getAddress(), "@%u.%u", &seconds, &fraction) != 2 ) {
if( sscanf((const char*)word.toUTF8(), "@%u.%u", &seconds, &fraction) != 2 ) {
#endif
statusMessage = String("syntax: <seconds>.<fraction>");
return Array<uint8>();
984,7 → 984,7
#if JUCE_MAJOR_VERSION == 1 && JUCE_MINOR_VERSION < 51
if( sscanf((const char*)word.substring(1), "%d:%x", &len, &value) != 2 ) {
#else
if( sscanf((const char*)word.substring(1).toUTF8().getAddress(), "%d:%x", &len, &value) != 2 ) {
if( sscanf((const char*)word.substring(1).toUTF8(), "%d:%x", &len, &value) != 2 ) {
#endif
statusMessage = String("please enter blob length and hex value (syntax: <len>:<data>)");
return Array<uint8>();
1019,7 → 1019,7
#if JUCE_MAJOR_VERSION == 1 && JUCE_MINOR_VERSION < 51
if( sscanf((const char*)word.substring(1), "%u.%u", &seconds, &fraction) != 2 ) {
#else
if( sscanf((const char*)word.substring(1).toUTF8().getAddress(), "%u.%u", &seconds, &fraction) != 2 ) {
if( sscanf((const char*)word.substring(1).toUTF8(), "%u.%u", &seconds, &fraction) != 2 ) {
#endif
statusMessage = String("syntax: <seconds>.<fraction>");
return Array<uint8>();
1065,7 → 1065,7
#if JUCE_MAJOR_VERSION == 1 && JUCE_MINOR_VERSION < 51
if( sscanf((const char*)word.substring(1), "%x", &value) != 1 ) {
#else
if( sscanf((const char*)word.substring(1).toUTF8().getAddress(), "%x", &value) != 1 ) {
if( sscanf((const char*)word.substring(1).toUTF8(), "%x", &value) != 1 ) {
#endif
statusMessage = String("ERROR: expecting hex value for '") + arg + String("' argument!");
return Array<uint8>();