Menu
▾
▴
[ftm-svn] SF.net SVN: ftm:[3780] trunk/ftm
|
From: <bor...@us...> - 2022-10-04 10:25:49
|
Revision: 3780
http://sourceforge.net/p/ftm/code/3780
Author: borghesi
Date: 2022-10-04 10:25:47 +0000 (Tue, 04 Oct 2022)
Log Message:
-----------
ftm compilation for arm64 platform
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
trunk/ftm/externals/max5/ftm.editor.cpp
trunk/ftm/externals/max5/ftm.object.c
trunk/ftm/ftmlib/classes/ftmdatagui.c
trunk/ftm/ftmlib/max5/maxext.c
trunk/ftm/ftmlib/object.c
trunk/ftm/util/install-mxo.sh
Modified: trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2021-04-09 07:41:59 UTC (rev 3779)
+++ trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2022-10-04 10:25:47 UTC (rev 3780)
@@ -107,6 +107,7 @@
2195DE0B09A24AA6007DEFAF /* ftm.sdif.write.c in Sources */ = {isa = PBXBuildFile; fileRef = 2195DDA709A24A4A007DEFAF /* ftm.sdif.write.c */; };
21DD1AFC1D9B137900476592 /* SplineEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21DD1AFB1D9B137900476592 /* SplineEditor.cpp */; };
3B01D3090A790E2A00950F15 /* ftm.sqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B01D3080A790E2A00950F15 /* ftm.sqlite.c */; };
+ 3B082B4028EB7AAF00FA2C50 /* SummaryEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B082B3F28EB7AAF00FA2C50 /* SummaryEditor.cpp */; };
3B198EB20F8A0E3500F53450 /* ftm.object.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B1B846F06D4C5F3009827F3 /* ftm.object.c */; };
3B198EBE0F8A101F00F53450 /* commonsyms.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA1E34D0F6E6A4D007B27D1 /* commonsyms.c */; };
3B198EBF0F8A101F00F53450 /* jpatcher_syms.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA1E34E0F6E6A4D007B27D1 /* jpatcher_syms.c */; };
@@ -128,7 +129,6 @@
3B1CF46D161AE679007A5AE6 /* IndexChooserMarkersContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B1CF46B161AE679007A5AE6 /* IndexChooserMarkersContainer.cpp */; };
3B3E8CB10AB81B2800EE3FAB /* ftm.guilistener.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B3E8CB00AB81B2800EE3FAB /* ftm.guilistener.c */; };
3B46D2A310B566F800C927D9 /* ftm.tween.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B46D2A210B566F800C927D9 /* ftm.tween.c */; };
- 3B6614F51E363A0E00E5EFCC /* juce_opengl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614F41E363A0E00E5EFCC /* juce_opengl.mm */; };
3B6614F71E363A1E00E5EFCC /* juce_core.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614F61E363A1E00E5EFCC /* juce_core.mm */; };
3B6614F91E363A2300E5EFCC /* juce_data_structures.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614F81E363A2300E5EFCC /* juce_data_structures.mm */; };
3B6614FB1E363A2800E5EFCC /* juce_events.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3B6614FA1E363A2800E5EFCC /* juce_events.mm */; };
@@ -444,6 +444,7 @@
2195DE0A09A24A63007DEFAF /* ftm.sdif.write.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.sdif.write.mxo; sourceTree = BUILT_PRODUCTS_DIR; };
21DD1AFB1D9B137900476592 /* SplineEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SplineEditor.cpp; sourceTree = "<group>"; };
3B01D3080A790E2A00950F15 /* ftm.sqlite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ftm.sqlite.c; sourceTree = "<group>"; };
+ 3B082B3F28EB7AAF00FA2C50 /* SummaryEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SummaryEditor.cpp; sourceTree = "<group>"; };
3B198EB80F8A0E3500F53450 /* ftm.object.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.object.mxo; sourceTree = BUILT_PRODUCTS_DIR; };
3B1B81D206D4A618009827F3 /* ftm.print.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.print.mxo; sourceTree = BUILT_PRODUCTS_DIR; };
3B1B820B06D4A663009827F3 /* ftm.print.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ftm.print.c; sourceTree = "<group>"; };
@@ -877,6 +878,7 @@
3BE1ACB4136EB1550036CFFC /* editors */ = {
isa = PBXGroup;
children = (
+ 3B082B3F28EB7AAF00FA2C50 /* SummaryEditor.cpp */,
3B1CF464161AE66E007A5AE6 /* ImtrEditorSelectionListener.h */,
3B1CF465161AE66E007A5AE6 /* IndexChooserMarkersEditor.cpp */,
3B1CF466161AE66E007A5AE6 /* MarkersEditor.h */,
@@ -2491,7 +2493,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/bin/sh $PROJECT_DIR/../../../util/install-mxo.sh\n# call with the shell chosen above explicitly, since then the script doesn't need to have the executable permission set";
+ shellScript = "/bin/sh $PROJECT_DIR/../../../util/install-mxo.sh\n# call with the shell chosen above explicitly, since then the script doesn't need to have the executable permission set\n";
};
5CD47CEC0FBD800400A9AC30 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -2712,11 +2714,11 @@
3BE1ACC4136EB1730036CFFC /* MarkersEditor.cpp in Sources */,
3BE1ACC5136EB1730036CFFC /* MatrixEditor.cpp in Sources */,
3BE1ACC6136EB1730036CFFC /* MultibpfEditor.cpp in Sources */,
- 3B6614F51E363A0E00E5EFCC /* juce_opengl.mm in Sources */,
3BE1ACC7136EB1730036CFFC /* MultiwaveEditor.cpp in Sources */,
3BE1ACC8136EB1730036CFFC /* PixelsEditor.cpp in Sources */,
3BE1ACC9136EB1730036CFFC /* ScoreEditor.cpp in Sources */,
3BE1ACCA136EB1730036CFFC /* SonogramEditor.cpp in Sources */,
+ 3B082B4028EB7AAF00FA2C50 /* SummaryEditor.cpp in Sources */,
3BE1ACCB136EB1730036CFFC /* TracesEditor.cpp in Sources */,
3BE1ACCC136EB1730036CFFC /* WaveEditor.cpp in Sources */,
3B6614FB1E363A2800E5EFCC /* juce_events.mm in Sources */,
@@ -2975,7 +2977,6 @@
21195BA318800BF200EAB1FF /* Debug_harder */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
@@ -2995,7 +2996,7 @@
);
FTM_FRAMEWORKS = "$(FTM_FRAMEWORK_DIR)/ftm.mxo/Contents/MacOS/ftm";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.6;
+ FTM_VERSION = 2.7;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -3024,8 +3025,8 @@
INFOPLIST_FILE = ftmexternal.plist;
JS_DIR = ../../../../components/js;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"-framework",
@@ -3039,9 +3040,9 @@
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif-debug.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif-debug.a";
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate";
WRAPPER_EXTENSION = mxo;
};
@@ -3114,7 +3115,7 @@
21195BAD18800BF200EAB1FF /* Debug_harder */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
GCC_INPUT_FILETYPE = automatic;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3127,7 +3128,7 @@
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
- "$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/JuceLibraryCode",
"$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
@@ -3395,7 +3396,7 @@
218B72340E80091000A7CEAD /* Debug_optimised */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
@@ -3409,7 +3410,7 @@
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
- "$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/JuceLibraryCode",
"$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
@@ -3695,7 +3696,6 @@
218B72540E80091000A7CEAD /* Debug_optimised */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
@@ -3715,7 +3715,7 @@
);
FTM_FRAMEWORKS = "$(FTM_FRAMEWORK_DIR)/ftm.mxo/Contents/MacOS/ftm";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.6;
+ FTM_VERSION = 2.7;
GCC_AUTO_VECTORIZATION = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 1;
@@ -3743,8 +3743,8 @@
INFOPLIST_FILE = ftmexternal.plist;
JS_DIR = ../../../../components/js;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"-framework",
@@ -3758,9 +3758,9 @@
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate";
WRAPPER_EXTENSION = mxo;
};
@@ -3809,7 +3809,7 @@
3B1CA7E00C467B12005F0280 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
@@ -3823,7 +3823,7 @@
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
- "$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/JuceLibraryCode",
"$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
@@ -3847,7 +3847,7 @@
3B1CA7E10C467B12005F0280 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
@@ -3861,7 +3861,7 @@
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
- "$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/JuceLibraryCode",
"$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
@@ -4187,7 +4187,6 @@
3B5DEE230861C3ED00B9AEEA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
@@ -4207,7 +4206,7 @@
);
FTM_FRAMEWORKS = "$(FTM_FRAMEWORK_DIR)/ftm.mxo/Contents/MacOS/ftm";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.6;
+ FTM_VERSION = 2.7;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -4233,8 +4232,8 @@
INFOPLIST_FILE = ftmexternal.plist;
JS_DIR = ../../../../components/js;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"-framework",
@@ -4248,9 +4247,9 @@
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif-debug.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif-debug.a";
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate";
WRAPPER_EXTENSION = mxo;
};
@@ -4259,7 +4258,6 @@
3B5DEE240861C3ED00B9AEEA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_WARN_ENUM_CONVERSION = YES;
@@ -4277,7 +4275,7 @@
);
FTM_FRAMEWORKS = "$(FTM_FRAMEWORK_DIR)/ftm.mxo/Contents/MacOS/ftm";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.6;
+ FTM_VERSION = 2.7;
GCC_AUTO_VECTORIZATION = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = 3;
@@ -4311,8 +4309,8 @@
INFOPLIST_FILE = ftmexternal.plist;
JS_DIR = ../../../../components/js;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"-framework",
@@ -4325,10 +4323,10 @@
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SECTORDER_FLAGS = "";
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = mxo;
@@ -4360,7 +4358,6 @@
3BFD349324C1F61800A7EF6B /* ReleaseCodesign */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
CLANG_WARN_ENUM_CONVERSION = YES;
@@ -4380,7 +4377,7 @@
);
FTM_FRAMEWORKS = "$(FTM_FRAMEWORK_DIR)/ftm.mxo/Contents/MacOS/ftm";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.6;
+ FTM_VERSION = 2.7;
GCC_AUTO_VECTORIZATION = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = 3;
@@ -4414,8 +4411,8 @@
INFOPLIST_FILE = ftmexternal.plist;
JS_DIR = ../../../../components/js;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_CODE_SIGN_FLAGS = "--timestamp";
OTHER_LDFLAGS = (
@@ -4429,10 +4426,10 @@
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SECTORDER_FLAGS = "";
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate";
WARNING_CFLAGS = "";
WRAPPER_EXTENSION = mxo;
@@ -4510,7 +4507,7 @@
3BFD349D24C1F61800A7EF6B /* ReleaseCodesign */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
+ CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_CXX_LIBRARY = "libc++";
COMBINE_HIDPI_IMAGES = YES;
GCC_INPUT_FILETYPE = automatic;
@@ -4520,11 +4517,11 @@
"_NDEBUG=1",
"NDEBUG=1",
"IMTREDITOR_DONT_USE_LOCAL_JUCEINCLUDES=1",
- "JUCER_XCODE_MAC_F6D2F4CF=1",
+ "JUCE_MODULE_AVAILABLE_juce_opengl=0",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
- "$(COMPONENTS_DIR)/juce",
+ "$(COMPONENTS_DIR)/juce/JuceLibraryCode",
"$(COMPONENTS_DIR)/juce/modules",
"$(COMPONENTS_DIR)/ImtrEditor/**",
);
@@ -4538,8 +4535,6 @@
QuartzCore,
"-framework",
WebKit,
- "-framework",
- OpenGL,
);
PRODUCT_NAME = ftm.editor;
};
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2021-04-09 07:41:59 UTC (rev 3779)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2022-10-04 10:25:47 UTC (rev 3780)
@@ -711,6 +711,8 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.l";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
tokenizer.c,
@@ -722,6 +724,8 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.y";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
parser.c,
@@ -734,6 +738,8 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.l";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
tokenizer.c,
@@ -745,6 +751,8 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.y";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
parser.h,
@@ -757,6 +765,8 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.y";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
parser.c,
@@ -769,6 +779,8 @@
compilerSpec = com.apple.compilers.proxy.script;
filePatterns = "*.l";
fileType = pattern.proxy;
+ inputFiles = (
+ );
isEditable = 1;
outputFiles = (
tokenizer.c,
@@ -1681,8 +1693,8 @@
3BE2BBFC15F752F9008368F4 /* Resources */,
3BE2BBFD15F752F9008368F4 /* Sources */,
3BE2BBFE15F752F9008368F4 /* Frameworks */,
+ 3BF5E78E15FE23A4008429B7 /* Headers */,
3BE2BC5E15F75B52008368F4 /* ShellScript */,
- 3BF5E78E15FE23A4008429B7 /* Headers */,
);
buildRules = (
);
@@ -1855,7 +1867,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "sf1=/Developer/Tools/SetFile\nsf1=/Applications/Xcode.app/Contents/Developer/usr/bin/SetFile\nproddir=$EXTERNALS_DIR/ftm.mxo\n\nif [ -f $sf1 ]; then\n $sf1 -a B $proddir\nelse\n $sf2 -a B $proddir\nfi\n\nrm -Rf $proddir\ncp -Rf $BUILT_PRODUCTS_DIR/$PRODUCT_NAME.mxo $proddir\nmv $proddir/Contents/MacOS/$PRODUCT_NAME $proddir/Contents/MacOS/ftm";
+ shellScript = "sf1=/Developer/Tools/SetFile\nsf1=/Applications/Xcode.app/Contents/Developer/usr/bin/SetFile\nproddir=$EXTERNALS_DIR/ftm.mxo\n\nif [ -f $sf1 ]; then\n $sf1 -a B $proddir\nelse\n $sf2 -a B $proddir\nfi\n\nrm -Rf $proddir\ncp -Rf $BUILT_PRODUCTS_DIR/$PRODUCT_NAME.mxo $proddir\nmv $proddir/Contents/MacOS/$PRODUCT_NAME $proddir/Contents/MacOS/ftm\n";
};
2195C5E91B908DC50035FEBD /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -1885,7 +1897,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "sf1=/Developer/Tools/SetFile\nsf1=/Applications/Xcode.app/Contents/Developer/usr/bin/SetFile\nproddir=$EXTERNALS_DIR/ftm.mxo\n\nif [ -f $sf1 ]; then\n $sf1 -a B $proddir\nelse\n $sf2 -a B $proddir\nfi\n\nrm -Rf $EXTERNALS_DIR/ftm.mxo\ncp -Rf $BUILT_PRODUCTS_DIR/ftm.mxo $EXTERNALS_DIR";
+ shellScript = "sf1=/Developer/Tools/SetFile\nsf1=/Applications/Xcode.app/Contents/Developer/usr/bin/SetFile\nproddir=$EXTERNALS_DIR/ftm.mxo\n\n#if [ -f $sf1 ]; then\n# $sf1 -a B $proddir\n#else\n#$sf2 -a B $proddir\n#fi\ncodesign --strict=all --timestamp --force --deep --verbose --sign 3BD2P55TR2 $BUILT_PRODUCTS_DIR/ftm.mxo/Contents/MacOS/$PRODUCT_NAME\n\nrm -Rf $EXTERNALS_DIR/ftm.mxo\ncp -Rf $BUILT_PRODUCTS_DIR/ftm.mxo $EXTERNALS_DIR\n";
};
3BE2C945089A3F8F00AC1260 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -2341,7 +2353,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPYING_PRESERVES_HFS_DATA = YES;
COPY_PHASE_STRIP = YES;
@@ -2381,7 +2392,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPYING_PRESERVES_HFS_DATA = YES;
COPY_PHASE_STRIP = YES;
@@ -2422,7 +2432,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_MACROS = "DEBUG_LOCKS=1 DEBUG_REF_COUNT=0 DEBUG_OBJECT_RELEASE=1 USE_STDLIB_MALLOC=1 DEBUG=1";
EXECUTABLE_SUFFIX = "";
@@ -2458,7 +2467,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -2687,7 +2695,6 @@
21ECC365164954EE00F9B177 /* Debug_optimised */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -2734,8 +2741,8 @@
);
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/**";
- MACOSX_DEPLOYMENT_TARGET = 10.9;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"$(SYS_FRAMEWORKS)",
@@ -2744,17 +2751,17 @@
"$(SDIF_LIBS)",
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SKIP_INSTALL = YES;
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"04/2021\\\"";
+ VERSION_DATE = "\\\"10/2022\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 7;
- VERSION_RELEASE = 5;
+ VERSION_RELEASE = 6;
VERSION_TAG = "\\\"BETA\\\"";
};
name = Debug_optimised;
@@ -2844,7 +2851,7 @@
COPY_PHASE_STRIP = YES;
EXTERNALS_DIR = "../../../../../build-max5";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.5;
+ FTM_VERSION = 2.7;
GCC_AUTO_VECTORIZATION = YES;
GCC_FAST_OBJC_DISPATCH = YES;
GCC_OBJC_CALL_CXX_CDTORS = YES;
@@ -2858,7 +2865,6 @@
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
PREBINDING = YES;
PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
@@ -2908,7 +2914,6 @@
3B5DEDA00861BFE900B9AEEA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -2955,8 +2960,8 @@
);
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/**";
- MACOSX_DEPLOYMENT_TARGET = 10.9;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"$(SYS_FRAMEWORKS)",
@@ -2965,17 +2970,17 @@
"$(SDIF_LIBS)",
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SKIP_INSTALL = YES;
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"04/2021\\\"";
+ VERSION_DATE = "\\\"10/2022\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 7;
- VERSION_RELEASE = 5;
+ VERSION_RELEASE = 6;
VERSION_TAG = "\\\"BETA\\\"";
};
name = Debug;
@@ -2983,7 +2988,6 @@
3B5DEDA10861BFE900B9AEEA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -3031,8 +3035,8 @@
);
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/**";
- MACOSX_DEPLOYMENT_TARGET = 10.9;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"$(SYS_FRAMEWORKS)",
@@ -3041,17 +3045,17 @@
"$(SDIF_LIBS)",
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SKIP_INSTALL = YES;
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"04/2021\\\"";
+ VERSION_DATE = "\\\"10/2022\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 7;
- VERSION_RELEASE = 5;
+ VERSION_RELEASE = 6;
VERSION_TAG = "\\\"BETA\\\"";
WARNING_LDFLAGS = "";
};
@@ -3066,7 +3070,7 @@
COPY_PHASE_STRIP = YES;
EXTERNALS_DIR = "../../../../../build-max5";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.5;
+ FTM_VERSION = 2.7;
GCC_AUTO_VECTORIZATION = NO;
GCC_FAST_OBJC_DISPATCH = YES;
GCC_OBJC_CALL_CXX_CDTORS = YES;
@@ -3079,7 +3083,6 @@
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
PREBINDING = YES;
PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
@@ -3094,7 +3097,7 @@
EXECUTABLE_SUFFIX = "";
EXTERNALS_DIR = "../../../../../build-max5";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.5;
+ FTM_VERSION = 2.7;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -3108,7 +3111,6 @@
);
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
PREBINDING = NO;
PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
@@ -3124,13 +3126,12 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EXTERNALS_DIR = "../../../../../build-max5";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.5;
+ FTM_VERSION = 2.7;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
PREBINDING = NO;
PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
@@ -3141,7 +3142,6 @@
3BFD348924C1F0F500A7EF6B /* ReleaseCodesign */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CODE_SIGN_IDENTITY = "Developer ID Application: INST RECHER COORD ACOUST MUSICALE (3BD2P55TR2)";
CODE_SIGN_STYLE = Manual;
COMPONENTS_DIR = ../../../../components;
@@ -3191,8 +3191,8 @@
);
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/**";
- MACOSX_DEPLOYMENT_TARGET = 10.9;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_CODE_SIGN_FLAGS = "--timestamp";
OTHER_LDFLAGS = (
@@ -3202,17 +3202,17 @@
"$(SDIF_LIBS)",
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SKIP_INSTALL = YES;
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"04/2021\\\"";
+ VERSION_DATE = "\\\"10/2022\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 7;
- VERSION_RELEASE = 5;
+ VERSION_RELEASE = 6;
VERSION_TAG = "\\\"BETA\\\"";
WARNING_LDFLAGS = "";
};
@@ -3303,13 +3303,12 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EXTERNALS_DIR = "../../../../../build-max5";
FTM_FRAMEWORK_DIR = "$(EXTERNALS_DIR)";
- FTM_VERSION = 2.5;
+ FTM_VERSION = 2.7;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
PREBINDING = NO;
PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
@@ -3343,7 +3342,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
@@ -3497,7 +3495,6 @@
8937598810760F4A00644327 /* Debug_harder */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -3544,8 +3541,8 @@
);
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/**";
- MACOSX_DEPLOYMENT_TARGET = 10.9;
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8";
+ MACOSX_DEPLOYMENT_TARGET = 10.11;
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max8.2";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"$(SYS_FRAMEWORKS)",
@@ -3554,17 +3551,17 @@
"$(SDIF_LIBS)",
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
- SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
+ SDIF_LIBS = "$(SDIF_DIR)/macos-fat-intel-arm/libsdif.a";
SKIP_INSTALL = YES;
SNDFILE_DIR = "$(COMPONENTS_DIR)/sndfile";
- SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
+ SNDFILE_LIBS = "$(SNDFILE_DIR)/macos/libFLAC.a $(SNDFILE_DIR)/macos/libogg.a $(SNDFILE_DIR)/macos-x64-arm64/libsndfile.a $(SNDFILE_DIR)/macos/libvorbis.a $(SNDFILE_DIR)/macos/libvorbisenc.a";
SYS_FRAMEWORKS = "-framework Accelerate -framework Carbon";
VECLIB_FRAMEWORK_DIR = /System/Library/Frameworks/Accelerate.framework/Frameworks;
- VERSION_DATE = "\\\"04/2021\\\"";
+ VERSION_DATE = "\\\"10/2022\\\"";
VERSION_MACROS = "FTM_VERSION_MAJOR=$(VERSION_MAJOR) FTM_VERSION_MINOR=$(VERSION_MINOR) FTM_VERSION_RELEASE=$(VERSION_RELEASE) FTM_VERSION_TAG=$(VERSION_TAG) FTM_VERSION_DATE=$(VERSION_DATE)";
VERSION_MAJOR = 2;
VERSION_MINOR = 7;
- VERSION_RELEASE = 5;
+ VERSION_RELEASE = 6;
VERSION_TAG = "\\\"BETA\\\"";
};
name = Debug_harder;
Modified: trunk/ftm/externals/max5/ftm.editor.cpp
===================================================================
--- trunk/ftm/externals/max5/ftm.editor.cpp 2021-04-09 07:41:59 UTC (rev 3779)
+++ trunk/ftm/externals/max5/ftm.editor.cpp 2022-10-04 10:25:47 UTC (rev 3780)
@@ -143,6 +143,9 @@
long view_inspector_track;
void *view_dummy_attr[2];
long view_dummy_attr_long;
+ float view_dummy_attr_float;
+ float view_dummy_attr_float_array[2];
+ t_symbol *view_dummy_attr_sym;
long view_dummy_attr_long_array[2];
/////////////////////////
@@ -432,7 +435,7 @@
const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
editorContainer->getEditor(index)->replaceObject((void *)obj, guiInterface);
- editorContainer->getEditor(index)->updateReplacements((void *)obj);
+ //editorContainer->getEditor(index)->updateReplacements((void *)obj);
if(editorContainer->getEditor(index)->getViewName() == editorContainer->getEditor(index)->getDescription())
editorContainer->changeViewName(index, IMTREDITOR_JUCE_NAMESPACE::String( fts_symbol_name(fts_object_get_class_name(obj))) +":"+
@@ -490,27 +493,26 @@
ImtrEditor *imtred = dynamic_cast<ImtrEditor *>(editor);
int index = editorContainer->getIndexOfView(imtred);
IMTREDITOR_JUCE_NAMESPACE::String name = imtred->getViewName();
- IMTREDITOR_JUCE_NAMESPACE::Component *replacement = NULL;
+ //IMTREDITOR_JUCE_NAMESPACE::Component *replacement = NULL;
- replacement = imtred->getReplacement(newInterfaceName);
-
- if(replacement == NULL)
- {
- IMTREDITOR_JUCE_NAMESPACE::StringArray replacedNames;
- int i;
- imtr_guiInterface *guiInterface = (imtr_guiInterface *)fts_object_get_gui_interface((fts_object_t *)obj, getSymbolFromString(newInterfaceName));
+ //replacement = imtred->getReplacement(newInterfaceName);
+ //if(replacement == NULL)
+ //{
+ IMTREDITOR_JUCE_NAMESPACE::StringArray replacedNames;
+ //int i;
+ imtr_guiInterface *guiInterface = (imtr_guiInterface *)fts_object_get_gui_interface((fts_object_t *)obj, getSymbolFromString(newInterfaceName));
- replacement = editorContainer->createEditor((void *)obj, context, (imtr_guiInterface *)(guiInterface));
+ IMTREDITOR_JUCE_NAMESPACE::Component *replacement = editorContainer->createEditor((void *)obj, context, (imtr_guiInterface *)(guiInterface));
// set previous replacement in new one
- replacedNames = imtred->getReplacementNames();
- for(i = 0; i < replacedNames.size(); i++)
- dynamic_cast<ImtrEditor *>(replacement)->setReplacement(imtred->getReplacement(replacedNames[i]), replacedNames[i]);
+ //replacedNames = imtred->getReplacementNames();
+ //for(i = 0; i < replacedNames.size(); i++)
+ //dynamic_cast<ImtrEditor *>(replacement)->setReplacement(imtred->getReplacement(replacedNames[i]), replacedNames[i]);
// set current replacement
- imtred->setReplacement(replacement, newInterfaceName);
- (dynamic_cast<ImtrEditor *>(replacement))->setReplacement(editor, oldInterfaceName);
- }
+ //imtred->setReplacement(replacement, newInterfaceName);
+ //(dynamic_cast<ImtrEditor *>(replacement))->setReplacement(editor, oldInterfaceName);
+ //}
if(index >= 0)
{
@@ -524,7 +526,7 @@
editorContainer->replaceEditor(index, imtred, (dynamic_cast<ImtrEditor *>(replacement)));
- if(name != IMTREDITOR_JUCE_NAMESPACE::String::empty)
+ if(name != IMTREDITOR_JUCE_NAMESPACE::String())
editorContainer->setViewName(index, name);
editorContainer->setViewForegroundColor(index, imtred->getForegroundColor());
@@ -576,6 +578,14 @@
defer_low(external, (method)ftmeditor_change_interface_delayed, 0, 5, at);
}
+ void changeSnapshotEditorInterface(int viewIndex, IMTREDITOR_JUCE_NAMESPACE::String newInterfaceName, IMTREDITOR_JUCE_NAMESPACE::String oldInterfaceName){}
+ virtual bool hasAudioBuffer()
+ {
+ return false;
+ }
+ int getNumIndexes(){return 1;}
+ int getCurrentIndex(){return 0;}
+
void updateContainer(bool resizeAll)
{
const IMTREDITOR_JUCE_NAMESPACE::MessageManagerLock mmLock;
@@ -639,7 +649,7 @@
{
ImtrEditor *editor = (dynamic_cast<ImtrEditor *>(edt));
int editorIndex = editorContainer->getIndexOfView(editor);
- IMTREDITOR_JUCE_NAMESPACE::Array <int> selection = (arg != IMTREDITOR_JUCE_NAMESPACE::String::empty) ? editor->getSelection(arg) : editor->getSelection();
+ IMTREDITOR_JUCE_NAMESPACE::Array <int> selection = (arg != IMTREDITOR_JUCE_NAMESPACE::String()) ? editor->getSelection(arg) : editor->getSelection();
bool selectionAsRange = editor->selectionAsRange();
fts_atom_t a[1024];
int i;
@@ -647,7 +657,7 @@
fts_set_int(a, editorIndex);
fts_set_symbol(a+1, fts_s_selection);
- if(arg != IMTREDITOR_JUCE_NAMESPACE::String::empty)
+ if(arg != IMTREDITOR_JUCE_NAMESPACE::String())
{
fts_set_symbol(a+2, getSymbolFromString(arg));
ac++;
@@ -1446,7 +1456,7 @@
}
else if(pname == fts_s_selection)
{
- IMTREDITOR_JUCE_NAMESPACE::String arg = IMTREDITOR_JUCE_NAMESPACE::String::empty;
+ IMTREDITOR_JUCE_NAMESPACE::String arg = IMTREDITOR_JUCE_NAMESPACE::String();
if(nargs == 1 && fts_is_symbol(args))
arg = IMTREDITOR_JUCE_NAMESPACE::String(fts_get_symbol(args)->s_name);
@@ -1453,13 +1463,13 @@
ImtrEditor *editor = editorContainer->getEditor(idx);
bool selectionAsRange = editor->selectionAsRange();
- IMTREDITOR_JUCE_NAMESPACE::Array <int> selection = (arg == IMTREDITOR_JUCE_NAMESPACE::String::empty) ? editor->getSelection() : editor->getSelection(arg);
+ IMTREDITOR_JUCE_NAMESPACE::Array <int> selection = (arg == IMTREDITOR_JUCE_NAMESPACE::String()) ? editor->getSelection() : editor->getSelection(arg);
int i, size;
size = 2;
fts_set_int(at, idx);
fts_set_symbol(at+1, fts_s_selection);
- if(arg != IMTREDITOR_JUCE_NAMESPACE::String::empty)
+ if(arg != IMTREDITOR_JUCE_NAMESPACE::String())
{
fts_set_symbol(at+2, getSymbolFromString(arg));
size++;
@@ -7283,7 +7293,7 @@
self->outputselection = 0;
self->ftmeditor_offscreen = NULL;
- self->ftmeditorSnapshot = IMTREDITOR_JUCE_NAMESPACE::Image::null;
+ self->ftmeditorSnapshot = IMTREDITOR_JUCE_NAMESPACE::Image();
critical_new(&(self->critical_off));
/* attributes for inspector */
@@ -7408,7 +7418,7 @@
jgraphics_surface_destroy(self->ftmeditor_offscreen);
self->ftmeditor_offscreen = NULL;
}
- self->ftmeditorSnapshot = IMTREDITOR_JUCE_NAMESPACE::Image::null;
+ self->ftmeditorSnapshot = IMTREDITOR_JUCE_NAMESPACE::Image();
linklist_chuck(self->attachedviews);
@@ -7566,13 +7576,13 @@
CLASS_ATTR_PAINT(_mc,"view_visible", 0);
CLASS_ATTR_ORDER(_mc, "view_visible", 0, "202");
- CLASS_ATTR_SYM(_mc, "view_interface", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_SYM(_mc, "view_interface", 0, ftmeditor_t, view_dummy_attr_sym);
CLASS_ATTR_LABEL(_mc, "view_interface", 0,"Choose View Interface");
CLASS_ATTR_ENUM(_mc, "view_interface", 0, "");
CLASS_ATTR_ACCESSORS(_mc, "view_interface", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_ORDER(_mc, "view_interface", 0, "203");
- CLASS_ATTR_FLOAT_ARRAY(_mc, "view_bounds", 0, ftmeditor_t, view_dummy_attr, 2);
+ CLASS_ATTR_FLOAT_ARRAY(_mc, "view_bounds", 0, ftmeditor_t, view_dummy_attr_float_array, 2);
CLASS_ATTR_LABEL(_mc, "view_bounds", 0,"View Bounds Min/Max");
CLASS_ATTR_PAINT(_mc, "view_bounds", 0);
CLASS_ATTR_ACCESSORS(_mc, "view_bounds", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
@@ -7584,7 +7594,7 @@
CLASS_ATTR_PAINT(_mc,"view_autobounds", 0);
CLASS_ATTR_ORDER(_mc, "view_autobounds", 0, "205");
- CLASS_ATTR_SYM(_mc, "view_shape", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_SYM(_mc, "view_shape", 0, ftmeditor_t, view_dummy_attr_sym);
CLASS_ATTR_LABEL(_mc,"view_shape", 0,"View Shape");
CLASS_ATTR_PAINT(_mc,"view_shape", 0);
CLASS_ATTR_ENUM(_mc, "view_shape", 0, "lines peaks points zeropeaks");
@@ -7597,7 +7607,7 @@
CLASS_ATTR_PAINT(_mc,"view_thickness", 0);
CLASS_ATTR_ORDER(_mc, "view_thickness", 0, "207");
- CLASS_ATTR_SYM(_mc,"view_name", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_SYM(_mc,"view_name", 0, ftmeditor_t, view_dummy_attr_sym);
CLASS_ATTR_LABEL(_mc,"view_name", 0, "View Name");
CLASS_ATTR_PAINT(_mc,"view_name", 0);
CLASS_ATTR_ACCESSORS(_mc, "view_name", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
@@ -7621,7 +7631,7 @@
CLASS_ATTR_ACCESSORS(_mc, "view_stavecolor", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_ORDER(_mc, "view_stavecolor", 0, "211");
- CLASS_ATTR_SYM(_mc, "view_colormode", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_SYM(_mc, "view_colormode", 0, ftmeditor_t, view_dummy_attr_sym);
CLASS_ATTR_LABEL(_mc,"view_colormode", 0,"View Color Mode");
CLASS_ATTR_PAINT(_mc,"view_colormode", 0);
CLASS_ATTR_ACCESSORS(_mc, "view_colormode", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
@@ -7639,13 +7649,13 @@
CLASS_ATTR_PAINT(_mc,"view_fgcolorgradient", 0);
CLASS_ATTR_ORDER(_mc, "view_fgcolorgradient", 0, "214");
- CLASS_ATTR_FLOAT_ARRAY(_mc, "view_depth", 0, ftmeditor_t, view_dummy_attr, 2);
+ CLASS_ATTR_FLOAT_ARRAY(_mc, "view_depth", 0, ftmeditor_t, view_dummy_attr_float_array, 2);
CLASS_ATTR_LABEL(_mc, "view_depth", 0,"Color-View Depth Min/Max");
CLASS_ATTR_PAINT(_mc, "view_depth", 0);
CLASS_ATTR_ACCESSORS(_mc, "view_depth", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_ORDER(_mc, "view_depth", 0, "215");
- CLASS_ATTR_FLOAT(_mc, "view_step", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_FLOAT(_mc, "view_step", 0, ftmeditor_t, view_dummy_attr_float);
CLASS_ATTR_LABEL(_mc, "view_step", 0,"View Step");
CLASS_ATTR_PAINT(_mc, "view_step", 0);
CLASS_ATTR_ACCESSORS(_mc, "view_step", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
@@ -7675,7 +7685,7 @@
CLASS_ATTR_PAINT(_mc,"view_showname", 0);
CLASS_ATTR_ORDER(_mc, "view_showname", 0, "220");
- CLASS_ATTR_SYM(_mc, "view_layout", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_SYM(_mc, "view_layout", 0, ftmeditor_t, view_dummy_attr_sym);
CLASS_ATTR_LABEL(_mc,"view_layout", 0,"View Layout");
CLASS_ATTR_PAINT(_mc,"view_layout", 0);
CLASS_ATTR_ENUM(_mc, "view_layout", 0, "juxtaposed superposed");
@@ -7682,7 +7692,7 @@
CLASS_ATTR_ACCESSORS(_mc, "view_layout", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_ORDER(_mc, "view_layout", 0, "221");
- CLASS_ATTR_SYM(_mc, "view_mixedlayout", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_SYM(_mc, "view_mixedlayout", 0, ftmeditor_t, view_dummy_attr_sym);
CLASS_ATTR_LABEL(_mc,"view_mixedlayout", 0,"Layout Group With Mixed Layout");
CLASS_ATTR_PAINT(_mc,"view_mixedlayout", 0);
CLASS_ATTR_ENUM(_mc, "view_mixedlayout", 0, "juxtaposed superposed");
@@ -7689,7 +7699,7 @@
CLASS_ATTR_ACCESSORS(_mc, "view_mixedlayout", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_ORDER(_mc, "view_mixedlayout", 0, "222");
- CLASS_ATTR_FLOAT(_mc, "view_opacity", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_FLOAT(_mc, "view_opacity", 0, ftmeditor_t, view_dummy_attr_float);
CLASS_ATTR_LABEL(_mc, "view_opacity", 0,"View Opacity");
CLASS_ATTR_ACCESSORS(_mc, "view_opacity", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_PAINT(_mc, "view_opacity", 0);
@@ -8053,22 +8063,22 @@
CLASS_ATTR_INVISIBLE(_mc, "domain_max", 0);
/* deprecated (replaced by "view_bounds") */
- CLASS_ATTR_FLOAT(_mc, "view_max", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_FLOAT(_mc, "view_max", 0, ftmeditor_t, view_dummy_attr_float);
CLASS_ATTR_ACCESSORS(_mc, "view_max", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_INVISIBLE(_mc, "view_max", 0);
/* deprecated (replaced by "view_bounds") */
- CLASS_ATTR_FLOAT(_mc, "view_min", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_FLOAT(_mc, "view_min", 0, ftmeditor_t, view_dummy_attr_float);
CLASS_ATTR_ACCESSORS(_mc, "view_min", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_INVISIBLE(_mc, "view_min", 0);
/* deprecated (replaced by "view_depth") */
- CLASS_ATTR_FLOAT(_mc, "view_depth_max", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_FLOAT(_mc, "view_depth_max", 0, ftmeditor_t, view_dummy_attr_float);
CLASS_ATTR_ACCESSORS(_mc, "view_depth_max", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_INVISIBLE(_mc, "view_depth_max", 0);
/* deprecated (replaced by "view_depth") */
- CLASS_ATTR_FLOAT(_mc, "view_depth_min", 0, ftmeditor_t, view_dummy_attr);
+ CLASS_ATTR_FLOAT(_mc, "view_depth_min", 0, ftmeditor_t, view_dummy_attr_float);
CLASS_ATTR_ACCESSORS(_mc, "view_depth_min", ftmeditor_get_attribute_view, ftmeditor_set_attribute_view);
CLASS_ATTR_INVISIBLE(_mc, "view_depth_min", 0);
Modified: trunk/ftm/externals/max5/ftm.object.c
===================================================================
--- trunk/ftm/externals/max5/ftm.object.c 2021-04-09 07:41:59 UTC (rev 3779)
+++ trunk/ftm/externals/max5/ftm.object.c 2022-10-04 10:25:47 UTC (rev 3780)
@@ -2434,12 +2434,12 @@
CLASS_ATTR_ACCESSORS(_mc, "persistence", ftmobj_get_attribute_persistence, ftmobj_set_attribute_persistence);
CLASS_ATTR_SAVE(_mc,"persistence", 0);
- CLASS_ATTR_SYM(_mc, "description", ATTR_SET_OPAQUE_USER | ATTR_GET_OPAQUE_USER, ftmobj_t, head);
+ CLASS_ATTR_SYM(_mc, "description", ATTR_SET_OPAQUE_USER | ATTR_GET_OPAQUE_USER, ftmobj_t, description_init);
CLASS_ATTR_ACCESSORS(_mc, "description", ftmobj_get_attribute_description, ftmobj_set_attribute_description);
CLASS_ATTR_LABEL(_mc, "description", 0, "Description");
CLASS_ATTR_SAVE(_mc,"description", 0);
- CLASS_ATTR_SYM(_mc, "name", 0, ftmobj_t, head);
+ CLASS_ATTR_SYM(_mc, "name", 0, ftmobj_t, name_init);
CLASS_ATTR_ACCESSORS(_mc, "name", ftmobj_get_attribute_name, ftmobj_set_attribute_name);
CLASS_ATTR_LABEL(_mc, "name", 0, "Name");
CLASS_ATTR_SAVE(_mc,"name", 0);
Modified: trunk/ftm/ftmlib/classes/ftmdatagui.c
===================================================================
--- trunk/ftm/ftmlib/classes/ftmdatagui.c 2021-04-09 07:41:59 UTC (rev 3779)
+++ trunk/ftm/ftmlib/classes/ftmdatagui.c 2022-10-04 10:25:47 UTC (rev 3780)
@@ -364,6 +364,12 @@
bpf_unlock_data(void *obj, void *context){}
static void
+bpf_retain_data(void *obj, void *context){}
+
+static void
+bpf_release_data(void *obj, void *context){}
+
+static void
dict_lock_data(void *obj, void *context, int exclusive){}
static void
@@ -370,6 +376,12 @@
dict_unlock_data(void *obj, void *context){}
static void
+dict_retain_data(void *obj, void *context){}
+
+static void
+dict_release_data(void *obj, void *context){}
+
+static void
mat_lock_data(void *obj, void *context, int exclusive){}
static void
@@ -376,6 +388,12 @@
mat_unlock_data(void *obj, void *context){}
static void
+mat_retain_data(void *obj, void *context){}
+
+static void
+mat_release_data(void *obj, void *context){}
+
+static void
fmat_lock_data(void *obj, void *context, int exclusive){}
static void
@@ -382,6 +400,12 @@
fmat_unlock_data(void *obj, void *context){}
static void
+fmat_retain_data(void *obj, void *context){}
+
+static void
+fmat_release_data(void *obj, void *context){}
+
+static void
fvec_lock_data(void *obj, void *context, int exclusive){}
static void
@@ -388,6 +412,12 @@
fvec_unlock_data(void *obj, void *context){}
static void
+fvec_retain_data(void *obj, void *context){}
+
+static void
+fvec_release_data(void *obj, void *context){}
+
+static void
sequence_lock_data(void *obj, void *context, int exclusive){}
static void
@@ -394,11 +424,23 @@
sequence_unlock_data(void *obj, void *context){}
static void
+sequence_retain_data(void *obj, void *context){}
+
+static void
+sequence_release_data(void *obj, void *context){}
+
+static void
track_lock_data(void *obj, void *context, int exclusive){}
static void
track_unlock_data(void *obj, void *context){}
+static void
+track_retain_data(void *obj, void *context){}
+
+static void
+track_release_data(void *obj, void *context){}
+
static char *
fts_empty_default_config(void *obj, void *context)
{
@@ -519,6 +561,8 @@
((imtr_guiInterface *)&bpf_gui_interface_bpf)->getAllInterfaces = object_get_all_interfaces;
((imtr_guiInterface *)&bpf_gui_interface_bpf)->lockData = bpf_lock_data;
((imtr_guiInterface *)&bpf_gui_interface_bpf)->unlockData = bpf_unlock_data;
+ ((imtr_guiInterface *)&bpf_gui_interface_bpf)->retainData = bpf_retain_data;
+ ((imtr_guiInterface *)&bpf_gui_interface_bpf)->releaseData = bpf_release_data;
((imtr_guiInterface *)&bpf_gui_interface_bpf)->getDefaultConfig = fts_empty_default_config;
((imtr_guiInterface *)&bpf_gui_interface_bpf)->getNumBuffers = fts_get_num_buffers_default;
((imtr_guiInterface *)&bpf_gui_interface_bpf)->getBufferObject = fts_get_buffer_object_default;
@@ -677,6 +721,8 @@
((imtr_guiInterface *)&bpf_gui_interface_matrix)->getAllInterfaces = object_get_all_interfaces;
((imtr_guiInterface *)&bpf_gui_interface_matrix)->lockData = bpf_lock_data;
((imtr_guiInterface *)&bpf_gui_interface_matrix)->unlockData = bpf_unlock_data;
+ ((imtr_guiInterface *)&bpf_gui_interface_matrix)->retainData = bpf_retain_data;
+ ((imtr_guiInterface *)&bpf_gui_interface_matrix)->releaseData = bpf_release_data;
((imtr_guiInterface *)&bpf_gui_interface_matrix)->getDefaultConfig = fts_empty_default_config;
((imtr_guiInterface *)&bpf_gui_interface_matrix)->getNumBuffers = fts_get_num_buffers_default;
((imtr_guiInterface *)&bpf_gui_interface_matrix)->getBufferObject = fts_get_buffer_object_default;
@@ -943,6 +989,8 @@
((imtr_guiInterface *)&dict_gui_interface_matrix)->getAllInterfaces = object_get_all_interfaces;
((imtr_guiInterface *)&dict_gui_interface_matrix)->lockData = dict_lock_data;
((imtr_guiInterface *)&dict_gui_interface_matrix)->unlockData = dict_unlock_data;
+ ((imtr_guiInterface *)&dict_gui_interface_matrix)->retainData = dict_retain_data;
+ ((imtr_guiInterface *)&dict_gui_interface_matrix)->releaseData = dict_release_data;
((imtr_guiInterface *)&dict_gui_interface_matrix)->getDefaultConfig = fts_empty_default_config;
((imtr_guiInterface *)&dict_gui_interface_matrix)->getNumBuffers = fts_get_num_buffers_default;
((imtr_guiInterface *)&dict_gui_interface_matrix)->getBufferObject = fts_get_buffer_object_default;
@@ -996,8 +1044,8 @@
}
static void
-mat_gui_markers_get_column_indexes(void *obj, void *context, const char *durationColName, const char *offsetColName, const char *cueColName, const char *cue2ColName, const char *labelColName,
- int *durationColIndex, int *offsetColIndex, int *cueColIndex, int *cue2ColIndex, int *labelColIndex)
+mat_gui_markers_get_column_indexes(void *obj, void *context, const char *durationColName, const char *offsetColName, const char *cueColName, const char *cue2ColName, const char *labelColName, const char *colorColName,
+ int *durationColIndex, int *offsetColIndex, int *cueColIndex, int *cue2ColIndex, int *labelColIndex, int *colorColIndex)
{
mat_t *self = (mat_t *)obj;
fts_schema_t *colschema = mat_get_schema(self, 2);
@@ -1009,6 +1057,7 @@
*labelColIndex = fts_schema_get_index(colschema, fts_new_symbol(labelColName));
*durationColIndex = fts_schema_get_index(colschema, fts_new_symbol(durationColName));
*offsetColIndex = fts_schema_get_index(colschema, fts_new_symbol(offsetColName));
+ *colorColIndex = fts_schema_get_index(colschema, fts_new_symbol(colorColName));
}
else
{
@@ -1017,6 +1066,7 @@
*cueColIndex = (self->n > 3) ? 3 : -1;
*cue2ColIndex = (self->n > 4) ? 4 : -1;
*labelColIndex = (self->n > 5) ? 5 : -1;
+ *colorColIndex = -1;
}
}
@@ -1060,8 +1110,7 @@
}
static void *
-mat_gui_markers_get_by_index(void *obj, void *context, int index, double *time, double *duration, double *offset, double *cue, double *cue2, char **label,
- int durationColIndex, int offsetColIndex, int cueColIndex, int cue2ColIndex, int labelColIndex)
+mat_gui_markers_get_by_index(void *obj, void *context, int index, double *time, double *duration, double *offset, double *cue, double *cue2, char **label, double *color, int durationColIndex, int offsetColIndex, int cueColIndex, int cue2ColIndex, int labelColIndex, int colorColIndex)
{
mat_t *self = (mat_t *)obj;
int m = mat_get_m(self);
@@ -1073,6 +1122,7 @@
*label = 0;
*duration = 0.0;
*offset = 0.0;
+ *color = -1.0;
if((m > 0 && n > 2) && (index >= 0 && index < m))
{
fts_atom_t *val;
@@ -1113,6 +1163,12 @@
val = mat_get_element( self, index, offsetColIndex);
if(fts_is_number(val)) *offset = (double)fts_get_number_float(val);
}
+ /* color */
+ if(colorColIndex > 0)
+ {
+ val = mat_get_element( self, index, colorColIndex);
+ if(fts_is_number(val)) *color = (double)fts_get_number_float(val);
+ }
mat_unlock(self);
}
@@ -1143,8 +1199,8 @@
}
static void *
-mat_gui_markers_add(void *obj, void *context, double time, double duration, double offset, double cue, double cue2, const char *label,
- int *ret_index, int durationColIndex, int offsetColIndex, int cueColIndex, int cue2ColIndex, int labelColIndex)
+mat_gui_markers_add(void *obj, void *context, double time, double duration, double offset, double cue, double cue2, const char *label, double color,
+ int *ret_index, int durationColIndex, int offsetColIndex, int cueColIndex, int cue2ColIndex, int labelColIndex, int colorColIndex)
{
mat_t *self = (mat_t *)obj;
int m = mat_get_m(self);
@@ -1197,6 +1253,11 @@
mat_set_element(self, i, offsetColIndex, &k);
}
+ if(colorColIndex > 0)
+ {
+ fts_set_float(&k, color);
+ mat_set_element(self, i, colorColIndex, &k);
+ }
mat_unlock(self);
fts_set_symbol(&k, fts_s_add);
@@ -1207,7 +1268,7 @@
}
static int
-mat_gui_markers_move(void *obj, void *context, void *evt, int index, double time, int durationColIndex, int offsetColIndex, int cueColIndex, int cue2ColIndex, int labelColIndex)
+mat_gui_markers_move(void *obj, void *context, void *evt, int index, double time, int durationColIndex, int offsetColIndex, int cueColIndex, int cue2ColIndex, int labelColIndex, int colorColIndex)
{
mat_t *self = (mat_t *)obj;
int m = mat_get_m(self);
@@ -1401,6 +1462,8 @@
((imtr_guiInterface *)&mat_gui_interface_markers)->getAllInterfaces = object_get_all_interfaces;
((imtr_guiInterface *)&mat_gui_interface_markers)->lockData = mat_lock_data;
((imtr_guiInterface *)&mat_gui_interface_markers)->unlockData = mat_unlock_data;
+ ((imtr_guiInterface *)&mat_gui_interface_markers)->retainData = mat_retain_data;
+ ((imtr_guiInterface *)&mat_gui_interface_markers)->releaseData = mat_release_data;
((imtr_guiInterface *)&mat_gui_interface_markers)->getDefaultConfig = fts_empty_default_config;
((imtr_guiInterface *)&mat_gui_interface_markers)->getNumBuffers = fts_get_num_buffers_default;
((imtr_guiInterface *)&mat_gui_interface_markers)->getBufferObject = fts_get_buffer_object_default;
@@ -1822,6 +1885,8 @@
((imtr_guiInterface *)&mat_gui_interface_score)->getAllInterfaces = object_get_all_interfaces;
((imtr_guiInterface *)&mat_gui_interface_score)->lockData = mat_lock_data;
((imtr_guiInterface *)&mat_gui_interface_score)->unlockData = mat_unlock_data;
+ ((imtr_guiInterface *)&mat_gui_interface_score)->retainData = mat_retain_data;
+ ((imtr_guiInterface *)&mat_gui_interface_score)->releaseData = mat_release_data;
((imtr_guiInterface *)&mat_gui_interface_score)->getDefaultConfig = fts_empty_default_config;
((imtr_guiInterface *)&mat_gui_interface_score)->getNumBuffers = fts_get_num_buffers_default;
((imtr_guiInterface *)&mat_gui_interface_score)->getBufferObject = fts_get_buffer_object_default;
@@ -2083,6 +2148,8 @@
((imtr_guiInterface *)&mat_gui_interface_matrix)->getAllInterfaces = object_get_all_interfaces;
((imtr_guiInterface *)&mat_gui_interface_matrix)->lockData = mat_lock_data;
...
[truncated message content] |
