Menu
▾
▴
ftm-svn — FTM SVN logs
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(5) |
Jul
(42) |
Aug
(91) |
Sep
(97) |
Oct
(69) |
Nov
(16) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(74) |
Feb
(109) |
Mar
(117) |
Apr
(86) |
May
(84) |
Jun
(47) |
Jul
(30) |
Aug
(25) |
Sep
(39) |
Oct
(59) |
Nov
(42) |
Dec
(38) |
| 2010 |
Jan
(30) |
Feb
(43) |
Mar
(59) |
Apr
(67) |
May
(29) |
Jun
(47) |
Jul
(48) |
Aug
(22) |
Sep
(22) |
Oct
(36) |
Nov
(40) |
Dec
(3) |
| 2011 |
Jan
(39) |
Feb
(21) |
Mar
(36) |
Apr
(35) |
May
(8) |
Jun
|
Jul
(14) |
Aug
(4) |
Sep
(10) |
Oct
(27) |
Nov
(1) |
Dec
|
| 2012 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
(9) |
May
(1) |
Jun
(1) |
Jul
(7) |
Aug
|
Sep
(15) |
Oct
(1) |
Nov
(3) |
Dec
(6) |
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
|
Jun
(2) |
Jul
|
Aug
(5) |
Sep
(15) |
Oct
|
Nov
|
Dec
(1) |
| 2014 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
(5) |
Mar
|
Apr
(4) |
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
(19) |
Oct
|
Nov
|
Dec
(1) |
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
(2) |
| 2017 |
Jan
(16) |
Feb
(8) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(7) |
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(5) |
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2021 |
Jan
|
Feb
|
Mar
(7) |
Apr
(14) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(8) |
Nov
(3) |
Dec
|
| 2023 |
Jan
(1) |
Feb
|
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bor...@us...> - 2017-01-03 16:49:35
|
Revision: 3703
http://sourceforge.net/p/ftm/code/3703
Author: borghesi
Date: 2017-01-03 16:49:32 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
- update of ftmdatagui
- removed annoying warnings (adding explicit cast)
Modified Paths:
--------------
trunk/ftm/build/max/osx-macho/ftmlib.xcodeproj/project.pbxproj
trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
trunk/ftm/externals/ftm.copy.c
trunk/ftm/externals/ftm.guilistener.c
trunk/ftm/externals/ftm.inter.c
trunk/ftm/externals/ftm.iter.c
trunk/ftm/externals/ftm.list.c
trunk/ftm/externals/ftm.midiparse.c
trunk/ftm/externals/ftm.play.c
trunk/ftm/externals/ftm.print.c
trunk/ftm/externals/ftm.schedule.c
trunk/ftm/externals/ftm.sdif.info.c
trunk/ftm/externals/ftm.sdif.write.c
trunk/ftm/externals/ftm.sqlite.c
trunk/ftm/externals/ftm.sqlite3.c
trunk/ftm/externals/ftm.tween.c
trunk/ftm/externals/ftm.value.c
trunk/ftm/externals/max5/ftm.absargs.c
trunk/ftm/externals/max5/ftm.buffer.c
trunk/ftm/externals/max5/ftm.editor.cpp
trunk/ftm/externals/max5/ftm.jitter.c
trunk/ftm/externals/max5/ftm.mess.c
trunk/ftm/externals/max5/ftm.object.c
trunk/ftm/externals/max5/ftm.vecdisplay.c
trunk/ftm/ftmlib/classes/ftmdatagui.c
Modified: trunk/ftm/build/max/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max/osx-macho/ftmlib.xcodeproj/project.pbxproj 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/build/max/osx-macho/ftmlib.xcodeproj/project.pbxproj 2017-01-03 16:49:32 UTC (rev 3703)
@@ -1062,9 +1062,15 @@
/* Begin PBXProject section */
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ };
buildConfigurationList = 3B5DED9F0861BFE900B9AEEA /* Build configuration list for PBXProject "ftmlib" */;
compatibilityVersion = "Xcode 2.4";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 0867D691FE84028FC02AAC07 /* ftmlibProject */;
productRefGroup = 0867D691FE84028FC02AAC07 /* ftmlibProject */;
projectDirPath = "";
@@ -1421,7 +1427,7 @@
218B72640E80096100A7CEAD /* Debug_optimised */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
EXTERNALS_DIR = "../../../../../build-max";
@@ -1440,7 +1446,6 @@
"$(VERSION_MACROS)",
);
GCC_UNROLL_LOOPS = YES;
- GCC_VERSION = 4.0;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
@@ -1467,7 +1472,6 @@
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/built-libs/macosx/ub";
MAX_FRAMEWORK_DIR = "$(COMPONENTS_DIR)/built-libs/macosx/ub/max4";
OTHER_CFLAGS = "-falign-loops=16";
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
SKIP_INSTALL = YES;
STATIC_LIBRARY_DIR = ../../../lib/max;
VERSION_DATE = "\\\"09/2009\\\"";
@@ -1539,7 +1543,7 @@
3B5DEDA00861BFE900B9AEEA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
EXTERNALS_DIR = "../../../../../build-max";
@@ -1556,7 +1560,6 @@
"DEBUG=1",
"$(VERSION_MACROS)",
);
- GCC_VERSION = 4.0;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
@@ -1582,7 +1585,6 @@
);
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/built-libs/macosx/ub";
MAX_FRAMEWORK_DIR = "$(COMPONENTS_DIR)/built-libs/macosx/ub/max4";
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
SKIP_INSTALL = YES;
STATIC_LIBRARY_DIR = ../../../lib/max;
VERSION_DATE = "\\\"09/2009\\\"";
@@ -1597,10 +1599,7 @@
3B5DEDA10861BFE900B9AEEA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = YES;
EXTERNALS_DIR = "../../../../../build-max";
@@ -1616,7 +1615,6 @@
GCC_PREFIX_HEADER = "$(MAX_FRAMEWORK_DIR)/MaxAPI.framework/Versions/A/Headers/macho-prefix.h";
GCC_PREPROCESSOR_DEFINITIONS = "$(VERSION_MACROS)";
GCC_UNROLL_LOOPS = YES;
- GCC_VERSION = 4.0;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO;
@@ -1642,7 +1640,6 @@
LIBRARY_SEARCH_PATHS = "$(COMPONENTS_DIR)/built-libs/macosx/ub";
MAX_FRAMEWORK_DIR = "$(COMPONENTS_DIR)/built-libs/macosx/ub/max4";
OTHER_CFLAGS = "-falign-loops=16";
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
SKIP_INSTALL = YES;
STATIC_LIBRARY_DIR = ../../../lib/max;
VERSION_DATE = "\\\"09/2009\\\"";
Modified: trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2017-01-03 16:49:32 UTC (rev 3703)
@@ -105,7 +105,7 @@
211ADFE90A79030D007B20AA /* ftm.sqlite.h in Headers */ = {isa = PBXBuildFile; fileRef = 211ADFE60A79030D007B20AA /* ftm.sqlite.h */; };
211ADFEA0A79030D007B20AA /* ftm.sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 211ADFE70A79030D007B20AA /* ftm.sqlite3.c */; };
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 */; settings = {ASSET_TAGS = (); }; };
+ 21DD1AFC1D9B137900476592 /* SplineEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 21DD1AFB1D9B137900476592 /* SplineEditor.cpp */; };
3B01D3090A790E2A00950F15 /* ftm.sqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B01D3080A790E2A00950F15 /* ftm.sqlite.c */; };
3B198EB20F8A0E3500F53450 /* ftm.object.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B1B846F06D4C5F3009827F3 /* ftm.object.c */; };
3B198EBE0F8A101F00F53450 /* commonsyms.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA1E34D0F6E6A4D007B27D1 /* commonsyms.c */; };
@@ -2924,7 +2924,7 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"-framework",
@@ -2939,7 +2939,6 @@
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx10.6;
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";
SYS_FRAMEWORKS = "-framework Accelerate";
@@ -3616,7 +3615,7 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"-framework",
@@ -3631,7 +3630,6 @@
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx10.6;
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";
SYS_FRAMEWORKS = "-framework Accelerate";
@@ -4087,9 +4085,8 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
- ONLY_ACTIVE_ARCH = NO;
OTHER_LDFLAGS = (
"-framework",
Carbon,
@@ -4103,7 +4100,6 @@
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx10.6;
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";
SYS_FRAMEWORKS = "-framework Accelerate";
@@ -4158,7 +4154,7 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
+ MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max7";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
"-framework",
@@ -4172,7 +4168,6 @@
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx10.6;
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";
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2017-01-03 16:49:32 UTC (rev 3703)
@@ -2367,7 +2367,6 @@
);
PREBINDING = YES;
PRODUCT_NAME = ftm;
- SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
};
name = Debug;
@@ -2409,7 +2408,6 @@
);
PREBINDING = YES;
PRODUCT_NAME = ftm;
- SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
};
name = Debug_optimised;
@@ -2446,7 +2444,6 @@
);
PREBINDING = NO;
PRODUCT_NAME = ftm;
- SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
};
name = Debug_harder;
@@ -2485,7 +2482,6 @@
);
PREBINDING = NO;
PRODUCT_NAME = ftm;
- SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
ZERO_LINK = NO;
};
@@ -2685,7 +2681,7 @@
21ECC365164954EE00F9B177 /* Debug_optimised */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -2743,7 +2739,6 @@
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx;
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";
@@ -2908,7 +2903,7 @@
3B5DEDA00861BFE900B9AEEA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -2966,7 +2961,6 @@
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx;
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";
@@ -2984,7 +2978,7 @@
3B5DEDA10861BFE900B9AEEA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -3042,7 +3036,6 @@
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx;
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";
@@ -3245,7 +3238,7 @@
8937598810760F4A00644327 /* Debug_harder */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMPONENTS_DIR = ../../../../components;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -3306,7 +3299,6 @@
);
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
SDIF_LIBS = "$(SDIF_DIR)/macos-fat/libsdif.a";
- SDKROOT = macosx;
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";
Modified: trunk/ftm/externals/ftm.copy.c
===================================================================
--- trunk/ftm/externals/ftm.copy.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.copy.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -77,7 +77,7 @@
FTMEXT_METHOD_VARARGS(copy, init_args)
{
copy_t *self = (copy_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(self->copy != NULL)
@@ -270,11 +270,11 @@
FTMEXT_INLET(copy)
{
copy_t *self = (copy_t *)FTMEXT_GET_EXT();
- int inlet = FTMEXT_GET_INLET();
+ int inlet = (int)FTMEXT_GET_INLET();
if (inlet == 0)
{
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0 && fts_is_object(at))
Modified: trunk/ftm/externals/ftm.guilistener.c
===================================================================
--- trunk/ftm/externals/ftm.guilistener.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.guilistener.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -64,7 +64,7 @@
FTMEXT_METHOD_VARARGS(guilistener, init_args)
{
ftmguilistener_t *self = (ftmguilistener_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_hashtable_clear(&self->tags);
Modified: trunk/ftm/externals/ftm.inter.c
===================================================================
--- trunk/ftm/externals/ftm.inter.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.inter.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -149,7 +149,7 @@
FTMEXT_INLET(inter)
{
inter_t *self = (inter_t *)FTMEXT_GET_EXT();
- int inlet = FTMEXT_GET_INLET();
+ int inlet = (int)FTMEXT_GET_INLET();
switch(inlet)
{
Modified: trunk/ftm/externals/ftm.iter.c
===================================================================
--- trunk/ftm/externals/ftm.iter.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.iter.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -635,9 +635,9 @@
FTMEXT_INLET(iter)
{
iter_t *self = (iter_t *)FTMEXT_GET_EXT();
- int inlet = FTMEXT_GET_INLET();
+ int inlet = (int)FTMEXT_GET_INLET();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *av=FTMEXT_GET_ARGS();
Modified: trunk/ftm/externals/ftm.list.c
===================================================================
--- trunk/ftm/externals/ftm.list.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.list.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -148,6 +148,9 @@
break;
}
+
+ default:
+ break;
}
}
@@ -155,7 +158,7 @@
{
ftmlist_t *self = (ftmlist_t *)FTMEXT_GET_EXT();
fts_symbol_t s = FTMEXT_GET_SELECTOR();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_object(at))
@@ -169,7 +172,7 @@
FTMEXT_INLET(list)
{
ftmlist_t *self = (ftmlist_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_object(at))
Modified: trunk/ftm/externals/ftm.midiparse.c
===================================================================
--- trunk/ftm/externals/ftm.midiparse.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.midiparse.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -58,7 +58,7 @@
{
ftm_midiparse_t *self = (ftm_midiparse_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at=FTMEXT_GET_ARGS();
int i;
Modified: trunk/ftm/externals/ftm.play.c
===================================================================
--- trunk/ftm/externals/ftm.play.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.play.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -418,7 +418,7 @@
{
play_t *self = (play_t *)FTMEXT_GET_EXT();
double f = FTMEXT_GET_FLOAT();
- int inlet = FTMEXT_GET_INLET();
+ int inlet = (int)FTMEXT_GET_INLET();
enum play_status status = self->status;
play_halt(self);
@@ -533,7 +533,7 @@
FTMEXT_METHOD_VARARGS(play, set)
{
play_t *self = (play_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
enum play_status status = self->status;
@@ -655,7 +655,7 @@
FTMEXT_METHOD_VARARGS(play, play)
{
play_t *self = (play_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0)
@@ -671,7 +671,7 @@
FTMEXT_METHOD_VARARGS(play, loop)
{
play_t *self = (play_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
play_play((ftmext_t *)self, ac, at);
Modified: trunk/ftm/externals/ftm.print.c
===================================================================
--- trunk/ftm/externals/ftm.print.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.print.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -65,7 +65,7 @@
{
ftmprint_t *self = (ftmprint_t *)FTMEXT_GET_EXT();
fts_symbol_t s = FTMEXT_GET_SELECTOR();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(self->prompt != NULL)
@@ -88,7 +88,7 @@
FTMEXT_INLET(print)
{
ftmprint_t *self = (ftmprint_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(self->prompt != NULL)
Modified: trunk/ftm/externals/ftm.schedule.c
===================================================================
--- trunk/ftm/externals/ftm.schedule.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.schedule.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -139,7 +139,7 @@
}
else if(fts_is_number(a))
{
- int n = fts_get_number_int(a);
+ int n = (int)fts_get_number_int(a);
self->mode = (n < 1) ? mode_nolist : mode_list;
}
else
@@ -194,7 +194,7 @@
{
ftmschedule_t *self = (ftmschedule_t *)FTMEXT_GET_EXT();
fts_symbol_t s = FTMEXT_GET_SELECTOR();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
ftmschedule_schedule_message(self, s, ac, at);
@@ -214,8 +214,8 @@
FTMEXT_INLET(schedule)
{
ftmschedule_t *self = (ftmschedule_t *)FTMEXT_GET_EXT();
- int inlet = FTMEXT_GET_INLET();
- int ac = FTMEXT_GET_COUNT();
+ int inlet = (int)FTMEXT_GET_INLET();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
switch(inlet)
Modified: trunk/ftm/externals/ftm.sdif.info.c
===================================================================
--- trunk/ftm/externals/ftm.sdif.info.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.sdif.info.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -239,7 +239,7 @@
FTMEXT_METHOD_VARARGS (info, open)
{
sdifinfo_t *self = (sdifinfo_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
sdifinfo_open(self, ac, at);
@@ -250,7 +250,7 @@
FTMEXT_METHOD_VARARGS (info, set)
{
sdifinfo_t *self = (sdifinfo_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
sdifinfo_open(self, ac, at);
@@ -345,7 +345,7 @@
matrixsig, nummatrix, rowmax, colmax, ncolums };
sdifinfo_t *self = (sdifinfo_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
SdifQueryTreeT *tree = &self->qtree->stree;
size_t bytesize;
@@ -476,7 +476,7 @@
FTMEXT_METHOD_VARARGS (info, print)
{
sdifinfo_t *self = (sdifinfo_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
SdifQueryTreeT *tree = &self->qtree->stree;
Modified: trunk/ftm/externals/ftm.sdif.write.c
===================================================================
--- trunk/ftm/externals/ftm.sdif.write.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.sdif.write.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -252,7 +252,7 @@
static void setmatrix_symbol(matrixspec_t* mtx, const fts_atom_t* a)
{
char *x = (char *) fts_symbol_name(fts_get_symbol(a));
- mtx->nrows = strlen(x);
+ mtx->nrows = (int)strlen(x);
mtx->ncols = 1;
mtx->data = (float *) x;
mtx->type = eText;
@@ -549,7 +549,7 @@
{
writesdif_t *self = (writesdif_t *) FTMEXT_GET_EXT();
ftmsdif_t *base = &self->base;
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
write_stop((ftmext_t *) self, ac, at);
@@ -592,7 +592,7 @@
{
writesdif_t *self = (writesdif_t *) FTMEXT_GET_EXT();
ftmsdif_t *base = &self->base;
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if (self->base.file)
@@ -672,7 +672,7 @@
FTMEXT_METHOD_VARARGS (write, define)
{
writesdif_t *self = (writesdif_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if (self->base.file)
@@ -696,7 +696,7 @@
FTMEXT_METHOD_VARARGS (write, write)
{
writesdif_t *self = (writesdif_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
sequence_t *todump[MAX_SEQUENCES];
@@ -774,9 +774,9 @@
{
writesdif_t *self = (writesdif_t *) FTMEXT_GET_EXT();
ftmsdif_t *base = &self->base;
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
const fts_atom_t *at = FTMEXT_GET_ARGS();
- int winlet = FTMEXT_GET_INLET();
+ int winlet = (int)FTMEXT_GET_INLET();
double d_time = ftmsdif_get_time() - base->starttime;
#if DEBUG_OUTPUT
Modified: trunk/ftm/externals/ftm.sqlite.c
===================================================================
--- trunk/ftm/externals/ftm.sqlite.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.sqlite.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -76,7 +76,7 @@
FTMEXT_METHOD_VARARGS(sqlite, nullatom)
{
ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if (ac > 0)
@@ -92,7 +92,7 @@
FTMEXT_METHOD_VARARGS(sqlite, open)
{
ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_atom_t create;
fts_set_int(&create, 0);
@@ -120,7 +120,7 @@
FTMEXT_METHOD_VARARGS(sqlite, create)
{
ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_atom_t create;
fts_set_int(&create, 1);
@@ -161,7 +161,7 @@
FTMEXT_METHOD_VARARGS(sqlite, exec)
{
ftm_sqlite_t *self = (ftm_sqlite_t *) FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
mat_t *res;
const char *errstr;
@@ -174,7 +174,7 @@
fts_object_refer((fts_object_t *) res);
ok = ftm_sqlite_execute(self->sqlite, query,
- FTMEXT_GET_COUNT() - 1, FTMEXT_GET_ARGS() + 1,
+ (int)FTMEXT_GET_COUNT() - 1, FTMEXT_GET_ARGS() + 1,
&self->nullatom, res, &errstr);
if (ok)
{ /* send result */
Modified: trunk/ftm/externals/ftm.sqlite3.c
===================================================================
--- trunk/ftm/externals/ftm.sqlite3.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.sqlite3.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -123,14 +123,14 @@
for (i = 0; i < ac; i++)
{
if (fts_is_int(at + i))
- sqlite3_bind_int(res, i + 1, fts_get_int(at + i));
+ sqlite3_bind_int(res, i + 1, (int)fts_get_int(at + i));
else if (fts_is_float(at + i))
sqlite3_bind_double(res, i + 1, fts_get_float(at + i));
else if (fts_is_symbol(at + i))
{
const char *str = fts_symbol_name(fts_get_symbol(at + i));
- sqlite3_bind_text(res, i + 1, str, strlen(str), SQLITE_STATIC);
+ sqlite3_bind_text(res, i + 1, str, (int)strlen(str), SQLITE_STATIC);
}
else if (fts_is_a(at + i, fmat_class))
{
Modified: trunk/ftm/externals/ftm.tween.c
===================================================================
--- trunk/ftm/externals/ftm.tween.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.tween.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -214,7 +214,7 @@
FTMEXT_INLET(tween)
{
tween_t *self = (tween_t *)FTMEXT_GET_EXT();
- int inlet = FTMEXT_GET_INLET();
+ int inlet = (int)FTMEXT_GET_INLET();
if(inlet == 0)
{
Modified: trunk/ftm/externals/ftm.value.c
===================================================================
--- trunk/ftm/externals/ftm.value.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/ftm.value.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -75,8 +75,8 @@
{
ftmvalue_t *self = (ftmvalue_t *)FTMEXT_GET_EXT();
fts_symbol_t s = FTMEXT_GET_SELECTOR();
- int inlet = FTMEXT_GET_INLET();
- int ac = FTMEXT_GET_COUNT();
+ int inlet = (int)FTMEXT_GET_INLET();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(s == NULL && ac > 0)
@@ -107,7 +107,7 @@
FTMEXT_INLET(value)
{
ftmvalue_t *self = (ftmvalue_t *)FTMEXT_GET_EXT();
- int inlet = FTMEXT_GET_INLET();
+ int inlet = (int)FTMEXT_GET_INLET();
fts_atom_t *a = FTMEXT_GET_ANY();
fts_lock_exclusive(&self->lock);
Modified: trunk/ftm/externals/max5/ftm.absargs.c
===================================================================
--- trunk/ftm/externals/max5/ftm.absargs.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/max5/ftm.absargs.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -114,7 +114,7 @@
/* get existing attribute index */
if(attr_names != NULL && fts_hashtable_get(attr_names, &a_name, &a_idx))
{
- int idx = fts_get_int(&a_idx);
+ int idx = (int)fts_get_int(&a_idx);
fts_atom_t a_mess;
fts_set_object(&a_mess, mess);
@@ -232,7 +232,7 @@
/* set expression scopes */
if(parse_expression != 0)
- self->abstraction_expression_status = fts_expression_parse_from_atoms(self->abstraction_expression, ac, at, NULL);
+ self->abstraction_expression_status = fts_expression_parse_from_atoms(self->abstraction_expression, (int)ac, at, NULL);
if(parse_expression == 0 || self->abstraction_expression_status == fts_ok)
{
Modified: trunk/ftm/externals/max5/ftm.buffer.c
===================================================================
--- trunk/ftm/externals/max5/ftm.buffer.c 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/max5/ftm.buffer.c 2017-01-03 16:49:32 UTC (rev 3703)
@@ -129,8 +129,8 @@
if(buffer->b_valid != 0)
{
double sr = fts_audio_get_sr();
- int buffer_size = buffer->b_frames;
- int buffer_channels = buffer->b_nchans;
+ int buffer_size = (int)buffer->b_frames;
+ int buffer_channels = (int)buffer->b_nchans;
fmat_t *output = self->output;
int output_channels = self->channels;
double fonset = unit_to_samp(delay, self->unit, sr);
@@ -197,7 +197,7 @@
FTMEXT_METHOD_VARARGS(buffer, paste)
{
ftmbuffer_t *self = (ftmbuffer_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0 && fts_is_a(at, fmat_class))
@@ -217,8 +217,8 @@
if(buffer->b_valid != 0)
{
float *buf_ptr = buffer->b_samples;
- int buf_size = buffer->b_frames;
- int buf_channels = buffer->b_nchans;
+ int buf_size = (int)buffer->b_frames;
+ int buf_channels = (int)buffer->b_nchans;
float *ptr = fmat_lock(fmat);
int m = fmat_get_m(fmat);
int n = fmat_get_n(fmat);
@@ -435,7 +435,7 @@
{
ftmbuffer_t *self = (ftmbuffer_t *)FTMEXT_GET_EXT();
double f = FTMEXT_GET_FLOAT();
- int inlet = FTMEXT_GET_INLET();
+ int inlet = (int)FTMEXT_GET_INLET();
switch(inlet)
{
Modified: trunk/ftm/externals/max5/ftm.editor.cpp
===================================================================
--- trunk/ftm/externals/max5/ftm.editor.cpp 2017-01-03 11:06:38 UTC (rev 3702)
+++ trunk/ftm/externals/max5/ftm.editor.cpp 2017-01-03 16:49:32 UTC (rev 3703)
@@ -554,7 +554,7 @@
void setEditorAtomFromFtsAtom(EditorAtom *ea, fts_atom_t *a)
{
if(fts_is_float(a)) ea->setFloat(fts_get_float(a));
- else if(fts_is_int(a)) ea->setInt(fts_get_int(a));
+ else if(fts_is_int(a)) ea->setInt((int)fts_get_int(a));
else if(fts_is_symbol(a)) ea->setString( JUCE_EDITOR_NAMESPACE::String(fts_get_symbol(a)->s_name));
else if(fts_is_pointer(a)) ea->setPointer(fts_get_pointer(a));
}
@@ -1522,7 +1522,7 @@
int nargs = 0;
fts_atom_t args[128];
- int index = fts_get_number_int(at);
+ int index = (int)fts_get_number_int(at);
fts_symbol_t pname = fts_get_symbol(at+1);
getViewProperty(index, pname, ac-2, at+2, &nargs, args);
@@ -1763,12 +1763,12 @@
else if(prop == fts_s_size)
{
if(ac == 1 && fts_is_number(at))
- editorContainer->setCursorSize(fts_get_number_int(at));
+ editorContainer->setCursorSize((int)fts_get_number_int(at));
}
else if(prop == fts_s_visible)
{
if(ac == 1 && fts_is_number(at))
- editorContainer->setCursorVisible(fts_get_number_int(at));
+ editorContainer->setCursorVisible((int)fts_get_number_int(at));
}
}
void moveCursor(float time)
@@ -1800,7 +1800,7 @@
else if(prop == fts_s_visible)
{
if(ac == 1 && fts_is_number(at))
- editorContainer->setRegionSelectionVisible(fts_get_number_int(at));
+ editorContainer->setRegionSelectionVisible((int)fts_get_number_int(at));
}
}
@@ -1813,7 +1813,7 @@
else if(prop == fts_s_visible)
editorContainer->setDomainScrollbarVisible((external->domainScrollbar_visible == 1));
else if(prop == fts_s_size)
- editorContainer->setDomainScrollbarSize(external->domainScrollbar_size);
+ editorContainer->setDomainScrollbarSize((int)external->domainScrollbar_size);
}
void setRangeRulerProperty(fts_symbol_t prop)
@@ -1822,7 +1822,7 @@
if(prop == fts_s_visible)
editorContainer->setRangeRulerVisible((external->rangeruler_visible == 1));
else if(prop == fts_s_size)
- editorContainer->setRangeRulerSize(external->rangeruler_size);
+ editorContainer->setRangeRulerSize((int)external->rangeruler_size);
else if(prop == fts_s_grid)
editorContainer->setRangeRulerGridVisible((external->rangeruler_grid == 1));
}
@@ -1837,7 +1837,7 @@
else if(prop == fts_s_unit)
editorContainer->setDomainRulerTimeUnit((ImtrTypes::time_unit_type) external->domainruler_unit);
else if(prop == fts_s_size)
- editorContainer->setDomainRulerSize(external->domainruler_size);
+ editorContainer->setDomainRulerSize((int)external->domainruler_size);
else if(prop == fts_s_grid)
editorContainer->setDomainRulerGridVisible((external->domainruler_grid == 1));
else if(prop == fts_s_fgcolor)
@@ -1856,7 +1856,7 @@
else if(prop == fts_s_position)
editorContainer->setToolbarPosition((ImtrTypes::position_type) external->toolbar_position);
else if(prop == fts_s_size)
- editorContainer->setToolbarSize(external->toolbar_size);
+ editorContainer->setToolbarSize((int)external->toolbar_size);
else if(prop == fts_s_bgcolor)
editorContainer->setToolbarBackgroundColor(JUCE_EDITOR_NAMESPACE::Colour((int)(external->toolbar_bgcolor.red * 255), (int)(external->toolbar_bgcolor.green * 255),
(int)(external->toolbar_bgcolor.blue * 255)).withAlpha((float)external->toolbar_bgcolor.alpha));
@@ -1979,9 +1979,9 @@
int r, g, b;
if(fts_is_int(at))
{
- r = fts_get_int(at);
- g = fts_get_int(at+1);
- b = fts_get_int(at+2);
+ r = (int)fts_get_int(at);
+ g = (int)fts_get_int(at+1);
+ b = (int)fts_get_int(at+2);
}
else
{
@@ -2012,9 +2012,9 @@
int r, g, b;
if(fts_is_int(at))
{
- r = fts_get_int(at);
- g = fts_get_int(at+1);
- b = fts_get_int(at+2);
+ r = (int)fts_get_int(at);
+ g = (int)fts_get_int(at+1);
+ b = (int)fts_get_int(at+2);
}
else
{
@@ -2045,9 +2045,9 @@
int r, g, b;
if(fts_is_int(at))
{
- r = fts_get_int(at);
- g = fts_get_int(at+1);
- b = fts_get_int(at+2);
+ r = (int)fts_get_int(at);
+ g = (int)fts_get_int(at+1);
+ b = (int)fts_get_int(at+2);
}
else
{
@@ -2145,7 +2145,7 @@
if(ac > 0 && fts_is_number(at))
{
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
- editorContainer->setViewForemost(index, fts_get_number_int(at));
+ editorContainer->setViewForemost(index, (int)fts_get_number_int(at));
}
}
else if(prop == fts_s_visibleindexes)
@@ -2154,7 +2154,7 @@
if(ac > 0 && fts_is_number(at))
{
for(int i = 0; i< ac; i++)
- indexes.add(fts_get_int(at+i));
+ indexes.add((int)fts_get_int(at+i));
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setViewVisibleIndexes(index, false, indexes);
@@ -2176,7 +2176,7 @@
if(fts_is_number(at+i))
{
names.add("-");
- indexes.add(fts_get_number_int(at+i));
+ indexes.add((int)fts_get_number_int(at+i));
}
else if(fts_is_symbol(at+i))
{
@@ -2198,9 +2198,9 @@
int r, g, b;
if(fts_is_int(at))
{
- r = fts_get_int(at+1);
- g = fts_get_int(at+2);
- b = fts_get_int(at+3);
+ r = (int)fts_get_int(at+1);
+ g = (int)fts_get_int(at+2);
+ b = (int)fts_get_int(at+3);
}
else
{
@@ -2229,7 +2229,7 @@
JUCE_EDITOR_NAMESPACE::Array <int> indexes;
if(ac > 0 && fts_is_number(at))
for(int i = 0; i< ac; i++)
- indexes.add(fts_get_int(at+i));
+ indexes.add((int)fts_get_int(at+i));
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
editorContainer->setViewHighlightedIndexes(index, indexes, 0);
@@ -2282,7 +2282,7 @@
if(ac == 1 && fts_is_number(at))
{
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
- editorContainer->setViewLineThickness(index, fts_get_number_int(at));
+ editorContainer->setViewLineThickness(index, (int)fts_get_number_int(at));
}
}
else if(prop == fts_s_step)
@@ -2388,7 +2388,7 @@
if(ac > 0 && fts_is_number(at))
{
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
- editorContainer->setViewFontSize(index, fts_get_number_int(at));
+ editorContainer->setViewFontSize(index, (int)fts_get_number_int(at));
}
}
else if(prop == fts_s_fontstyle)
@@ -2488,9 +2488,9 @@
int r, g, b;
if(fts_is_int(at+1))
{
- r = fts_get_int(at+1);
- g = fts_get_int(at+2);
- b = fts_get_int(at+3);
+ r = (int)fts_get_int(at+1);
+ g = (int)fts_get_int(at+2);
+ b = (int)fts_get_int(at+3);
}
else
{
@@ -2521,9 +2521,9 @@
int r, g, b;
if(fts_is_int(at+1))
{
- r = fts_get_int(at+1);
- g = fts_get_int(at+2);
- b = fts_get_int(at+3);
+ r = (int)fts_get_int(at+1);
+ g = (int)fts_get_int(at+2);
+ b = (int)fts_get_int(at+3);
}
else
{
@@ -2554,9 +2554,9 @@
int r, g, b;
if(fts_is_int(at+1))
{
- r = fts_get_int(at+1);
- g = fts_get_int(at+2);
- b = fts_get_int(at+3);
+ r = (int)fts_get_int(at+1);
+ g = (int)fts_get_int(at+2);
+ b = (int)fts_get_int(at+3);
}
else
{
@@ -2587,7 +2587,7 @@
if(grid_prop == fts_s_visible && fts_is_int(at+1))
{
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
- editorContainer->setViewGridVisible(index, fts_get_number_int(at+1));
+ editorContainer->setViewGridVisible(index, (int)fts_get_number_int(at+1));
}
else if(grid_prop == fts_s_color)
{
@@ -2597,9 +2597,9 @@
int r, g, b;
if(fts_is_int(at+1))
{
- r = fts_get_int(at+1);
- g = fts_get_int(at+2);
- b = fts_get_int(at+3);
+ r = (int)fts_get_int(at+1);
+ g = (int)fts_get_int(at+2);
+ b = (int)fts_get_int(at+3);
}
else
{
@@ -2678,7 +2678,7 @@
for(i = 0; i < ac; i++)
if(fts_is_int(at+i))
{
- int selIdx = fts_get_number_int(at+i);
+ int selIdx = (int)fts_get_number_int(at+i);
if(selIdx != -1) selection.add(selIdx);
}
if(arg != fts_s_empty_string)
@@ -2691,7 +2691,7 @@
if(ac == 1 && fts_is_number(at))
{
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
- editorContainer->setViewVisible(index, fts_get_number_int(at));
+ editorContainer->setViewVisible(index, (int)fts_get_number_int(at));
}
else if(ac == 1 && fts_is_symbol(at) && fts_get_symbol(at) == fts_s_solo)
{
@@ -2745,7 +2745,7 @@
else if(prop == fts_s_position)
editorContainer->setTabsPosition((external->tabs_position == 0));
else if(prop == fts_s_size)
- editorContainer->setTabsSize(external->tabs_size);
+ editorContainer->setTabsSize((int)external->tabs_size);
}
void setSplit(int ac, fts_atom_t *at)
@@ -2791,7 +2791,7 @@
if(ac == 1 && fts_is_number(at))
{
const JUCE_EDITOR_NAMESPACE::MessageManagerLock mmLock;
- editorContainer->setSplitSize(fts_get_number_int(at));
+ editorContainer->setSplitSize((int)fts_get_number_int(at));
}
}
}
@@ -2967,7 +2967,7 @@
if(!self->selfattached) ftmeditor_attachto_itself(self);
if(self->windresize && self->patching_inset_right == 0)
- ftmeditor_resize_with_window(self, self->windresize);
+ ftmeditor_resize_with_window(self, (int)self->windresize);
jbox_get_rect_for_view((t_object *)self, patcherview, &r);
@@ -3248,7 +3248,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, set)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_atom_t args[256];
@@ -3364,7 +3364,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, replace)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_atom_t args[256];
@@ -3428,7 +3428,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, append)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_atom_t args[2];
@@ -3464,7 +3464,7 @@
ftmeditor_insert_delayed(ftmeditor_t *self, t_symbol *s, short ac, Atom *at)
{
int i;
- int index = fts_get_int(at);
+ int index = (int)fts_get_int(at);
fts_object_t *obj = fts_get_object(at+1);
fts_symbol_t interface_name = fts_get_symbol(at+2);
imtr_guiInterface *gui_interface = (imtr_guiInterface *)fts_object_get_gui_interface(obj, interface_name);
@@ -3488,7 +3488,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, insert)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_atom_t args[3];
@@ -3496,7 +3496,7 @@
{
imtr_guiInterface *gui_interface = NULL;
fts_symbol_t interface_name = NULL;
- int index = fts_get_int(at);
+ int index = (int)fts_get_int(at);
fts_object_t *obj = fts_get_object(at+1);
if(fts_is_symbol(at+2))
@@ -3527,7 +3527,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, interfaces)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
int i = 0;
int j = 0;
@@ -3557,7 +3557,7 @@
/* if first atom is int == keep_interface property value */
if(fts_is_int(at))
{
- self->keep_interfaces = fts_get_int(at);
+ self->keep_interfaces = (int)fts_get_int(at);
self->loading = 1;
ac--;
at++;
@@ -3620,11 +3620,11 @@
FTMEXT_METHOD_VARARGS(ftmeditor, persistence)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0 && fts_is_int(at))
{
- int persistence = fts_get_int(at);
+ int persistence = (int)fts_get_int(at);
if(persistence == 0)
self->persistence = 0;
else
@@ -3695,7 +3695,7 @@
static void
ftmeditor_set_view_property(ftmeditor_t *self, int index, t_symbol *propname, long argc, t_atom *argv)
{
- self->container->setViewProperty(index, propname, argc, argv);
+ self->container->setViewProperty(index, propname, (int)argc, argv);
qelem_set(self->qelem_ftmeditor_repaint);
}
@@ -3705,7 +3705,7 @@
int index = -1;
if(fts_is_number(argv))
{
- index = fts_get_number_int(argv);
+ index = (int)fts_get_number_int(argv);
argc--;
argv++;
}
@@ -3764,7 +3764,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, view)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int argc = FTMEXT_GET_COUNT();
+ int argc = (int)FTMEXT_GET_COUNT();
fts_atom_t *argv = FTMEXT_GET_ARGS();
if(argc > 1)
@@ -3826,7 +3826,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, domain)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0 && fts_is_symbol(at))
@@ -3887,7 +3887,7 @@
if(ac > 0 && fts_is_number(at))
{
self->cursor_size = fts_get_number_int(at);
- self->container->editorContainer->setCursorSize(self->cursor_size);
+ self->container->editorContainer->setCursorSize((int)self->cursor_size);
}
else
ret = -1;
@@ -3897,7 +3897,7 @@
if(ac > 0 && fts_is_number(at))
{
self->cursor_visible = fts_get_number_int(at);
- self->container->editorContainer->setCursorVisible(self->cursor_visible);
+ self->container->editorContainer->setCursorVisible((int)self->cursor_visible);
}
else
ret = -1;
@@ -3907,7 +3907,7 @@
if(ac > 0 && fts_is_number(at))
{
self->cursor_followmouse = (int)fts_get_number_int(at);
- self->container->editorContainer->setCursorFollowMouse(self->cursor_followmouse);
+ self->container->editorContainer->setCursorFollowMouse((int)self->cursor_followmouse);
ret = 2;
}
@@ -3959,7 +3959,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, cursor)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0)
@@ -4101,7 +4101,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, region)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
fts_symbol_t prop = fts_s_empty_string;
@@ -4170,7 +4170,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, dscroll)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4182,7 +4182,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, domainscrollbar)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4217,7 +4217,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, infopanel)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4229,7 +4229,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, rangeruler)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4329,7 +4329,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, ruler)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4341,7 +4341,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, domainruler)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4461,7 +4461,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, toolbar)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4498,7 +4498,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, layout)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac >= 1 && fts_is_symbol(at))
@@ -4573,7 +4573,7 @@
if(ac > 0 && fts_is_number(at))
{
self->split_size = fts_get_number_int(at);
- self->container->editorContainer->setSplitSize(self->split_size);
+ self->container->editorContainer->setSplitSize((int)self->split_size);
}
else
ret = -1;
@@ -4642,7 +4642,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, split)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0)
@@ -4662,7 +4662,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, orientation)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_symbol(at))
@@ -4703,7 +4703,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, bgcolor)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
defer_low(self, (method)ftmeditor_set_bgcolor, 0, ac, at);
@@ -4722,7 +4722,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, opacity)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_number(at))
@@ -4734,14 +4734,14 @@
static void
ftmeditor_set_foremost_delayed(ftmeditor_t *self, fts_symbol_t prop, int ac, fts_atom_t *at)
{
- self->container->setForemost(fts_get_number_int(at));
+ self->container->setForemost((int)fts_get_number_int(at));
qelem_set(self->qelem_ftmeditor_repaint);
}
FTMEXT_METHOD_VARARGS(ftmeditor, foremost)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 0 && fts_is_number(at))
@@ -4753,7 +4753,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, tool)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_symbol(at))
@@ -4786,7 +4786,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, autoupdate)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_number(at))
@@ -4799,7 +4799,7 @@
ftmeditor_set_align_view_bounds(ftmeditor_t *self, int aligned)
{
self->align_view_bounds = aligned;
- self->container->editorContainer->setAlignViewBounds(self->align_view_bounds);
+ self->container->editorContainer->setAlignViewBounds((int)self->align_view_bounds);
qelem_set(self->qelem_ftmeditor_repaint);
}
@@ -4807,13 +4807,13 @@
ftmeditor_alignviewbounds_delayed(ftmeditor_t *self, fts_symbol_t prop, int ac, fts_atom_t *at)
{
if(ac == 1 && fts_is_number(at))
- ftmeditor_set_align_view_bounds(self, fts_get_number_int(at));
+ ftmeditor_set_align_view_bounds(self, (int)fts_get_number_int(at));
}
FTMEXT_METHOD_VARARGS(ftmeditor, alignviewbounds)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_number(at))
@@ -4825,7 +4825,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, autoviewbounds)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac == 1 && fts_is_number(at))
@@ -4886,7 +4886,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, tabs)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac > 1 && fts_is_symbol(at))
@@ -4898,7 +4898,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, get)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- int ac = FTMEXT_GET_COUNT();
+ int ac = (int)FTMEXT_GET_COUNT();
fts_atom_t *at = FTMEXT_GET_ARGS();
if(ac >= 1 && fts_is_symbol(at))
@@ -4912,7 +4912,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getbgcolor)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_bgcolor, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_bgcolor, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4920,7 +4920,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getdomain)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_domain, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_domain, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4928,7 +4928,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getforemost)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_foremost, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_foremost, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4936,7 +4936,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getlayout)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_layout, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_layout, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4944,7 +4944,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getopacity)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_opacity, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_opacity, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4952,7 +4952,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getorientation)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_orientation, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_orientation, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4960,7 +4960,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getcursor)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_cursor, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_cursor, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4968,7 +4968,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getview)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputViewProperty(FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputViewProperty((int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4976,7 +4976,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getrangeruler)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_rangeruler, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_rangeruler, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4984,7 +4984,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getruler)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_domainruler, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_domainruler, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -4992,7 +4992,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getdomainruler)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_domainruler, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_domainruler, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -5000,7 +5000,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getscrollbar)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_domainscrollbar, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_domainscrollbar, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -5008,7 +5008,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getdomainscrollbar)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_domainscrollbar, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_domainscrollbar, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -5016,7 +5016,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, gettabs)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_tabs, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_tabs, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -5024,7 +5024,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, getregion)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_region, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_region, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -5032,7 +5032,7 @@
FTMEXT_METHOD_VARARGS(ftmeditor, gettoolbar)
{
ftmeditor_t *self = (ftmeditor_t *)FTMEXT_GET_EXT();
- self->container->outputProperty( fts_s_toolbar, FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
+ self->container->outputProperty( fts_s_toolbar, (int)FTMEXT_GET_COUNT(), FTMEXT_GET_ARGS());
FTMEXT_METHOD_RETURN;
}
@@ -5052,8 +5052,8 @@
object_attr_getvalueof( jpatcher_get_firstview( patcher), gensym("rect"), &ac, &av);
if(ac > 3)
{
- int current_win_w = atom_getlong(av+2);
- int current_win_h = atom_getlong(av+3);
+ int current_win_w = (int)atom_getlong(av+2);
+ int current_win_h = (int)atom_getlong(av+3);
self->patching_inset_right = current_win_w - (((t_jbox *)self)->b_patching_rect.x + ((t_jbox *)self)->b_patching_rect.width);
self->patching_inset_bottom = current_win_h - (((t_jbox *)self)->b_patching_rect.y + ((t_jbox *)self)->b_patching_rect.height);
@@ -5089,7 +5089,7 @@
ftmeditor_set_output_values(ftmeditor_t *self, int outval)
{
self->outputvalues = outval;
- self->container->editorContainer->setOutputChangedValues(self->outputvalues);
+ self->container->editorContainer->setOutputChangedValues((int)self->outputvalues);
qelem_set(self->qelem_ftmeditor_repaint);
}
@@ -5104,7 +5104,7 @@
ftmeditor_set_output_mouse(ftmeditor_t *self, int outmouse)
{
self->outputmouse = outmouse;
- self->container->editorContainer->setOutputMousePosition(self->outputmouse);
+ self->container->editorContainer->setOutputMousePosition((int)self->outputmouse);
}
FTMEXT_METHOD_NUMBER(ftmeditor, outputmouse)
@@ -5118,7 +5118,7 @@
ftmeditor_set_output_keys(ftmeditor_t *self, int outkeys)
{
self->outputkeys = outkeys;
- self->container->editorContainer->setOutputKeys(self->outputkeys);
+ self->container->editorContainer->setOutputKeys((int)self->outputkeys);
}
FTMEXT_METHOD_NUMBER(ftmeditor, outputkeys)
@@ -5132,7...
[truncated message content] |
|
From: <di...@us...> - 2017-01-03 11:06:40
|
Revision: 3702
http://sourceforge.net/p/ftm/code/3702
Author: diemo
Date: 2017-01-03 11:06:38 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
18.11.2016: remark on missing fts_lock_destroy
Modified Paths:
--------------
trunk/ftm/ftmlib/mem.c
Modified: trunk/ftm/ftmlib/mem.c
===================================================================
--- trunk/ftm/ftmlib/mem.c 2017-01-03 11:05:32 UTC (rev 3701)
+++ trunk/ftm/ftmlib/mem.c 2017-01-03 11:06:38 UTC (rev 3702)
@@ -90,7 +90,7 @@
p->block_size = ( block_size > sizeof(char **) ? block_size : sizeof(char **));
p->current_block_group = 64;
p->reserved_blocks = 0;
- fts_lock_init(&p->rwlock);
+ fts_lock_init(&p->rwlock); //NB: heaps are never destroyed, so there is no corresponding fts_lock_destroy
return p;
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2017-01-03 11:05:34
|
Revision: 3701
http://sourceforge.net/p/ftm/code/3701
Author: diemo
Date: 2017-01-03 11:05:32 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
18.11.2016: use 64bit dsp chain when Max >= 6.1 is detected,
use long ac args in messages called by max
Modified Paths:
--------------
trunk/ftm/ftmlib/max5/maxext.c
Modified: trunk/ftm/ftmlib/max5/maxext.c
===================================================================
--- trunk/ftm/ftmlib/max5/maxext.c 2017-01-03 11:03:49 UTC (rev 3700)
+++ trunk/ftm/ftmlib/max5/maxext.c 2017-01-03 11:05:32 UTC (rev 3701)
@@ -34,6 +34,7 @@
#ifndef WIN32
#define debug_post(args...)
//#define debug_post(args...) post(args)
+//#define debug_post(args...) printf(args); puts("\n")
#else
static void debug_post(const char *format, ...){}
#endif
@@ -861,7 +862,7 @@
}
void
-maxext_init_finalize(ftmext_t *ext, short ac, fts_atom_t *at)
+maxext_init_finalize(ftmext_t *ext, long ac, fts_atom_t *at)
{
maxext_init_dsp(ext);
maxext_init_inlets(ext);
@@ -961,6 +962,23 @@
}
}
+
+void
+maxext_dsp_add64 (ftmext_t *ext, void *perform64, t_object *dsp64, short *count, double samplerate, long maxvectorsize, long flags)
+{
+ // instead of calling dsp_add(), we send the "dsp_add64" message to the object representing the dsp chain
+ // the arguments passed are:
+ // 1: the dsp64 object passed-in by the calling function
+ // 2: the symbol of the "dsp_add64" message we are sending
+ // 3: a pointer to your object
+ // 4: a pointer to your 64-bit perform method
+ // 5: flags to alter how the signal chain handles your object -- just pass 0
+ // 6: a generic pointer that you can use to pass any additional data to your perform method
+
+ object_method(dsp64, gensym("dsp_add64"), (ftmext_t *) ext, perform64, 0, NULL);
+}
+
+
int
maxext_dsp_idle(ftmext_t *ext, float **outputs, int n_tick)
{
@@ -980,6 +998,25 @@
return 0;
}
+int
+maxext_dsp_idle64(ftmext_t *ext, double **outputs, int n_tick)
+{
+ t_pxobject *px = (t_pxobject *)ext;
+
+ if(px->z_disabled != 0)
+ {
+ int n_outs = ftmext_get_outlets_dsp(ext);
+ int i;
+
+ for(i=0; i<n_outs; i++)
+ memset(outputs[i], 0, sizeof(double) * n_tick);
+
+ return 1;
+ }
+
+ return 0;
+}
+
/**********************************************************************
*
* FTM Max/MSP external send outlet
@@ -1197,7 +1234,7 @@
*
*/
static void
-maxext_postdoc(ftmext_t *ext, fts_symbol_t s, short ac, fts_atom_t *at)
+maxext_postdoc(ftmext_t *ext, fts_symbol_t s, long ac, fts_atom_t *at)
{
ftmext_class_t *cl = ftmext_get_class(ext);
@@ -1287,7 +1324,7 @@
{
int n_class_outs = ftmext_class_get_outlets(cl);
int i_doc = arg;
- char *doc = NULL;
+ const char *doc = NULL;
if(i_doc >= n_class_outs)
i_doc = n_class_outs - 1;
@@ -1317,7 +1354,7 @@
}
void
-maxext_compatibility_restore(ftmext_t *ext, fts_symbol_t selector, short ac, fts_atom_t *at)
+maxext_compatibility_restore(ftmext_t *ext, fts_symbol_t selector, long ac, fts_atom_t *at)
{
#ifndef FTM_LIGHT
@@ -1398,13 +1435,13 @@
}
static void
-maxext_doesnt_understand(ftmext_t *ext, fts_symbol_t selector, short ac, fts_atom_t *at)
+maxext_doesnt_understand(ftmext_t *ext, fts_symbol_t selector, long ac, fts_atom_t *at)
{
object_error((t_object *)ext, "doesn't understand \"%s\"", fts_symbol_name(selector));
}
void
-maxext_anything(ftmext_t *ext, fts_symbol_t selector, short ac, fts_atom_t *at)
+maxext_anything(ftmext_t *ext, fts_symbol_t selector, long ac, fts_atom_t *at)
{
ftmext_class_t *c = ftmext_get_class(ext);
maxext_class_data_t *mcd = (maxext_class_data_t *)c->handle;
@@ -1467,6 +1504,9 @@
class_register(CLASS_BOX, max_class);
}
+#if !defined(C74_MAX_SDK_VERSION) || C74_MAX_SDK_VERSION < 0x0610
+// 32bit audio
+
void
maxext_class_dsp(ftmext_class_t *cl, void (*dsp_init)(ftmext_t *, t_signal **, short int *))
{
@@ -1476,10 +1516,26 @@
class_dspinit(mcd->maxclass);
class_addmethod(mcd->maxclass, (method)dsp_init, "dsp", A_CANT, 0);
- //TODO: 64bit: (method) dsp_init, "dsp64",
}
+#else // 64bit audio: (method) dsp_init, "dsp64",
+
void
+maxext_class_dsp64(ftmext_class_t *cl, void (*dsp_init64)(ftmext_t *_e, t_object *dsp64, short *count, double samplerate, long maxvectorsize, long flags))
+{
+ maxext_class_data_t *mcd = (maxext_class_data_t *)cl->handle;
+
+ ftmext_class_dsp(cl);
+
+ class_dspinit(mcd->maxclass);
+ // 64bit audio: (method) dsp_init, "dsp64",
+ class_addmethod(mcd->maxclass, (method) dsp_init64, "dsp64", A_CANT, 0);
+}
+
+#endif
+
+
+void
maxext_class_message(ftmext_class_t *ftmext_class, const char *name, fts_class_t *type, ftmext_method_t ftmext_method, method max_method, const char *doc)
{
t_class *max_class = maxext_class_get_maxclass(ftmext_class);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2017-01-03 11:03:51
|
Revision: 3700
http://sourceforge.net/p/ftm/code/3700
Author: diemo
Date: 2017-01-03 11:03:49 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
18.11.2016: use 64bit dsp chain when Max >= 6.1 is detected
Modified Paths:
--------------
trunk/ftm/ftmlib/max5/ftmexternals.h
Modified: trunk/ftm/ftmlib/max5/ftmexternals.h
===================================================================
--- trunk/ftm/ftmlib/max5/ftmexternals.h 2017-01-03 11:00:39 UTC (rev 3699)
+++ trunk/ftm/ftmlib/max5/ftmexternals.h 2017-01-03 11:03:49 UTC (rev 3700)
@@ -38,12 +38,13 @@
FTS_API ftmext_class_t *maxext_class_init(t_symbol *clname, int size, method constructor, method deconstructor);
FTS_API void maxext_class_init_finalize(ftmext_class_t *ftmext_class, t_class *max_class);
FTS_API void maxext_class_dsp(ftmext_class_t *cl, void (*dsp_init)(ftmext_t *, t_signal **, short int *));
-FTS_API void maxext_compatibility_restore(ftmext_t *ext, fts_symbol_t selector, short ac, fts_atom_t *at);
+FTS_API void maxext_class_dsp64(ftmext_class_t *cl, void (*dsp_init64)(ftmext_t *_e, t_object *dsp64, short *count, double samplerate, long maxvectorsize, long flags));
+FTS_API void maxext_compatibility_restore(ftmext_t *ext, fts_symbol_t selector, long ac, fts_atom_t *at);
FTS_API t_class *maxext_class_get_maxclass(ftmext_class_t *cl);
FTS_API void maxext_class_set_restore_method(ftmext_class_t *cl, method restore);
FTS_API void maxext_class_set_default_method(ftmext_class_t *cl, method anything);
-FTS_API void maxext_compatibility_restore(ftmext_t *ext, fts_symbol_t selector, short ac, fts_atom_t *at);
+FTS_API void maxext_compatibility_restore(ftmext_t *ext, fts_symbol_t selector, long ac, fts_atom_t *at);
#define _FTMEXT_CLASS_HEADER(pp, p, t, n) int main (void) { ftmext_class_t *_c = NULL; t_class *_mc = NULL; \
ftmlib_init(); \
@@ -63,10 +64,15 @@
#define FTMEXT_CLASS_DESCR(p, b, f) do { ftmext_class_descr(_c, (b), (f)); } while(0)
#define FTMEXT_CLASS_EXTENSION(p, e) do { ftmext_class_extension(_c, (e)); } while(0)
-#define FTMEXT_CLASS_DSP(p) do { maxext_class_dsp(_c, _FTMEXT_GEN_METHOD_NAME(_ ## p, dsp_init)); } while(0)
+#if !defined(C74_MAX_SDK_VERSION) || C74_MAX_SDK_VERSION < 0x0610 // 32bit audio
+# define FTMEXT_CLASS_DSP(p) do { maxext_class_dsp(_c, _FTMEXT_GEN_METHOD_NAME(_ ## p, dsp_init)); } while(0)
+#else // 64bit audio
+# define FTMEXT_CLASS_DSP(p) do { maxext_class_dsp64(_c, _FTMEXT_GEN_METHOD_NAME(_ ## p, dsp_init64)); } while(0)
#endif
+#endif
+
/****************************************************************************
*
* FTM Max/MSP external external constructor/deconstructor definition
@@ -75,7 +81,7 @@
/* Max/MSP specific functions (defined in maxext.c) */
FTS_API ftmext_t *maxext_init(ftmext_class_t *cl, t_object *patcher, t_dictionary *dict, short *rac, fts_atom_t **rat);
FTS_API void maxext_init_raw(ftmext_t *ext, ftmext_class_t *cl, t_object *patcher, t_dictionary *dict);
-FTS_API void maxext_init_finalize(ftmext_t *ext, short ac, fts_atom_t *at);
+FTS_API void maxext_init_finalize(ftmext_t *ext, long ac, fts_atom_t *at);
FTS_API void maxext_delete(ftmext_t *ext);
#ifndef DOXYGEN_DOC
@@ -96,7 +102,7 @@
_n = ftmext_init_get_argument_count(_nn, _a); {
#define FTMEXT_INIT_RETURN \
- } maxext_init_finalize(_e, (int)_nn, _a); \
+ } maxext_init_finalize(_e, _nn, _a); \
_ftmext_exit_label: return(_e); }
#define FTMEXT_DELETE(p) static void _FTMEXT_GEN_METHOD_NAME(p, module_delete) (ftmext_t *_e) { \
@@ -113,7 +119,7 @@
#define MAXEXT_GET_DICTIONARY() (_d)
#define MAXEXT_INIT_GRAPHIC_RETURN \
- } maxext_init_finalize(_e, (int)_nn, _a); \
+ } maxext_init_finalize(_e, _nn, _a); \
jbox_ready((t_jbox *)_e); \
_ftmext_exit_label: return(_e); }
@@ -127,7 +133,7 @@
#ifndef DOXYGEN_DOC
#define _FTMEXT_CONVERT_REFERENCES(e, n, a) do { \
- if((e)->head.ftm_objref_conv != 0) { fts_atom_t *_aa = (fts_atom_t *)alloca(sizeof(fts_atom_t) * (n)); int _i; \
+ if((e)->head.ftm_objref_conv != 0) { fts_atom_t *_aa = (fts_atom_t *)alloca(sizeof(fts_atom_t) * (n)); long _i; \
for(_i=0; _i<(n); _i++) { _aa[_i] = (a)[_i]; \
if(fts_is_symbol((a) + _i)) { \
fts_object_t *_o = fts_object_get_from_symbol(fts_get_symbol((a) + _i)); \
@@ -145,49 +151,49 @@
static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e) { if(0) goto _ftmext_exit_label; {
#define FTMEXT_METHOD_NUMBER(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, double _x); \
- static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, number) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+ static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, number) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
_FTMEXT_METHOD_CHECK_NUMBER(p, m, _e, _n, _a); _FTMEXT_METHOD_CHECK_INLET(m, _e, _MAXEXT_GET_INLET(_e)); \
_FTMEXT_GEN_METHOD_NAME(p, m) (_e, fts_get_number_float(_a)); _ftmext_exit_label: ; } \
static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, double _x) { if(0) goto _ftmext_exit_label; {
#define FTMEXT_METHOD_SYMBOL(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_symbol_t _r); \
- static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, symbol) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+ static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, symbol) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
_FTMEXT_METHOD_CHECK_SYMBOL(p, m, _e, _n, _a); _FTMEXT_METHOD_CHECK_INLET(m, _e, _MAXEXT_GET_INLET(_e)); \
_FTMEXT_GEN_METHOD_NAME(p, m) (_e, fts_get_symbol(_a)); _ftmext_exit_label: ; } \
static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_symbol_t _r) { if(0) goto _ftmext_exit_label; {
#define FTMEXT_METHOD_BOOLEAN(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, int _b); \
- static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, boolean) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { int _b = 0; \
+ static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, boolean) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { int _b = 0; \
_FTMEXT_METHOD_CHECK_BOOLEAN(p, m, _e, _n, _a, _b); _FTMEXT_METHOD_CHECK_INLET(m, _e, _MAXEXT_GET_INLET(_e)); \
_FTMEXT_GEN_METHOD_NAME(p, m) (_e, _b); _ftmext_exit_label: ; } \
static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, int _x) { if(0) goto _ftmext_exit_label; {
#define FTMEXT_METHOD_OBJECT(p, t, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_object_t *_o); \
- static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, object) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { fts_object_t *_o = NULL; \
+ static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, object) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { fts_object_t *_o = NULL; \
_FTMEXT_METHOD_CHECK_OBJECT(p, m, _e, t, _n, _a, _o); _FTMEXT_METHOD_CHECK_INLET(m, _e, _MAXEXT_GET_INLET(_e)); \
_FTMEXT_GEN_METHOD_NAME(p, m) (_e, _o); _ftmext_exit_label: ; } \
static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_object_t *_o) { if(0) goto _ftmext_exit_label; {
#define FTMEXT_METHOD_ANY(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_atom_t *_a); \
- static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, any) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+ static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, any) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
_FTMEXT_METHOD_CHECK_ANY(p, m, _e, _n, _a); _FTMEXT_METHOD_CHECK_INLET(m, _e, _MAXEXT_GET_INLET(_e)); \
_FTMEXT_CONVERT_REFERENCES(_e, _n, _a); \
_FTMEXT_GEN_METHOD_NAME(p, m) (_e, _a); _ftmext_exit_label: ; } \
static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_atom_t *_a) { if(0) goto _ftmext_exit_label; {
-#define FTMEXT_METHOD_VARARGS(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, int _n, fts_atom_t *_a); \
- static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, varargs) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+#define FTMEXT_METHOD_VARARGS(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, long _n, fts_atom_t *_a); \
+ static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, varargs) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
_FTMEXT_CONVERT_REFERENCES(_e, _n, _a); \
_FTMEXT_GEN_METHOD_NAME(p, m)(_e, _n, _a); } \
- static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, int _n, fts_atom_t *_a) { if(0) goto _ftmext_exit_label; {
+ static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, long _n, fts_atom_t *_a) { if(0) goto _ftmext_exit_label; {
-#define FTMEXT_METHOD_SELECTED(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a); \
- static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, selected) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+#define FTMEXT_METHOD_SELECTED(p, m) static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a); \
+ static void _FTMEXT_GEN_METHOD_NAME_TYPE(p, m, selected) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
_FTMEXT_CONVERT_REFERENCES(_e, _n, _a); \
_FTMEXT_GEN_METHOD_NAME(p, m)(_e, _s, _n, _a); } \
- static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { if(0) goto _ftmext_exit_label; {
+ static void _FTMEXT_GEN_METHOD_NAME(p, m) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { if(0) goto _ftmext_exit_label; {
-#define FTMEXT_METHOD_ANYTHING(p) static void _FTMEXT_GEN_METHOD_NAME(p, anything) (ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+#define FTMEXT_METHOD_ANYTHING(p) static void _FTMEXT_GEN_METHOD_NAME(p, anything) (ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
if(0) goto _ftmext_exit_label; \
_FTMEXT_CONVERT_REFERENCES(_e, _n, _a); { \
@@ -278,27 +284,27 @@
#define FTMEXT_CLASS_INLET_ANYTHING(p, d) _FTMEXT_CLASS_INLET(p, ftmext_pseudoclass_anything, -1, (d))
#define FTMEXT_CLASS_INLET_SIGNAL(p, i, d) ftmext_class_inlet(_c, (i), ftmext_pseudoclass_signal, (d))
-#define FTMEXT_INLET(p) static void p ## _inlet(ftmext_t *_e, int _wi, fts_symbol_t _s, int _n, fts_atom_t *_a); \
+#define FTMEXT_INLET(p) static void p ## _inlet(ftmext_t *_e, long _wi, fts_symbol_t _s, long _n, fts_atom_t *_a); \
/* static void _ ## p ## _inlet_bang(ftmext_t *_e) { p ## _inlet(_e, _MAXEXT_GET_INLET(_e), NULL, 0, NULL); } */ \
static void _ ## p ## _inlet_int(ftmext_t *_e, int _i) { fts_atom_t _a; fts_set_int(&_a, _i); p ## _inlet(_e, _MAXEXT_GET_INLET(_e), NULL, 1, &_a); } \
static void _ ## p ## _inlet_float(ftmext_t *_e, double _f) { fts_atom_t _a; fts_set_float(&_a, _f); p ## _inlet(_e, _MAXEXT_GET_INLET(_e), NULL, 1, &_a); } \
static void _ ## p ## _inlet_symbol(ftmext_t *_e, fts_symbol_t _r) { fts_atom_t _a; fts_set_symbol(&_a, _r); p ## _inlet(_e, _MAXEXT_GET_INLET(_e), NULL, 1, &_a); } \
- static void _ ## p ## _inlet_object(ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { int _wi = _MAXEXT_GET_INLET(_e); \
+ static void _ ## p ## _inlet_object(ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { long _wi = _MAXEXT_GET_INLET(_e); \
if(_n > 0) { \
if(fts_is_object(_a)) { p ## _inlet(_e, _wi, NULL, 1, _a); } \
else if(fts_is_symbol(_a)) { fts_object_t *_o = fts_object_get_from_symbol(fts_get_symbol(_a)); \
if(_o != NULL) { fts_atom_t _b; fts_set_object(&_b, _o); p ## _inlet(_e, _wi, NULL, 1, &_b); } \
- else { ftmext_error(_e, "inlet %d: invalid FTM object identifier: %s", _wi, fts_symbol_name(fts_get_symbol(_a))); } } \
- else { ftmext_error(_e, "inlet %d: invalid FTM object reference", _wi); } } \
- else { ftmext_error(_e, "inlet %d: missing FTM object reference", _wi); } } \
- static void _ ## p ## _inlet_list(ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+ else { ftmext_error(_e, "inlet %ld: invalid FTM object identifier: %s", _wi, fts_symbol_name(fts_get_symbol(_a))); } } \
+ else { ftmext_error(_e, "inlet %ld: invalid FTM object reference", _wi); } } \
+ else { ftmext_error(_e, "inlet %ld: missing FTM object reference", _wi); } } \
+ static void _ ## p ## _inlet_list(ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
_FTMEXT_CONVERT_REFERENCES(_e, _n, _a); \
if(_e->cl->inlet_mode != inlet_mode_dispatch_varargs) { p ## _inlet(_e, _MAXEXT_GET_INLET(_e), NULL, _n, _a); } \
- else { int _wi = _MAXEXT_GET_INLET(_e); int _i; if(_wi + _n > _e->n_inlets_ctl) _n = _e->n_inlets_ctl - _wi; for(_i=_n-1; _i>=0; _i--) p ## _inlet(_e, _wi + _i, NULL, 1, _a + _i); } } \
- static void _ ## p ## _inlet_anything(ftmext_t *_e, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+ else { long _wi = _MAXEXT_GET_INLET(_e); long _i; if(_wi + _n > _e->n_inlets_ctl) _n = _e->n_inlets_ctl - _wi; for(_i=_n-1; _i>=0; _i--) p ## _inlet(_e, _wi + _i, NULL, 1, _a + _i); } } \
+ static void _ ## p ## _inlet_anything(ftmext_t *_e, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
_FTMEXT_CONVERT_REFERENCES(_e, _n, _a); \
p ## _inlet(_e, _MAXEXT_GET_INLET(_e), _s, _n, _a); } \
- static void p ## _inlet(ftmext_t *_e, int _wi, fts_symbol_t _s, int _n, fts_atom_t *_a) { \
+ static void p ## _inlet(ftmext_t *_e, long _wi, fts_symbol_t _s, long _n, fts_atom_t *_a) { \
double _x = 0.0; fts_symbol_t _r = NULL; fts_object_t *_o = NULL; \
fts_class_t *_t = _FTMEXT_INLET_GET_TYPE(_e, _wi); int _tid = 99; if(_t != NULL) _tid = fts_class_get_id(_t); \
switch (_tid) { \
@@ -317,39 +323,119 @@
#endif
+
+
/****************************************************************************
*
* FTM Max/MSP external DSP method definition
*
*/
+
/* Max/MSP specific functions (defined in maxext.c) */
FTS_API void maxext_dsp_add(ftmext_t *ext, void *perform, t_signal **sp, int n);
+FTS_API void maxext_dsp_add64(ftmext_t *ext, void *perform64, t_object *dsp64, short *count, double samplerate, long maxvectorsize, long flags);
FTS_API int maxext_dsp_idle(ftmext_t *ext, float **outputs, int n_tick);
+FTS_API int maxext_dsp_idle64(ftmext_t *ext, double **outputs, int n_tick);
#ifndef DOXYGEN_DOC
+#if !defined(C74_MAX_SDK_VERSION) || C74_MAX_SDK_VERSION < 0x0610
+
+///////////////////////////////////////////////
+// create 32bit audio dsp chain for Max 5 and 6
+//
+
/* dsp initialization */
-#define FTMEXT_DSP_INIT(p) static void _FTMEXT_GEN_METHOD_NAME(_ ## p, dsp_init) (ftmext_t *_e, t_signal **_sp, short *count) { \
- int _dsp_size = _sp[0]->s_n; double _dsp_sr = _sp[0]->s_sr; void *_pr = (void *)_FTMEXT_GEN_METHOD_NAME(_ ## p, perform); int _i;\
- for(_i=0; _i<ftmext_get_inlets_dsp(_e); _i++) { ftmext_set_connected(_e, _i, count[_i]); } /* init inlet connected array */ \
- if(0) goto _ftmext_exit_label; {
+#define FTMEXT_DSP_INIT(p) \
+static void _FTMEXT_GEN_METHOD_NAME(_ ## p, dsp_init) (ftmext_t *_e, t_signal **_sp, short *count) \
+{ \
+ int _dsp_size = _sp[0]->s_n; \
+ double _dsp_sr = _sp[0]->s_sr; \
+ void *_pr = (void *)_FTMEXT_GEN_METHOD_NAME(_ ## p, perform); \
+ int _i; \
+ for (_i = 0; _i < ftmext_get_inlets_dsp(_e); _i++) { ftmext_set_connected(_e, _i, count[_i]); } /* init inlet connected array */ \
+ if(0) goto _ftmext_exit_label; \
+ {
-#define FTMEXT_GET_DSP_SR() (_dsp_sr)
-#define FTMEXT_GET_DSP_SIZE() (_dsp_size)
-#define FTMEXT_DSP_INIT_RETURN } maxext_dsp_add(_e, _pr, _sp, ftmext_get_inlets_dsp(_e) + ftmext_get_outlets_dsp(_e)); _ftmext_exit_label: ; }
+#define FTMEXT_DSP_INIT_RETURN \
+ } \
+ maxext_dsp_add(_e, _pr, _sp, ftmext_get_inlets_dsp(_e) + ftmext_get_outlets_dsp(_e)); \
+ _ftmext_exit_label: ; \
+}
+/* dsp performance */
+#define FTMEXT_DSP_PERFORM(p) \
+static t_int * _FTMEXT_GEN_METHOD_NAME(_ ## p, perform) (t_int *_dsp_words) \
+{ \
+ ftmext_t *_e = (ftmext_t *) (_dsp_words[1]); \
+ int _dsp_size = (int)(_dsp_words[2]); \
+ if (maxext_dsp_idle(_e, (float **)(_dsp_words + 3 + ftmext_get_inlets_dsp(_e)), _dsp_size)) \
+ goto _ftmext_exit_label; \
+ {
+
+#define FTMEXT_DSP_PERFORM_RETURN } _ftmext_exit_label: return (_dsp_words + 3 + ftmext_get_inlets_dsp(_e) + ftmext_get_outlets_dsp(_e)); }
+
+/* return pointers to signal buffers */
+//TODO: 64bit: return pointer to double t_sample
#define FTMEXT_GET_DSP_INPUT(i) ((float *)(_dsp_words[3 + (i)]))
#define FTMEXT_GET_DSP_OUTPUT(i) ((float *)(_dsp_words[3 + ftmext_get_inlets_dsp(_e) + (i)]))
+//
+// end 32 bit dsp chain
+///////////////////////
+
+#else
+
+/////////////////////////////////////////
+// create 64bit audio dsp chain for Max 7
+//
+
+/* dsp initialization */
+#define FTMEXT_DSP_INIT(p) \
+static void _FTMEXT_GEN_METHOD_NAME(_ ## p, dsp_init64) (ftmext_t *_e, t_object *dsp64, short *count, double samplerate, long maxvectorsize, long flags) \
+{ \
+ long _dsp_size = maxvectorsize; \
+ double _dsp_sr = samplerate; \
+ void *_pr = (void *)_FTMEXT_GEN_METHOD_NAME(_ ## p, perform64); \
+ int _i; \
+ for (_i = 0; _i < ftmext_get_inlets_dsp(_e); _i++) { ftmext_set_connected(_e, _i, count[_i]); } /* init inlet connected array */ \
+ if(0) goto _ftmext_exit_label; \
+ {
+
+#define FTMEXT_DSP_INIT_RETURN \
+ } \
+ maxext_dsp_add64(_e, _pr, dsp64, count, samplerate, maxvectorsize, flags); \
+ _ftmext_exit_label: ; \
+}
+
/* dsp performance */
-#define FTMEXT_DSP_PERFORM(p) static t_int * _FTMEXT_GEN_METHOD_NAME(_ ## p, perform) (t_int *_dsp_words) { \
- ftmext_t *_e = (ftmext_t *)(_dsp_words[1]); int _dsp_size = (int)(_dsp_words[2]); \
- if(maxext_dsp_idle(_e, (float **)(_dsp_words + 3 + ftmext_get_inlets_dsp(_e)), _dsp_size)) goto _ftmext_exit_label; {
+#define FTMEXT_DSP_PERFORM(p) \
+static void _FTMEXT_GEN_METHOD_NAME(_ ## p, perform64) (ftmext_t *_e, t_object *dsp64, double **ins, long numins, double **outs, long numouts, long sampleframes, long flags, void *userparam) \
+{ \
+ long _dsp_size = sampleframes; \
+ if (!maxext_dsp_idle64(_e, outs, _dsp_size)) \
+ {
-#define FTMEXT_DSP_PERFORM_RETURN } _ftmext_exit_label: return (_dsp_words + 3 + ftmext_get_inlets_dsp(_e) + ftmext_get_outlets_dsp(_e)); }
+#define FTMEXT_DSP_PERFORM_RETURN } _ftmext_exit_label: ; }
-#endif
+/* return pointers to signal buffers */
+//TODO: 64bit: return pointer to double t_sample
+#define FTMEXT_GET_DSP_INPUT(i) (ins[i])
+#define FTMEXT_GET_DSP_OUTPUT(i) (outs[i])
+//
+// end 64 bit dsp chain
+///////////////////////
+
+#endif // C74_MAX_SDK_VERSION < 0x0700
+
+// common macros valid within FTMEXT_DSP_INIT
+#define FTMEXT_GET_DSP_SR() (_dsp_sr)
+#define FTMEXT_GET_DSP_SIZE() (_dsp_size)
+
+#endif // DOXYGEN_DOC
+
+
/****************************************************************************
*
* FTM Max/MSP external actions and handlers
@@ -421,7 +507,7 @@
FTS_API char maxext_str_redefine[];
FTS_API void maxext_redefine(ftmext_t *ext);
-FTS_API void maxext_anything(ftmext_t *self, fts_symbol_t s, short ac, fts_atom_t *at);
+FTS_API void maxext_anything(ftmext_t *self, fts_symbol_t s, long ac, fts_atom_t *at);
/* Max/MSP specific functions (defined in maxpat.c) */
FTS_API t_object *maxpat_get_toplevel(t_object *pat);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2017-01-03 11:00:41
|
Revision: 3699
http://sourceforge.net/p/ftm/code/3699
Author: diemo
Date: 2017-01-03 11:00:39 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
20.10.2016: protect against deleted clock
Modified Paths:
--------------
trunk/ftm/ftmlib/max/maxext.c
Modified: trunk/ftm/ftmlib/max/maxext.c
===================================================================
--- trunk/ftm/ftmlib/max/maxext.c 2017-01-03 10:59:52 UTC (rev 3698)
+++ trunk/ftm/ftmlib/max/maxext.c 2017-01-03 11:00:39 UTC (rev 3699)
@@ -1060,7 +1060,8 @@
void
ftmext_alarm_reset(ftmext_t *ext)
{
- clock_unset(ext->head.clock);
+ if (ext->head.clock != NULL)
+ clock_unset(ext->head.clock);
}
/******************************************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2017-01-03 10:59:54
|
Revision: 3698
http://sourceforge.net/p/ftm/code/3698
Author: diemo
Date: 2017-01-03 10:59:52 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
19.10.2016: use long to avoid warnings
Modified Paths:
--------------
trunk/ftm/ftmlib/classes/datafiles.c
Modified: trunk/ftm/ftmlib/classes/datafiles.c
===================================================================
--- trunk/ftm/ftmlib/classes/datafiles.c 2017-01-03 10:59:00 UTC (rev 3697)
+++ trunk/ftm/ftmlib/classes/datafiles.c 2017-01-03 10:59:52 UTC (rev 3698)
@@ -208,11 +208,11 @@
if(sf != NULL)
{
- int m = fts_audiofile_get_num_frames(sf);
- int n = fts_audiofile_get_num_channels(sf);
- int wanted = 0; /* number of sample frames to load */
- int offset = 0;
- int channel = 0;
+ long m = fts_audiofile_get_num_frames(sf);
+ long n = fts_audiofile_get_num_channels(sf);
+ long wanted = 0; /* number of sample frames to load */
+ long offset = 0;
+ long channel = 0;
double resample_sr = 0; /* resample if not zero */
/* parse further import arguments <offset> <length> <channel> <sr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2017-01-03 10:59:03
|
Revision: 3697
http://sourceforge.net/p/ftm/code/3697
Author: diemo
Date: 2017-01-03 10:59:00 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
19.10.2016: use long ac, size args in messages called by max, use Max types transparent to 32/64bit for attribute values and enums
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.mess.c
trunk/ftm/externals/max5/ftm.object.c
trunk/ftm/ftmlib/audiofile.c
trunk/ftm/ftmlib/audiofile.h
trunk/ftm/ftmlib/classes/ftmdatagui.c
trunk/ftm/ftmlib/ftmext.h
trunk/ftm/ftmlib/max5/ftmtypes.h
Modified: trunk/ftm/externals/max5/ftm.mess.c
===================================================================
--- trunk/ftm/externals/max5/ftm.mess.c 2017-01-03 10:46:25 UTC (rev 3696)
+++ trunk/ftm/externals/max5/ftm.mess.c 2017-01-03 10:59:00 UTC (rev 3697)
@@ -54,6 +54,8 @@
static void debug_post(const char *format, ...){}
#endif
+// #define DEBUG_REF_COUNT 1
+
#define MAX_LINES 1024
#define MAX_CHARS 4096
@@ -104,11 +106,11 @@
fts_array_t args_tail; /* fake array referring to input array for $| */
fts_array_t *lists; /* array of list inputs */
- int triggerall;
- int loadbang;
- int untuple;
+ t_atom_long triggerall;
+ t_atom_long loadbang;
+ t_atom_long untuple;
- fts_mutex_t mutex;
+ fts_mutex_t mutex; // initialised as a reursive mutex!
int pressed;
@@ -1225,7 +1227,7 @@
}
static void
-ftmmess_set_initexpression(ftmmess_t *self, fts_symbol_t s, short ac, fts_atom_t *at)
+ftmmess_set_initexpression(ftmmess_t *self, fts_symbol_t s, long ac, fts_atom_t *at)
{
fts_scope_t *scope = ftmext_get_scope((ftmext_t *)self);
@@ -1363,8 +1365,8 @@
indent[i] = '.';
indent[i+1] = 0;
nest++;
- fts_log ("ftm.mess %p%s eval '%s'\n", self, indent, self->text.ptr);
- fts_post("ftm.mess %p%s eval '%s'\n", self, indent, self->text.ptr);
+ //fts_log ("ftm.mess %p%s eval '%s'\n", self, indent, self->text.ptr);
+ fts_post("ftm.mess %p %d%s eval '%s'\n", self, nest, indent, self->text.ptr);
#endif
fts_expression_set_privates(self->messexpression, &self->privates);
@@ -1380,9 +1382,9 @@
self->messexpression_evaluation_status = fts_ok;
#ifdef DEBUG_REF_COUNT
+ //fts_log ("ftm.mess %p%s finished '%s'\n", self, indent, self->text.ptr);
+ fts_post("ftm.mess %p %d%s finished '%s'\n", self, nest, indent, self->text.ptr);
nest--;
- fts_log ("ftm.mess %p%s finished '%s'\n", self, indent, self->text.ptr);
- fts_post("ftm.mess %p%s finished '%s'\n", self, indent, self->text.ptr);
#endif
}
else
@@ -1466,7 +1468,7 @@
}
static void
-ftmmess_set_messexpression(t_object *o, fts_symbol_t s, short ac, fts_atom_t *at)
+ftmmess_set_messexpression(t_object *o, fts_symbol_t s, long ac, fts_atom_t *at)
{
ftmmess_t *self = (ftmmess_t *)o;
@@ -1880,7 +1882,7 @@
/* FTM 2.3 compatibility */
static void
-ftmmess_ftm23_restore(ftmmess_t *self, fts_symbol_t s, short ac, fts_atom_t *at)
+ftmmess_ftm23_restore(ftmmess_t *self, fts_symbol_t s, long ac, fts_atom_t *at)
{
self->tobeactivated = 0;
Modified: trunk/ftm/externals/max5/ftm.object.c
===================================================================
--- trunk/ftm/externals/max5/ftm.object.c 2017-01-03 10:46:25 UTC (rev 3696)
+++ trunk/ftm/externals/max5/ftm.object.c 2017-01-03 10:59:00 UTC (rev 3697)
@@ -1347,7 +1347,7 @@
}
static void
-ftmobj_imexport(ftmobj_t *self, fts_symbol_t message, short ac, fts_atom_t *at)
+ftmobj_imexport(ftmobj_t *self, fts_symbol_t message, long ac, fts_atom_t *at)
{
fts_atom_t *value = ftm_context_get_value(&self->context);
@@ -1439,7 +1439,7 @@
#pragma mark intput/output methods
static void
-ftmobj_forward_to_object(ftmobj_t *self, fts_symbol_t s, short ac, fts_atom_t *at)
+ftmobj_forward_to_object(ftmobj_t *self, fts_symbol_t s, long ac, fts_atom_t *at)
{
if(self->obj != NULL)
{
@@ -1772,7 +1772,7 @@
/* FTM 2.3 compatibilty */
static void
-ftmobj_ftm23_restore(ftmobj_t *self, fts_symbol_t s, short ac, fts_atom_t *at)
+ftmobj_ftm23_restore(ftmobj_t *self, fts_symbol_t s, long ac, fts_atom_t *at)
{
self->tobeactivated = 0;
Modified: trunk/ftm/ftmlib/audiofile.c
===================================================================
--- trunk/ftm/ftmlib/audiofile.c 2017-01-03 10:46:25 UTC (rev 3696)
+++ trunk/ftm/ftmlib/audiofile.c 2017-01-03 10:59:00 UTC (rev 3697)
@@ -247,11 +247,11 @@
}
int
-fts_audiofile_read(fts_audiofile_t *audiofile, float **buf, int n_buf, int size)
+fts_audiofile_read(fts_audiofile_t *audiofile, float **buf, int n_buf, long size)
{
int n_channels = audiofile->sfinfo.channels;
float *buffer = (float *)alloca(sizeof(float) * size * n_channels);
- int n, i, j, k;
+ long n, i, j, k;
n = sf_read_float(audiofile->sfhandle, buffer, size * n_channels);
@@ -266,7 +266,7 @@
}
int
-fts_audiofile_read_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, int size)
+fts_audiofile_read_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, long size)
{
if(n_channels == audiofile->sfinfo.channels)
return sf_read_float(audiofile->sfhandle, buf, size * n_channels) / n_channels;
@@ -275,11 +275,11 @@
}
int
-fts_audiofile_write(fts_audiofile_t *audiofile, float **buf, int n_buf, int size)
+fts_audiofile_write(fts_audiofile_t *audiofile, float **buf, int n_buf, long size)
{
int n_channels = audiofile->sfinfo.channels;
float *buffer = (float *)alloca(sizeof(float) * size * n_channels);
- int n, i, j, k;
+ long n, i, j, k;
if(n_buf > n_channels)
n_buf = n_channels;
@@ -300,7 +300,7 @@
}
int
-fts_audiofile_write_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, int size)
+fts_audiofile_write_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, long size)
{
if(n_channels == audiofile->sfinfo.channels)
return sf_write_float(audiofile->sfhandle, buf, size * n_channels) / n_channels;
@@ -311,7 +311,7 @@
/** set read position to sample frame given in offset */
int
-fts_audiofile_seek(fts_audiofile_t *audiofile, int offset)
+fts_audiofile_seek(fts_audiofile_t *audiofile, long offset)
{
int status = sf_seek(audiofile->sfhandle, offset, SEEK_SET);
return status != -1;
Modified: trunk/ftm/ftmlib/audiofile.h
===================================================================
--- trunk/ftm/ftmlib/audiofile.h 2017-01-03 10:46:25 UTC (rev 3696)
+++ trunk/ftm/ftmlib/audiofile.h 2017-01-03 10:59:00 UTC (rev 3697)
@@ -95,13 +95,13 @@
FTS_API fts_audiofile_t *fts_audiofile_open_write(fts_symbol_t filename, int channels, int sr, fts_symbol_t format, fts_symbol_t sample_format);
FTS_API void fts_audiofile_close(fts_audiofile_t *aufile);
-FTS_API int fts_audiofile_write(fts_audiofile_t *audiofile, float **buf, int n_buf, int buflen);
-FTS_API int fts_audiofile_read(fts_audiofile_t *audiofile, float **buf, int n_buf, int buflen);
-FTS_API int fts_audiofile_write_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, int buflen);
-FTS_API int fts_audiofile_read_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, int buflen);
+FTS_API int fts_audiofile_write(fts_audiofile_t *audiofile, float **buf, int n_buf, long buflen);
+FTS_API int fts_audiofile_read(fts_audiofile_t *audiofile, float **buf, int n_buf, long buflen);
+FTS_API int fts_audiofile_write_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, long buflen);
+FTS_API int fts_audiofile_read_interleaved(fts_audiofile_t *audiofile, float *buf, int n_channels, long buflen);
/** set read position to sample frame given in offset */
-FTS_API int fts_audiofile_seek(fts_audiofile_t *audiofile, int offset);
+FTS_API int fts_audiofile_seek(fts_audiofile_t *audiofile, long offset);
/** get markers from audio file */
FTS_API int fts_audiofile_get_markers (fts_audiofile_t *audiofile,
Modified: trunk/ftm/ftmlib/classes/ftmdatagui.c
===================================================================
--- trunk/ftm/ftmlib/classes/ftmdatagui.c 2017-01-03 10:46:25 UTC (rev 3696)
+++ trunk/ftm/ftmlib/classes/ftmdatagui.c 2017-01-03 10:59:00 UTC (rev 3697)
@@ -44,7 +44,7 @@
}
static void
-object_get_all_interfaces(void *obj, void *context, int *ac, char *interfaces[], char *public_names[])
+object_get_all_interfaces(void *obj, void *context, int *ac, const char *interfaces[], const char *public_names[])
{
fts_class_t *cl = fts_object_get_class((fts_object_t *)obj);
fts_iterator_t iter;
@@ -69,7 +69,7 @@
}
static void
-seqtrack_get_possible_interfaces(void *obj, void *context, int *ac, char *interfaces[], char *public_names[])
+seqtrack_get_possible_interfaces(void *obj, void *context, int *ac, const char *interfaces[], const char *public_names[])
{
fts_class_t *cl = fts_object_get_class((fts_object_t *)obj);
fts_iterator_t iter;
@@ -139,7 +139,7 @@
}
static void
-fmat_get_possible_interfaces(void *obj, void *context, int *ac, char *interfaces[], char *public_names[])
+fmat_get_possible_interfaces(void *obj, void *context, int *ac, const char *interfaces[], const char *public_names[])
{
fts_class_t *cl = fts_object_get_class((fts_object_t *)obj);
fts_iterator_t iter;
@@ -200,7 +200,7 @@
}
static void
-mat_get_possible_interfaces(void *obj, void *context, int *ac, char *interfaces[], char *public_names[])
+mat_get_possible_interfaces(void *obj, void *context, int *ac, const char *interfaces[], const char *public_names[])
{
fts_class_t *cl = fts_object_get_class((fts_object_t *)obj);
fts_iterator_t iter;
@@ -5841,7 +5841,7 @@
}
static void *
-sequence_gui_sonogram_get_by_time(void *obj, void *context, double the_time, double *time, void **value, int *rows, int *cols, float **ptr)
+sequence_gui_sonogram_get_by_time(void *obj, void *context, double the_time, double *time, void **value, int *rows, int *cols, float **ptr, int *whatever)
{
event_t *evt;
sequence_t *sequence = (sequence_t *)obj;
@@ -6790,7 +6790,7 @@
}
static void *
-track_gui_sonogram_get_by_time(void *obj, void *context, double the_time, double *time, void **value, int *rows, int *cols, float **ptr)
+track_gui_sonogram_get_by_time(void *obj, void *context, double the_time, double *time, void **value, int *rows, int *cols, float **ptr, int *index_to_be_completed)
{
event_t *evt = sequence_get_event_by_time( track_get_events((track_t *)obj), the_time);
if(evt != NULL)
@@ -9026,7 +9026,7 @@
}
static void
-fmat_gui_scatterplot_get_label(void *obj, void *context, int connectionsTrackIndex, int nodeIndex, char **text, double *labelXOffset, double *labelYOffset, double *labelPosition,
+fmat_gui_scatterplot_get_label(void *obj, void *context, int connectionsTrackIndex, int nodeIndex, const char **text, double *labelXOffset, double *labelYOffset, double *labelPosition,
double *labelColor, double *labelOpacity, double *labelFontSize, double *labelFontStyle,
int labelTextColIndex, int labelXOffsetColIndex, int labelYOffsetColIndex, int labelPositionColIndex,
int labelColorColIndex, int labelOpacityColIndex, int labelFontSizeColIndex, int labelFontStyleColIndex)
@@ -9472,7 +9472,7 @@
}
static void
-mat_gui_scatterplot_get_label(void *obj, void *context, int connectionTrackIndex, int nodeIndex, char **text, double *labelXOffset, double *labelYOffset, double *labelPosition,
+mat_gui_scatterplot_get_label(void *obj, void *context, int connectionTrackIndex, int nodeIndex, const char **text, double *labelXOffset, double *labelYOffset, double *labelPosition,
double *labelColor, double *labelOpacity, double *labelFontSize, double *labelFontStyle,
int labelTextColIndex, int labelXOffsetColIndex, int labelYOffsetColIndex, int labelPositionColIndex,
int labelColorColIndex, int labelOpacityColIndex, int labelFontSizeColIndex, int labelFontStyleColIndex)
Modified: trunk/ftm/ftmlib/ftmext.h
===================================================================
--- trunk/ftm/ftmlib/ftmext.h 2017-01-03 10:46:25 UTC (rev 3696)
+++ trunk/ftm/ftmlib/ftmext.h 2017-01-03 10:59:00 UTC (rev 3697)
@@ -266,7 +266,7 @@
} while (0)
#define _FTMEXT_METHOD_CHECK_INLET(m, e, i) do { \
- int _wi = (i); if(_wi != 0) { ftmext_error((e), "inlet %d: doesn't understand message '%s'", (_wi), #m); goto _ftmext_exit_label; } \
+ long _wi = (i); if(_wi != 0) { ftmext_error((e), "inlet %ld: doesn't understand message '%s'", (_wi), #m); goto _ftmext_exit_label; } \
} while(0)
/******************************************************************************
Modified: trunk/ftm/ftmlib/max5/ftmtypes.h
===================================================================
--- trunk/ftm/ftmlib/max5/ftmtypes.h 2017-01-03 10:46:25 UTC (rev 3696)
+++ trunk/ftm/ftmlib/max5/ftmtypes.h 2017-01-03 10:59:00 UTC (rev 3697)
@@ -153,9 +153,9 @@
t_pxjbox head;
t_object *patcher;
t_atom_long ftm_scope_flags;
- int ftm_objref_conv;
+ t_atom_long ftm_objref_conv;
void **proxies;
- int n_proxies;
+ long n_proxies;
long inlet;
void **outlets;
void *clock;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2017-01-03 10:46:28
|
Revision: 3696
http://sourceforge.net/p/ftm/code/3696
Author: diemo
Date: 2017-01-03 10:46:25 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
Summary: Stefano Fasciani: make script work with dirs with spaces
Modified Paths:
--------------
trunk/ftm/util/install-mxo.sh
Modified: trunk/ftm/util/install-mxo.sh
===================================================================
--- trunk/ftm/util/install-mxo.sh 2016-12-13 10:24:55 UTC (rev 3695)
+++ trunk/ftm/util/install-mxo.sh 2017-01-03 10:46:25 UTC (rev 3696)
@@ -32,7 +32,8 @@
FTMLIB_FRAMEWORK_RELATIVE='@loader_path/../../../ftm.mxo/Contents/MacOS/ftm'
echo "[patching dynamic library"
-echo " from '$FTMLIB_FRAMEWORK'"
+echo " from '$FTMLIB_FRAMEWORK32'"
+echo " and '$FTMLIB_FRAMEWORK64'"
echo " to '$FTMLIB_FRAMEWORK_RELATIVE'"
echo " in '$objsrc']"
@@ -47,15 +48,15 @@
sf1=/Applications/Xcode.app/Contents/Developer/usr/bin/SetFile
if [ -f $sf1 ]; then
- $sf1 -a B $proddir
+ $sf1 -a B "$proddir"
else
- $sf2 -a B $proddir
+ $sf2 -a B "$proddir"
fi
# remove target for clean install with current date and flags for directories
echo "[removing $installdir]"
-rm -fr $installdir
+rm -fr "$installdir"
# copy to install dir with all attributes and resources
-echo "[installing $prod as $installdir]"
-ditto --rsrc $proddir $installdir
+echo "[installing $prod from $proddir as $installdir]"
+ditto --rsrc "$proddir" "$installdir"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-12-13 10:24:57
|
Revision: 3695
http://sourceforge.net/p/ftm/code/3695
Author: diemo
Date: 2016-12-13 10:24:55 +0000 (Tue, 13 Dec 2016)
Log Message:
-----------
- use target name without spaces to make install-mxo.sh script in ftm-and-co/ftm/utils work more reliably
- switch on int conversion warnings
- macos10.6
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
Modified: trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2016-12-12 19:23:59 UTC (rev 3694)
+++ trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2016-12-13 10:24:55 UTC (rev 3695)
@@ -1238,7 +1238,7 @@
buildConfigurationList = 3B5DEDD60861C3ED00B9AEEA /* Build configuration list for PBXNativeTarget "ftm.mess" */;
buildPhases = (
3B1B84C706D4EE19009827F3 /* Sources */,
- 5C463281079D087D00A03F83 /* ShellScript */,
+ 5C463281079D087D00A03F83 /* install-mxo */,
);
buildRules = (
);
@@ -2155,20 +2155,22 @@
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\n\n";
};
- 5C463281079D087D00A03F83 /* ShellScript */ = {
+ 5C463281079D087D00A03F83 /* install-mxo */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"build/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)",
+ "$PROJECT_DIR/../../../util/install-mxo.sh",
);
+ name = "install-mxo";
outputPaths = (
"$(EXTERNALS_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)",
);
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\n\n";
+ 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";
};
5C463282079D089100A03F83 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -2387,13 +2389,14 @@
);
inputPaths = (
"build/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)",
+ "$PROJECT_DIR/../../../util/install-mxo.sh",
);
outputPaths = (
"$(EXTERNALS_DIR)/$(PRODUCT_NAME).$(WRAPPER_EXTENSION)",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "/bin/sh -x $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\n";
+ 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";
};
5CD47CEC0FBD800400A9AC30 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
@@ -2878,6 +2881,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
+ CLANG_WARN_ENUM_CONVERSION = YES;
COMPONENTS_DIR = ../../../../components;
COMPONENT_LIBS = "$(SDIF_LIBS) $(SNDFILE_LIBS)";
COPYING_PRESERVES_HFS_DATA = YES;
@@ -2905,7 +2909,10 @@
"$(VERSION_MACROS)",
"C_GUI_INTERFACE=1",
);
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+ GCC_WARN_SIGN_COMPARE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
@@ -2927,6 +2934,7 @@
"$(MAX_FRAMEWORKS)",
"$(FTM_FRAMEWORKS)",
"$(COMPONENT_LIBS)",
+ "-headerpad_max_install_names",
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
@@ -3570,6 +3578,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
+ CLANG_WARN_ENUM_CONVERSION = YES;
COMPONENTS_DIR = ../../../../components;
COMPONENT_LIBS = "$(SDIF_LIBS) $(SNDFILE_LIBS)";
COPYING_PRESERVES_HFS_DATA = YES;
@@ -3592,7 +3601,10 @@
GCC_PREFIX_HEADER = "$(MAXAPI_DIR)/max-includes/macho-prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
GCC_UNROLL_LOOPS = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+ GCC_WARN_SIGN_COMPARE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
@@ -3604,7 +3616,6 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
@@ -3615,6 +3626,7 @@
"$(MAX_FRAMEWORKS)",
"$(FTM_FRAMEWORKS)",
"$(COMPONENT_LIBS)",
+ "-headerpad_max_install_names",
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
@@ -4036,6 +4048,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
+ CLANG_WARN_ENUM_CONVERSION = YES;
COMPONENTS_DIR = ../../../../components;
COMPONENT_LIBS = "$(SDIF_LIBS) $(SNDFILE_LIBS)";
COPYING_PRESERVES_HFS_DATA = YES;
@@ -4059,7 +4072,10 @@
"DEBUG=1",
"$(VERSION_MACROS)",
);
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
+ GCC_WARN_SIGN_COMPARE = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_VARIABLE = YES;
GENERATE_PKGINFO_FILE = YES;
HEADER_SEARCH_PATHS = (
@@ -4071,7 +4087,6 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
ONLY_ACTIVE_ARCH = NO;
@@ -4083,6 +4098,7 @@
"$(MAX_FRAMEWORKS)",
"$(FTM_FRAMEWORKS)",
"$(COMPONENT_LIBS)",
+ "-headerpad_max_install_names",
);
PRODUCT_NAME = install;
SDIF_DIR = "$(COMPONENTS_DIR)/sdif";
@@ -4100,6 +4116,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_LINK_OBJC_RUNTIME = NO;
+ CLANG_WARN_ENUM_CONVERSION = YES;
COMPONENTS_DIR = ../../../../components;
COMPONENT_LIBS = "$(SDIF_LIBS) $(SNDFILE_LIBS)";
COPYING_PRESERVES_HFS_DATA = YES;
@@ -4120,11 +4137,12 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "$(MAXAPI_DIR)/max-includes/macho-prefix.pch";
GCC_UNROLL_LOOPS = YES;
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES;
GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
GCC_WARN_SIGN_COMPARE = YES;
- GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
GCC_WARN_UNUSED_FUNCTION = NO;
GCC_WARN_UNUSED_PARAMETER = NO;
@@ -4140,7 +4158,6 @@
);
INFOPLIST_FILE = ftmexternal.plist;
JUCE_DIR = "$(COMPONENTS_DIR)/juce";
- MACOSX_DEPLOYMENT_TARGET = 10.6;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
MAX_FRAMEWORKS = "-framework MaxAPI -framework MaxAudioAPI";
OTHER_LDFLAGS = (
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2016-12-12 19:23:59 UTC (rev 3694)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2016-12-13 10:24:55 UTC (rev 3695)
@@ -1620,9 +1620,9 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */
- 2125AFF31BA6F85900D5349C /* ftm.mxo max6 64bit */ = {
+ 2125AFF31BA6F85900D5349C /* ftm.mxo-max6-64bit */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 2125B0771BA6F85900D5349C /* Build configuration list for PBXNativeTarget "ftm.mxo max6 64bit" */;
+ buildConfigurationList = 2125B0771BA6F85900D5349C /* Build configuration list for PBXNativeTarget "ftm.mxo-max6-64bit" */;
buildPhases = (
2125AFF41BA6F85900D5349C /* Resources */,
2125AFF51BA6F85900D5349C /* Sources */,
@@ -1634,7 +1634,7 @@
);
dependencies = (
);
- name = "ftm.mxo max6 64bit";
+ name = "ftm.mxo-max6-64bit";
productName = ftm.mxo;
productReference = 2125B07C1BA6F85900D5349C /* ftm.mxo */;
productType = "com.apple.product-type.bundle";
@@ -1786,7 +1786,7 @@
5CA214530DA59AEB00FA6B15 /* doc */,
3BE2BBFF15F752F9008368F4 /* ftm.mxo */,
2195C5A81B908DC50035FEBD /* ftm.mxo 32bit */,
- 2125AFF31BA6F85900D5349C /* ftm.mxo max6 64bit */,
+ 2125AFF31BA6F85900D5349C /* ftm.mxo-max6-64bit */,
21901A3E1760BB8A00024867 /* mapfuns_test */,
);
};
@@ -2351,6 +2351,7 @@
"$(VERSION_MACROS)",
"C_GUI_INTERFACE=1",
);
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
INFOPLIST_FILE = ftmexternal.plist;
@@ -2366,6 +2367,7 @@
);
PREBINDING = YES;
PRODUCT_NAME = ftm;
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
};
name = Debug;
@@ -2391,6 +2393,7 @@
"$(VERSION_MACROS)",
"C_GUI_INTERFACE=1",
);
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_EXPAND_BUILD_SETTINGS = YES;
INFOPLIST_FILE = ftmexternal.plist;
@@ -2406,6 +2409,7 @@
);
PREBINDING = YES;
PRODUCT_NAME = ftm;
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
};
name = Debug_optimised;
@@ -2428,6 +2432,7 @@
"$(VERSION_MACROS)",
"C_GUI_INTERFACE=1",
);
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
MAXAPI_DIR = "${COMPONENTS_DIR}/maxapi/max6.1";
@@ -2441,6 +2446,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = ftm;
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
};
name = Debug_harder;
@@ -2464,6 +2470,7 @@
"$(VERSION_MACROS)",
"C_GUI_INTERFACE=1",
);
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GENERATE_PKGINFO_FILE = YES;
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
@@ -2478,6 +2485,7 @@
);
PREBINDING = NO;
PRODUCT_NAME = ftm;
+ SDKROOT = macosx10.6;
WRAPPER_EXTENSION = mxo;
ZERO_LINK = NO;
};
@@ -3392,7 +3400,7 @@
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
- 2125B0771BA6F85900D5349C /* Build configuration list for PBXNativeTarget "ftm.mxo max6 64bit" */ = {
+ 2125B0771BA6F85900D5349C /* Build configuration list for PBXNativeTarget "ftm.mxo-max6-64bit" */ = {
isa = XCConfigurationList;
buildConfigurations = (
2125B0781BA6F85900D5349C /* Debug */,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-12-12 19:24:00
|
Revision: 3694
http://sourceforge.net/p/ftm/code/3694
Author: diemo
Date: 2016-12-12 19:23:59 +0000 (Mon, 12 Dec 2016)
Log Message:
-----------
try dependent library path fixing for all architectures
Modified Paths:
--------------
trunk/ftm/util/install-mxo.sh
Modified: trunk/ftm/util/install-mxo.sh
===================================================================
--- trunk/ftm/util/install-mxo.sh 2016-09-27 21:35:58 UTC (rev 3693)
+++ trunk/ftm/util/install-mxo.sh 2016-12-12 19:23:59 UTC (rev 3694)
@@ -26,8 +26,9 @@
objsrc=$proddir/Contents/MacOS/$base
objinstall=$installdir/Contents/MacOS/$base
-FTMLIB_FRAMEWORK=`otool -L -arch i386 $objsrc | grep ftm.mxo | awk '{print $1}'`
-#FTMLIB_FRAMEWORK_RELATIVE=`perl -e '$_ = shift; s(.*/(ftm.mxo))(\@loader_path/../../../$1); print $_;' $FTMLIB_FRAMEWORK`
+FTMLIB_FRAMEWORK32=`otool -L -arch i386 $objsrc | perl -n -e 'm|^\s*(.*/ftm.mxo.*/ftm)| && print $1'`
+FTMLIB_FRAMEWORK64=`otool -L -arch x86_64 $objsrc | perl -n -e 'm|^\s*(.*/ftm.mxo.*/ftm)| && print $1'`
+#FTMLIB_FRAMEWORK_RELATIVE=`perl -e '$_ = shift; s(.*/(ftm.mxo/.*/ftm))(\@loader_path/../../../$1); print $_;' $FTMLIB_FRAMEWORK`
FTMLIB_FRAMEWORK_RELATIVE='@loader_path/../../../ftm.mxo/Contents/MacOS/ftm'
echo "[patching dynamic library"
@@ -35,8 +36,12 @@
echo " to '$FTMLIB_FRAMEWORK_RELATIVE'"
echo " in '$objsrc']"
-install_name_tool -change $FTMLIB_FRAMEWORK $FTMLIB_FRAMEWORK_RELATIVE $objsrc
+install_name_tool -change "$FTMLIB_FRAMEWORK32" "$FTMLIB_FRAMEWORK_RELATIVE" -change "$FTMLIB_FRAMEWORK64" "$FTMLIB_FRAMEWORK_RELATIVE" "$objsrc"
+# check:
+# echo install_name_tool -change "$FTMLIB_FRAMEWORK32" "$FTMLIB_FRAMEWORK_RELATIVE" -change "$FTMLIB_FRAMEWORK64" "$FTMLIB_FRAMEWORK_RELATIVE" "$objsrc"
+# otool -L $objsrc
+
# set bundle bit for mxo's (on some installations, they show up as directories)
sf1=/Developer/Tools/SetFile
sf1=/Applications/Xcode.app/Contents/Developer/usr/bin/SetFile
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-09-27 21:36:00
|
Revision: 3693
http://sourceforge.net/p/ftm/code/3693
Author: diemo
Date: 2016-09-27 21:35:58 +0000 (Tue, 27 Sep 2016)
Log Message:
-----------
fix see also
Modified Paths:
--------------
trunk/ftm/patches/max5/help/ftm.sdif.write.maxhelp
Modified: trunk/ftm/patches/max5/help/ftm.sdif.write.maxhelp
===================================================================
--- trunk/ftm/patches/max5/help/ftm.sdif.write.maxhelp 2016-09-27 21:35:41 UTC (rev 3692)
+++ trunk/ftm/patches/max5/help/ftm.sdif.write.maxhelp 2016-09-27 21:35:58 UTC (rev 3693)
@@ -1,23 +1,41 @@
{
"patcher" : {
"fileversion" : 1,
- "rect" : [ 130.0, 218.0, 1077.0, 594.0 ],
+ "appversion" : {
+ "major" : 7,
+ "minor" : 2,
+ "revision" : 4,
+ "architecture" : "x86",
+ "modernui" : 1
+ }
+,
+ "rect" : [ 580.0, 390.0, 1077.0, 594.0 ],
"bglocked" : 0,
- "defrect" : [ 130.0, 218.0, 1077.0, 594.0 ],
- "openrect" : [ 0.0, 0.0, 0.0, 0.0 ],
"openinpresentation" : 0,
"default_fontsize" : 10.0,
"default_fontface" : 0,
"default_fontname" : "Verdana",
- "gridonopen" : 0,
+ "gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
- "gridsnaponopen" : 0,
+ "gridsnaponopen" : 1,
+ "objectsnaponopen" : 1,
+ "statusbarvisible" : 2,
"toolbarvisible" : 1,
+ "lefttoolbarpinned" : 0,
+ "toptoolbarpinned" : 0,
+ "righttoolbarpinned" : 0,
+ "bottomtoolbarpinned" : 0,
+ "toolbars_unpinned_last_save" : 0,
+ "tallnewobj" : 0,
"boxanimatetime" : 200,
- "imprint" : 0,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
+ "description" : "",
+ "digest" : "",
+ "tags" : "",
+ "style" : "",
+ "subpatcher_template" : "",
"boxes" : [ {
"box" : {
"fontname" : "Verdana",
@@ -28,7 +46,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 645.0, 367.0, 240.0, 31.0 ],
- "presentation_rect" : [ 719.0, 419.0, 0.0, 0.0 ],
+ "style" : "",
"text" : "reserve n frame-slots for the write message, without adding inlets, repeat last framespec"
}
@@ -42,8 +60,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 585.0, 368.0, 58.0, 17.0 ],
- "presentation_rect" : [ 674.0, 419.0, 0.0, 0.0 ],
+ "patching_rect" : [ 585.0, 368.0, 58.0, 21.0 ],
+ "style" : "",
"text" : "reserve 5"
}
@@ -57,7 +75,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 645.0, 345.0, 224.0, 19.0 ],
- "presentation_rect" : [ 643.0, 33.0, 0.0, 0.0 ],
+ "style" : "",
"text" : "post framespec to console for debug"
}
@@ -71,8 +89,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 585.0, 345.0, 34.0, 17.0 ],
- "presentation_rect" : [ 129.0, 316.0, 0.0, 0.0 ],
+ "patching_rect" : [ 585.0, 345.0, 34.0, 21.0 ],
+ "style" : "",
"text" : "print"
}
@@ -83,6 +101,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -93,8 +112,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 795.0, 330.0, 317.958984, 17.0 ],
- "presentation_rect" : [ 795.0, 330.0, 317.958984, 17.0 ],
+ "patching_rect" : [ 795.0, 330.0, 315.775391, 17.0 ],
+ "presentation_rect" : [ 795.0, 330.0, 315.775391, 17.0 ],
"text" : [ "_writehr <time-offset> <time error correction> $t1 $t2 ... $tn" ]
}
@@ -105,6 +124,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -114,8 +134,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 587.0, 323.0, 201.0, 17.0 ],
- "presentation_rect" : [ 587.0, 323.0, 201.0, 17.0 ],
+ "patching_rect" : [ 587.0, 323.0, 181.004883, 17.0 ],
+ "presentation_rect" : [ 587.0, 323.0, 181.004883, 17.0 ],
"text" : [ "_write <time-offset> $t1 $t2 ... $tn" ]
}
@@ -130,19 +150,24 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 590.0, 278.0, 265.0, 36.0 ],
+ "style" : "",
"text" : "Interleaved write of any number of tracks or sequences of numbers of matrices :"
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.909804, 0.701961, 0.0, 1.0 ],
"id" : "obj-3",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 587.0, 273.0, 263.0, 44.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
@@ -155,6 +180,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 263.0, 157.0, 272.0, 19.0 ],
+ "style" : "",
"text" : "define new types according to type definition syntax"
}
@@ -165,6 +191,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -175,9 +202,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 621.0, 432.0, 383.0, 29.0 ],
+ "patching_rect" : [ 621.0, 432.0, 380.0, 29.0 ],
"presentation_linecount" : 2,
- "presentation_rect" : [ 621.0, 432.0, 383.0, 29.0 ],
+ "presentation_rect" : [ 621.0, 432.0, 380.0, 29.0 ],
"text" : [ "_'1MTD <matrix-signature> { <column1>, <column2>... }", "_ 1FTD <frame-signature> { <matrix-signature1> <matrix-role1>; ... }'" ]
}
@@ -191,20 +218,25 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 625.0, 408.0, 146.0, 21.0 ],
+ "style" : "",
"text" : "type definition syntax:"
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.294118, 0.356863, 0.678431, 1.0 ],
"border" : 1,
"id" : "obj-7",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 618.0, 401.0, 389.0, 72.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
@@ -218,6 +250,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 252.0, 54.0, 212.0, 43.0 ],
+ "style" : "",
"text" : "Give the sdif frame and matrix types as tuple arguments if they are different : (see framespec syntax)"
}
@@ -228,6 +261,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -238,9 +272,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 23.0, 511.0, 216.0, 41.0 ],
+ "patching_rect" : [ 23.0, 511.0, 204.0, 41.0 ],
"presentation_linecount" : 3,
- "presentation_rect" : [ 23.0, 511.0, 216.0, 41.0 ],
+ "presentation_rect" : [ 23.0, 511.0, 204.0, 41.0 ],
"text" : [ "_ftm.sdif.write fs-short(1) ... fs-short(n)", "_ --> n inlets, each one receiving data", "_ for the specified SDIF frame" ]
}
@@ -254,7 +288,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 969.0, 545.0, 55.0, 17.0 ],
+ "patching_rect" : [ 969.0, 545.0, 55.0, 21.0 ],
+ "style" : "",
"text" : "ftm.mess"
}
@@ -265,6 +300,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -275,9 +311,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 257.0, 507.0, 347.0, 53.0 ],
+ "patching_rect" : [ 257.0, 507.0, 344.0, 53.0 ],
"presentation_linecount" : 4,
- "presentation_rect" : [ 257.0, 507.0, 347.0, 53.0 ],
+ "presentation_rect" : [ 257.0, 507.0, 344.0, 53.0 ],
"text" : [ "_fs-short = framesig [streamid]", "_ --> this inlet expects one matrix or vector or number and writes", "_ it to a matrix with signature framesig in a frame with the", "_ same signature on the given stream" ]
}
@@ -288,6 +324,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -311,6 +348,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -320,8 +358,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 257.0, 431.0, 163.443359, 17.0 ],
- "presentation_rect" : [ 257.0, 431.0, 163.443359, 17.0 ],
+ "patching_rect" : [ 257.0, 431.0, 161.927734, 17.0 ],
+ "presentation_rect" : [ 257.0, 431.0, 161.927734, 17.0 ],
"text" : [ "_framespec = fs-long | fs-short" ]
}
@@ -335,6 +373,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 257.0, 407.0, 124.0, 21.0 ],
+ "style" : "",
"text" : "framespec syntax:"
}
@@ -348,6 +387,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 587.0, 200.0, 65.0, 19.0 ],
+ "style" : "",
"text" : "from a dict"
}
@@ -362,6 +402,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 590.0, 104.0, 246.0, 36.0 ],
+ "style" : "",
"text" : "1c. set Name-Value Tables (NVTs) to write to the header (file must be open)"
}
@@ -375,6 +416,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 68.0, 64.0, 163.0, 19.0 ],
+ "style" : "",
"text" : "streaming write to an SDIF file"
}
@@ -388,6 +430,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 62.0, 31.0, 170.0, 36.0 ],
+ "style" : "",
"text" : "ftm.sdif.write"
}
@@ -401,6 +444,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 56.0, 19.0, 97.0, 19.0 ],
+ "style" : "",
"text" : "FTM SDIF objects"
}
@@ -414,7 +458,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 649.0, 545.0, 47.0, 17.0 ],
+ "patching_rect" : [ 626.0, 545.0, 47.0, 21.0 ],
+ "style" : "",
"text" : "ftm.sdif"
}
@@ -428,7 +473,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 877.0, 545.0, 26.0, 17.0 ],
+ "patching_rect" : [ 877.0, 545.0, 26.0, 21.0 ],
+ "style" : "",
"text" : "ftm"
}
@@ -442,7 +488,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 908.0, 545.0, 60.0, 17.0 ],
+ "patching_rect" : [ 908.0, 545.0, 60.0, 21.0 ],
+ "style" : "",
"text" : "ftm.object"
}
@@ -455,7 +502,8 @@
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
- "patching_rect" : [ 647.0, 528.0, 54.0, 19.0 ],
+ "patching_rect" : [ 624.0, 528.0, 54.0, 19.0 ],
+ "style" : "",
"text" : "see also:"
}
@@ -469,8 +517,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 701.0, 545.0, 76.0, 17.0 ],
- "text" : "ftm.sdif.track"
+ "patching_rect" : [ 678.0, 545.0, 107.0, 21.0 ],
+ "style" : "",
+ "text" : "ftm.class.sequence"
}
}
@@ -480,6 +529,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -490,8 +540,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 1024.0, 523.0, 50.0, 17.0 ],
- "presentation_rect" : [ 1024.0, 523.0, 50.0, 17.0 ],
+ "patching_rect" : [ 1024.0, 523.0, 43.490234, 17.0 ],
+ "presentation_rect" : [ 1024.0, 523.0, 43.490234, 17.0 ],
"text" : [ "_help $1" ]
}
@@ -505,7 +555,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 780.0, 545.0, 69.0, 17.0 ],
+ "patching_rect" : [ 788.0, 545.0, 69.0, 21.0 ],
+ "style" : "",
"text" : "ftm.sdif.info"
}
@@ -520,7 +571,8 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 1024.0, 543.0, 49.0, 19.0 ],
+ "patching_rect" : [ 1024.0, 543.0, 49.0, 21.0 ],
+ "style" : "",
"text" : "pcontrol"
}
@@ -536,23 +588,41 @@
"numoutlets" : 0,
"patcher" : {
"fileversion" : 1,
+ "appversion" : {
+ "major" : 7,
+ "minor" : 2,
+ "revision" : 4,
+ "architecture" : "x86",
+ "modernui" : 1
+ }
+,
"rect" : [ 10.0, 59.0, 128.0, 155.0 ],
"bglocked" : 0,
- "defrect" : [ 10.0, 59.0, 128.0, 155.0 ],
- "openrect" : [ 0.0, 0.0, 0.0, 0.0 ],
"openinpresentation" : 0,
"default_fontsize" : 10.0,
"default_fontface" : 0,
"default_fontname" : "Verdana",
- "gridonopen" : 0,
+ "gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
- "gridsnaponopen" : 0,
+ "gridsnaponopen" : 1,
+ "objectsnaponopen" : 1,
+ "statusbarvisible" : 2,
"toolbarvisible" : 1,
+ "lefttoolbarpinned" : 0,
+ "toptoolbarpinned" : 0,
+ "righttoolbarpinned" : 0,
+ "bottomtoolbarpinned" : 0,
+ "toolbars_unpinned_last_save" : 0,
+ "tallnewobj" : 0,
"boxanimatetime" : 200,
- "imprint" : 0,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
+ "description" : "",
+ "digest" : "",
+ "tags" : "",
+ "style" : "",
+ "subpatcher_template" : "",
"boxes" : [ {
"box" : {
"comment" : "",
@@ -561,7 +631,8 @@
"numinlets" : 0,
"numoutlets" : 1,
"outlettype" : [ "bang" ],
- "patching_rect" : [ 16.0, 35.0, 15.0, 15.0 ]
+ "patching_rect" : [ 16.0, 35.0, 15.0, 15.0 ],
+ "style" : ""
}
}
@@ -575,6 +646,7 @@
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 16.0, 79.0, 49.0, 19.0 ],
+ "style" : "",
"text" : "pcontrol"
}
@@ -589,6 +661,7 @@
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 16.0, 59.0, 50.0, 17.0 ],
+ "style" : "",
"text" : "help ftm"
}
@@ -597,8 +670,8 @@
"lines" : [ {
"patchline" : {
"destination" : [ "obj-3", 0 ],
+ "disabled" : 0,
"hidden" : 0,
- "midpoints" : [ ],
"source" : [ "obj-1", 0 ]
}
@@ -606,8 +679,8 @@
, {
"patchline" : {
"destination" : [ "obj-2", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-3", 0 ]
}
@@ -615,17 +688,18 @@
]
}
,
- "patching_rect" : [ 8.0, 69.0, 35.0, 19.0 ],
+ "patching_rect" : [ 8.0, 69.0, 35.0, 21.0 ],
"saved_object_attributes" : {
- "default_fontsize" : 10.0,
+ "description" : "",
+ "digest" : "",
+ "fontname" : "Verdana",
+ "fontsize" : 10.0,
"globalpatchername" : "",
- "fontface" : 0,
- "fontsize" : 10.0,
- "default_fontface" : 0,
- "default_fontname" : "Verdana",
- "fontname" : "Verdana"
+ "style" : "",
+ "tags" : ""
}
,
+ "style" : "",
"text" : "p ftm"
}
@@ -658,7 +732,8 @@
"id" : "obj-31",
"maxclass" : "fpic",
"numinlets" : 1,
- "numoutlets" : 0,
+ "numoutlets" : 1,
+ "outlettype" : [ "jit_matrix" ],
"patching_rect" : [ 7.0, 12.0, 54.0, 74.0 ],
"pic" : "ftm.help.jpg"
}
@@ -668,6 +743,7 @@
"box" : {
"description" : "dict TableName DSPinfo SamplingRate $FTM.audio.sr VectorSize $FTM.audio.vs",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -692,6 +768,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -701,8 +778,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 587.0, 216.0, 52.566406, 17.0 ],
- "presentation_rect" : [ 587.0, 216.0, 52.566406, 17.0 ],
+ "patching_rect" : [ 587.0, 216.0, 48.050781, 17.0 ],
+ "presentation_rect" : [ 587.0, 216.0, 48.050781, 17.0 ],
"text" : [ "_nvt $nvt" ]
}
@@ -713,6 +790,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -722,8 +800,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 587.0, 174.0, 248.0, 17.0 ],
- "presentation_rect" : [ 587.0, 174.0, 248.0, 17.0 ],
+ "patching_rect" : [ 587.0, 174.0, 243.612305, 17.0 ],
+ "presentation_rect" : [ 587.0, 174.0, 243.612305, 17.0 ],
"text" : [ "_nvt TableName Greetings Tag 'Kilroy was here!'" ]
}
@@ -737,24 +815,25 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 271.0, 229.0, 198.0, 21.0 ],
+ "style" : "",
"text" : "2b. write some matrix data..."
}
}
, {
"box" : {
- "bkgndpict" : "SliderDefaultBkgnd.pct",
"bottommargin" : 4,
"id" : "obj-36",
"imagemask" : 1,
- "knobpict" : "SliderDefaultKnob.pct",
"leftmargin" : 4,
"maxclass" : "pictslider",
"numinlets" : 2,
"numoutlets" : 2,
"outlettype" : [ "int", "int" ],
+ "parameter_enable" : 0,
"patching_rect" : [ 112.0, 257.0, 116.0, 54.0 ],
"rightmargin" : 4,
+ "style" : "",
"topmargin" : 4
}
@@ -769,6 +848,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 16.0, 404.0, 206.0, 65.0 ],
+ "style" : "",
"text" : "0. give the sdif frames (and stream ids) to write (uses the frame signature for the matrix type) (see init syntax)"
}
@@ -782,7 +862,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 354.0, 255.0, 30.0, 17.0 ],
+ "patching_rect" : [ 354.0, 255.0, 30.0, 21.0 ],
+ "style" : "",
"text" : "stop"
}
@@ -796,7 +877,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 271.0, 255.0, 32.0, 17.0 ],
+ "patching_rect" : [ 271.0, 255.0, 32.0, 21.0 ],
+ "style" : "",
"text" : "start"
}
@@ -806,13 +888,18 @@
"bgcolor" : [ 0.866667, 0.866667, 0.866667, 1.0 ],
"fontname" : "Verdana",
"fontsize" : 10.0,
- "htextcolor" : [ 0.870588, 0.870588, 0.870588, 1.0 ],
+ "format" : 6,
+ "htricolor" : [ 0.87, 0.82, 0.24, 1.0 ],
"id" : "obj-40",
"maxclass" : "flonum",
"numinlets" : 1,
"numoutlets" : 2,
- "outlettype" : [ "float", "bang" ],
- "patching_rect" : [ 311.0, 255.0, 35.0, 19.0 ],
+ "outlettype" : [ "", "bang" ],
+ "parameter_enable" : 0,
+ "patching_rect" : [ 311.0, 255.0, 35.0, 21.0 ],
+ "style" : "",
+ "textcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
+ "tricolor" : [ 0.75, 0.75, 0.75, 1.0 ],
"triscale" : 0.9
}
@@ -823,6 +910,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -832,8 +920,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 311.0, 281.0, 150.0, 17.0 ],
- "presentation_rect" : [ 311.0, 281.0, 150.0, 16.15332 ],
+ "patching_rect" : [ 311.0, 281.0, 143.290039, 17.0 ],
+ "presentation_rect" : [ 311.0, 281.0, 143.290039, 17.0 ],
"text" : [ "_(new fmat 1 2 $1 ($1 * 2))" ]
}
@@ -847,12 +935,13 @@
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 0,
- "patching_rect" : [ 255.0, 340.0, 148.0, 24.0 ],
+ "patching_rect" : [ 255.0, 340.0, 148.0, 26.0 ],
"saved_object_attributes" : {
- "ftm_scope" : 0,
- "ftm_objref_conv" : 0
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0
}
,
+ "style" : "",
"text" : "ftm.sdif.write XFOO"
}
@@ -863,6 +952,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -872,8 +962,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 255.0, 135.0, 239.0, 17.0 ],
- "presentation_rect" : [ 255.0, 135.0, 239.0, 16.15332 ],
+ "patching_rect" : [ 255.0, 135.0, 236.327133, 17.0 ],
+ "presentation_rect" : [ 255.0, 135.0, 236.327133, 17.0 ],
"text" : [ "_open /tmp/testfile.goo.sdif { XFOO 4 XMOO }" ]
}
@@ -887,12 +977,13 @@
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 0,
- "patching_rect" : [ 18.0, 340.0, 218.0, 24.0 ],
+ "patching_rect" : [ 18.0, 340.0, 218.0, 26.0 ],
"saved_object_attributes" : {
- "ftm_scope" : 0,
- "ftm_objref_conv" : 0
+ "ftm_objref_conv" : 0,
+ "ftm_scope" : 0
}
,
+ "style" : "",
"text" : "ftm.sdif.write 1FQ0 0 1NRG 1"
}
@@ -906,6 +997,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 253.0, 104.0, 218.0, 21.0 ],
+ "style" : "",
"text" : "1b. define and use your own types"
}
@@ -916,6 +1008,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -928,7 +1021,7 @@
"outlettype" : [ "" ],
"patching_rect" : [ 263.0, 178.0, 212.0, 41.0 ],
"presentation_linecount" : 3,
- "presentation_rect" : [ 263.0, 178.0, 212.0, 40.459961 ],
+ "presentation_rect" : [ 263.0, 178.0, 212.0, 41.0 ],
"text" : [ "_define '", "_1MTD XMOO { moocolumn, boocolumn }", "_1FTD XFOO { XMOO moomatrix; }'" ]
}
@@ -942,6 +1035,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 16.0, 104.0, 135.0, 21.0 ],
+ "style" : "",
"text" : "1. open file to write"
}
@@ -955,7 +1049,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 55.0, 289.0, 30.0, 17.0 ],
+ "patching_rect" : [ 55.0, 289.0, 30.0, 21.0 ],
+ "style" : "",
"text" : "stop"
}
@@ -969,7 +1064,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 36.0, 259.0, 32.0, 17.0 ],
+ "patching_rect" : [ 36.0, 259.0, 32.0, 21.0 ],
+ "style" : "",
"text" : "start"
}
@@ -980,6 +1076,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -989,8 +1086,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 18.0, 135.0, 156.0, 17.0 ],
- "presentation_rect" : [ 18.0, 135.0, 156.0, 16.15332 ],
+ "patching_rect" : [ 18.0, 135.0, 131.9375, 17.0 ],
+ "presentation_rect" : [ 18.0, 135.0, 131.9375, 17.0 ],
"text" : [ "_open /tmp/testfile.f0.sdif" ]
}
@@ -1005,6 +1102,7 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 31.0, 217.0, 166.0, 36.0 ],
+ "style" : "",
"text" : "2. write some scalar data to two matrices..."
}
@@ -1018,79 +1116,104 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 587.0, 150.0, 62.0, 19.0 ],
+ "style" : "",
"text" : "from a list"
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.909804, 0.701961, 0.0, 1.0 ],
"id" : "obj-54",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 15.0, 401.0, 229.0, 74.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.909804, 0.701961, 0.0, 1.0 ],
"id" : "obj-55",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 270.0, 225.0, 199.0, 25.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.909804, 0.701961, 0.0, 1.0 ],
"id" : "obj-56",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 587.0, 99.0, 263.0, 44.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.909804, 0.701961, 0.0, 1.0 ],
"id" : "obj-57",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 251.0, 99.0, 227.0, 26.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.909804, 0.701961, 0.0, 1.0 ],
"id" : "obj-58",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 13.0, 99.0, 199.0, 25.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.909804, 0.701961, 0.0, 1.0 ],
"id" : "obj-59",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 30.0, 214.0, 178.0, 40.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
@@ -1103,33 +1226,42 @@
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 20.0, 488.0, 78.0, 21.0 ],
+ "style" : "",
"text" : "init syntax:"
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.341176, 0.34902, 0.694118, 1.0 ],
"border" : 1,
"id" : "obj-53",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 254.0, 401.0, 353.0, 162.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
, {
"box" : {
+ "angle" : 0.0,
"bgcolor" : [ 0.294118, 0.356863, 0.678431, 1.0 ],
"border" : 1,
"id" : "obj-61",
"maxclass" : "panel",
+ "mode" : 0,
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 16.0, 480.0, 229.0, 77.0 ],
- "rounded" : 0
+ "proportion" : 0.39,
+ "rounded" : 0,
+ "style" : ""
}
}
@@ -1137,8 +1269,8 @@
"lines" : [ {
"patchline" : {
"destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-10", 0 ]
}
@@ -1146,8 +1278,8 @@
, {
"patchline" : {
"destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-20", 0 ]
}
@@ -1155,8 +1287,8 @@
, {
"patchline" : {
"destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-21", 0 ]
}
@@ -1164,8 +1296,8 @@
, {
"patchline" : {
"destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-22", 0 ]
}
@@ -1173,8 +1305,8 @@
, {
"patchline" : {
"destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-24", 0 ]
}
@@ -1182,8 +1314,8 @@
, {
"patchline" : {
"destination" : [ "obj-27", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-25", 0 ]
}
@@ -1191,8 +1323,8 @@
, {
"patchline" : {
"destination" : [ "obj-25", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-26", 0 ]
}
@@ -1200,8 +1332,8 @@
, {
"patchline" : {
"destination" : [ "obj-28", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-30", 0 ]
}
@@ -1209,6 +1341,7 @@
, {
"patchline" : {
"destination" : [ "obj-42", 0 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 596.5, 237.0, 564.0, 237.0, 564.0, 340.0, 264.5, 340.0 ],
"source" : [ "obj-33", 0 ]
@@ -1218,6 +1351,7 @@
, {
"patchline" : {
"destination" : [ "obj-42", 0 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 596.5, 194.0, 564.0, 194.0, 564.0, 340.0, 264.5, 340.0 ],
"source" : [ "obj-34", 0 ]
@@ -1227,6 +1361,7 @@
, {
"patchline" : {
"destination" : [ "obj-44", 1 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 218.5, 323.0, 226.5, 323.0 ],
"source" : [ "obj-36", 1 ]
@@ -1236,6 +1371,7 @@
, {
"patchline" : {
"destination" : [ "obj-44", 0 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 121.5, 325.0, 27.5, 325.0 ],
"source" : [ "obj-36", 0 ]
@@ -1245,6 +1381,7 @@
, {
"patchline" : {
"destination" : [ "obj-42", 0 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 363.5, 315.0 ],
"source" : [ "obj-38", 0 ]
@@ -1254,8 +1391,8 @@
, {
"patchline" : {
"destination" : [ "obj-42", 0 ],
+ "disabled" : 0,
"hidden" : 0,
- "midpoints" : [ ],
"source" : [ "obj-39", 0 ]
}
@@ -1263,8 +1400,8 @@
, {
"patchline" : {
"destination" : [ "obj-41", 0 ],
+ "disabled" : 0,
"hidden" : 0,
- "midpoints" : [ ],
"source" : [ "obj-40", 0 ]
}
@@ -1272,8 +1409,8 @@
, {
"patchline" : {
"destination" : [ "obj-42", 0 ],
+ "disabled" : 0,
"hidden" : 0,
- "midpoints" : [ ],
"source" : [ "obj-41", 0 ]
}
@@ -1281,8 +1418,8 @@
, {
"patchline" : {
"destination" : [ "obj-42", 0 ],
+ "disabled" : 0,
"hidden" : 0,
- "midpoints" : [ ],
"source" : [ "obj-43", 0 ]
}
@@ -1290,6 +1427,7 @@
, {
"patchline" : {
"destination" : [ "obj-42", 0 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 272.5, 223.0, 264.5, 223.0 ],
"source" : [ "obj-46", 0 ]
@@ -1299,6 +1437,7 @@
, {
"patchline" : {
"destination" : [ "obj-44", 0 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 64.5, 319.0, 27.5, 319.0 ],
"source" : [ "obj-48", 0 ]
@@ -1308,6 +1447,7 @@
, {
"patchline" : {
"destination" : [ "obj-44", 0 ],
+ "disabled" : 0,
"hidden" : 0,
"midpoints" : [ 45.5, 319.0, 27.5, 319.0 ],
"source" : [ "obj-49", 0 ]
@@ -1317,8 +1457,8 @@
, {
"patchline" : {
"destination" : [ "obj-44", 0 ],
+ "disabled" : 0,
"hidden" : 0,
- "midpoints" : [ ],
"source" : [ "obj-50", 0 ]
}
@@ -1326,8 +1466,8 @@
, {
"patchline" : {
"destination" : [ "obj-44", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-63", 0 ]
}
@@ -1335,13 +1475,33 @@
, {
"patchline" : {
"destination" : [ "obj-44", 0 ],
+ "disabled" : 0,
"hidden" : 1,
- "midpoints" : [ ],
"source" : [ "obj-67", 0 ]
}
}
- ]
+ ],
+ "dependency_cache" : [ {
+ "name" : "ftm.help.jpg",
+ "bootpath" : "~/src/ftm-and-co/ftm/patches/max5/help",
+ "type" : "JPEG",
+ "implicit" : 1
+ }
+, {
+ "name" : "ftm.mess.mxo",
+ "type" : "iLaX"
+ }
+, {
+ "name" : "ftm.sdif.write.mxo",
+ "type" : "iLaX"
+ }
+, {
+ "name" : "ftm.object.mxo",
+ "type" : "iLaX"
+ }
+ ],
+ "autosave" : 0
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-09-27 21:35:43
|
Revision: 3692
http://sourceforge.net/p/ftm/code/3692
Author: diemo
Date: 2016-09-27 21:35:41 +0000 (Tue, 27 Sep 2016)
Log Message:
-----------
fix invalid free of sdif selection
Modified Paths:
--------------
trunk/ftm/ftmlib/ftmsdif.c
trunk/ftm/ftmlib/ftmsdif.h
trunk/ftm/ftmlib/seqsdif.c
Modified: trunk/ftm/ftmlib/ftmsdif.c
===================================================================
--- trunk/ftm/ftmlib/ftmsdif.c 2016-09-27 21:16:34 UTC (rev 3691)
+++ trunk/ftm/ftmlib/ftmsdif.c 2016-09-27 21:35:41 UTC (rev 3692)
@@ -243,9 +243,10 @@
base->objectname = "ftmsdif";
base->file = NULL;
base->framespec = NULL;
+
+ base->selection = SdifCreateSelection();
+ SdifInitSelection(base->selection, NULL, 0);
- SdifInitSelection(&base->selection, NULL, 0);
-
/* process argument to determine number of inlets (at least one) */
ftmsdif_reserve_frames(base, ftmsdif_countframes(ac, at));
@@ -314,7 +315,7 @@
}
fts_free(base->framespec);
- SdifFreeSelection(&base->selection);
+ SdifFreeSelection(base->selection);
}
@@ -327,7 +328,7 @@
char fullpath[1024];
/* split filename and selection (both copied into base->selection struct) */
- filenameonly = SdifGetFilenameAndSelection(filename, &base->selection);
+ filenameonly = SdifGetFilenameAndSelection(filename, base->selection);
/* search filename in max paths, normalise Mac volume names */
if (fts_file_find(filenameonly, fullpath, 1023) != NULL)
@@ -342,10 +343,11 @@
if (sel)
strcat(fullpath, sel);
- SdifFreeSelection(&base->selection); /* free filename copy */
+ SdifFreeSelection(base->selection); /* free filename copy */
+ base->selection = SdifCreateSelection();
/* reinit selection struct */
- filenameonly = SdifGetFilenameAndSelection(fullpath, &base->selection);
+ filenameonly = SdifGetFilenameAndSelection(fullpath, base->selection);
/* Copy filename into base, just to have sensible console output */
base->filename = fts_symbol_name(fts_new_symbol(fullpath));
@@ -391,7 +393,7 @@
if (base->file == NULL)
ftmsdif_error(base, "can't open file '%s' as '%s'",
- base->selection.filename, base->filename);
+ base->selection->filename, base->filename);
else
base->state = state_open;
}
@@ -795,7 +797,7 @@
if (SdifTestFrameType(file, sig) == NULL)
{
fts_post("SDIF frame type %s is not defined for file '%s'.\n",
- SdifSignatureToString(sig), base->selection.filename);
+ SdifSignatureToString(sig), base->selection->filename);
ret = 0;
}
@@ -809,7 +811,7 @@
{
fts_post("SDIF matrix type %s is not defined for file '%s'.\n",
SdifSignatureToString(sig),
- base->selection.filename);
+ base->selection->filename);
ret = 0;
}
}
@@ -817,7 +819,7 @@
else
{
fts_post("SDIF frame %d not specified for file '%s'.\n",
- i, base->selection.filename);
+ i, base->selection->filename);
ret = 0;
}
}
@@ -860,13 +862,13 @@
ftmsdif_parseargs(&import->base, ac - nf, at + nf, _SdifAllStreamID);
#if FTMSDIF_DEBUG
- fts_post("importing sdif from '%s'...\n", import->base.selection.filename);
+ fts_post("importing sdif from '%s'...\n", import->base.selection->filename);
fts_post(" ac %d nf %d args %d\n", ac, nf, ac - nf);
ftmsdif_framespec_print(&import->base);
#endif
- import->selrow = SdifSelectGetFirstInt(import->base.selection.row, 1);
- import->selcol = SdifSelectGetFirstInt(import->base.selection.column, 1);
+ import->selrow = SdifSelectGetFirstInt(import->base.selection->row, 1);
+ import->selcol = SdifSelectGetFirstInt(import->base.selection->column, 1);
/* TODO: heed row/col selection in SdifFReadMatrixData */
import->base.state = state_running;
Modified: trunk/ftm/ftmlib/ftmsdif.h
===================================================================
--- trunk/ftm/ftmlib/ftmsdif.h 2016-09-27 21:16:34 UTC (rev 3691)
+++ trunk/ftm/ftmlib/ftmsdif.h 2016-09-27 21:35:41 UTC (rev 3692)
@@ -84,7 +84,7 @@
SdifUInt4 defaultstreamid;
const char* filename; /* filename::selection argument */
- SdifSelectionT selection; /* holds parsed filename */
+ SdifSelectionT* selection; /* holds parsed filename */
SdifFileT* file; /* NULL if not open */
} ftmsdif_t;
Modified: trunk/ftm/ftmlib/seqsdif.c
===================================================================
--- trunk/ftm/ftmlib/seqsdif.c 2016-09-27 21:16:34 UTC (rev 3691)
+++ trunk/ftm/ftmlib/seqsdif.c 2016-09-27 21:35:41 UTC (rev 3692)
@@ -1105,7 +1105,7 @@
{
ftmsdif_error(&base,
"export sdif: can't open file '%s' for writing.\n",
- base.selection.filename);
+ base.selection->filename);
ftmsdif_delete(&base);
return fts_ok;
}
@@ -1130,7 +1130,7 @@
if (!ftmsdif_typecheck(&base))
{
ftmsdif_error(&base, "export sdif: type check failed (some given SDIF types are undefined), can't write file '%s'.\n",
- base.selection.filename);
+ base.selection->filename);
ftmsdif_closefile(&base);
ftmsdif_delete(&base);
return fts_ok;
@@ -1144,7 +1144,7 @@
{
ftmsdif_error(&base,
"export sdif: can't write headers to file '%s'.\n",
- base.selection.filename);
+ base.selection->filename);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-09-27 21:16:37
|
Revision: 3691
http://sourceforge.net/p/ftm/code/3691
Author: diemo
Date: 2016-09-27 21:16:34 +0000 (Tue, 27 Sep 2016)
Log Message:
-----------
don't use silly product name ftm-max6 for 64bit build (not found by externals)
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2016-09-27 21:14:30 UTC (rev 3690)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2016-09-27 21:16:34 UTC (rev 3691)
@@ -886,7 +886,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 2125B07C1BA6F85900D5349C /* ftm-max6.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ftm-max6.mxo"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 2125B07C1BA6F85900D5349C /* ftm.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.mxo; sourceTree = BUILT_PRODUCTS_DIR; };
21901A3F1760BB8A00024867 /* mapfuns_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mapfuns_test; sourceTree = BUILT_PRODUCTS_DIR; };
21CC80EE1BA8047000E7E6AE /* ftm.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.mxo; sourceTree = BUILT_PRODUCTS_DIR; };
3B0075ED0B83237200B259E5 /* ffft.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ffft.h; sourceTree = "<group>"; };
@@ -1094,7 +1094,7 @@
5C4E8D3E0D3B6C980092A6E8 /* libftmlight.a */,
5C4E8D3F0D3B6C980092A6E8 /* libftm.a */,
21901A3F1760BB8A00024867 /* mapfuns_test */,
- 2125B07C1BA6F85900D5349C /* ftm-max6.mxo */,
+ 2125B07C1BA6F85900D5349C /* ftm.mxo */,
21CC80EE1BA8047000E7E6AE /* ftm.mxo */,
);
name = ftmlibProject;
@@ -1636,7 +1636,7 @@
);
name = "ftm.mxo max6 64bit";
productName = ftm.mxo;
- productReference = 2125B07C1BA6F85900D5349C /* ftm-max6.mxo */;
+ productReference = 2125B07C1BA6F85900D5349C /* ftm.mxo */;
productType = "com.apple.product-type.bundle";
};
21901A3E1760BB8A00024867 /* mapfuns_test */ = {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-09-27 21:14:32
|
Revision: 3690
http://sourceforge.net/p/ftm/code/3690
Author: diemo
Date: 2016-09-27 21:14:30 +0000 (Tue, 27 Sep 2016)
Log Message:
-----------
add spline editor to ftm.editor project
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
Modified: trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2016-09-26 17:37:28 UTC (rev 3689)
+++ trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2016-09-27 21:14:30 UTC (rev 3690)
@@ -105,6 +105,7 @@
211ADFE90A79030D007B20AA /* ftm.sqlite.h in Headers */ = {isa = PBXBuildFile; fileRef = 211ADFE60A79030D007B20AA /* ftm.sqlite.h */; };
211ADFEA0A79030D007B20AA /* ftm.sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 211ADFE70A79030D007B20AA /* ftm.sqlite3.c */; };
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 */; settings = {ASSET_TAGS = (); }; };
3B01D3090A790E2A00950F15 /* ftm.sqlite.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B01D3080A790E2A00950F15 /* ftm.sqlite.c */; };
3B198EB20F8A0E3500F53450 /* ftm.object.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B1B846F06D4C5F3009827F3 /* ftm.object.c */; };
3B198EBE0F8A101F00F53450 /* commonsyms.c in Sources */ = {isa = PBXBuildFile; fileRef = 3BA1E34D0F6E6A4D007B27D1 /* commonsyms.c */; };
@@ -440,6 +441,7 @@
211ADFE70A79030D007B20AA /* ftm.sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ftm.sqlite3.c; sourceTree = "<group>"; };
2195DDA709A24A4A007DEFAF /* ftm.sdif.write.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ftm.sdif.write.c; sourceTree = "<group>"; };
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>"; };
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; };
@@ -886,6 +888,7 @@
3BE1ACBC136EB1730036CFFC /* PixelsEditor.cpp */,
3BE1ACBD136EB1730036CFFC /* ScoreEditor.cpp */,
3BE1ACBE136EB1730036CFFC /* SonogramEditor.cpp */,
+ 21DD1AFB1D9B137900476592 /* SplineEditor.cpp */,
3BE1ACBF136EB1730036CFFC /* TracesEditor.cpp */,
3BE1ACC0136EB1730036CFFC /* WaveEditor.cpp */,
);
@@ -2593,6 +2596,7 @@
3B1CA7D40C467B12005F0280 /* ftm.editor.cpp in Sources */,
3BE1AC97136EB14D0036CFFC /* EditorContainer.cpp in Sources */,
3BE1AC9A136EB14D0036CFFC /* EditorDomainRuler.cpp in Sources */,
+ 21DD1AFC1D9B137900476592 /* SplineEditor.cpp in Sources */,
3BE1AC9C136EB14D0036CFFC /* EditorDomainScrollbar.cpp in Sources */,
3BE1AC9E136EB14D0036CFFC /* EditorInnerBar.cpp in Sources */,
3BE1ACA1136EB14D0036CFFC /* EditorRangeRuler.cpp in Sources */,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-09-26 17:37:30
|
Revision: 3689
http://sourceforge.net/p/ftm/code/3689
Author: diemo
Date: 2016-09-26 17:37:28 +0000 (Mon, 26 Sep 2016)
Log Message:
-----------
add new symbol fts_s_followmouse
Modified Paths:
--------------
trunk/ftm/ftmlib/predefsymbols.h
Modified: trunk/ftm/ftmlib/predefsymbols.h
===================================================================
--- trunk/ftm/ftmlib/predefsymbols.h 2016-09-26 17:21:44 UTC (rev 3688)
+++ trunk/ftm/ftmlib/predefsymbols.h 2016-09-26 17:37:28 UTC (rev 3689)
@@ -329,6 +329,7 @@
PREDEF_SYMBOL( fts_s_edit, "edit");
PREDEF_SYMBOL( fts_s_fgcolor, "fgcolor");
PREDEF_SYMBOL( fts_s_fgcolorgradient, "fgcolorgradient");
+PREDEF_SYMBOL( fts_s_followmouse, "followmouse");
PREDEF_SYMBOL( fts_s_fontsize, "fontsize");
PREDEF_SYMBOL( fts_s_fontstyle, "fontstyle");
PREDEF_SYMBOL( fts_s_forecolor, "fore_color");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-09-26 17:21:46
|
Revision: 3688
http://sourceforge.net/p/ftm/code/3688
Author: diemo
Date: 2016-09-26 17:21:44 +0000 (Mon, 26 Sep 2016)
Log Message:
-----------
31.5.2016: use max types for port to 64bit
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.vecdisplay.c
Modified: trunk/ftm/externals/max5/ftm.vecdisplay.c
===================================================================
--- trunk/ftm/externals/max5/ftm.vecdisplay.c 2016-05-31 17:05:15 UTC (rev 3687)
+++ trunk/ftm/externals/max5/ftm.vecdisplay.c 2016-09-26 17:21:44 UTC (rev 3688)
@@ -23,6 +23,7 @@
#include <ftmlib.h>
#include "ext.h" // standard Max include, always required
#include "ext_common.h"
+#include "ext_proto.h" // for notify_free
#include "ext_obex.h" // required for new style Max object
#include "jpatcher_api.h"
#include "jgraphics.h"
@@ -166,7 +167,7 @@
void *qelem_vecdisplay_refresh;
- long view[NUM_INLETS];
+ t_atom_long view[NUM_INLETS];
float minVal[NUM_INLETS];
float maxVal[NUM_INLETS];
@@ -182,8 +183,8 @@
int history_current_draw;
int history_open; /* 1 if the object is splitted, 0 otherwise */
- long history_height; /* position of the split bar */
- long history_size; /* max number of fmat in history */
+ t_atom_long history_height; /* position of the split bar */
+ t_atom_long history_size; /* max number of fmat in history */
enum {cursor_up, cursor_sel_history, cursor_sel_display, cursor_splitting} cursor_mode;
int cursor_x;
@@ -192,10 +193,10 @@
t_jrgba backColor; /* background color */
t_jrgba inletColors[NUM_INLETS]; /* inlet colors */
- int historyMode; /* draw mode of history (1=all_colors 0=inlet_color) */
- int historyZoom; /* hight of evry lines in history */
+ t_atom_long historyMode; /* draw mode of history (1=all_colors 0=inlet_color) */
+ t_atom_long historyZoom; /* hight of evry lines in history */
- long j_mouse_is_down; /* mouse is down ? */
+ t_atom_long j_mouse_is_down; /* mouse is down ? */
} vecdisplay_t;
void *vecdisplay_class = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-05-31 17:05:17
|
Revision: 3687
http://sourceforge.net/p/ftm/code/3687
Author: diemo
Date: 2016-05-31 17:05:15 +0000 (Tue, 31 May 2016)
Log Message:
-----------
something has changed again !@$%!@#!
Modified Paths:
--------------
trunk/ftm/util/install-mxo.sh
Modified: trunk/ftm/util/install-mxo.sh
===================================================================
--- trunk/ftm/util/install-mxo.sh 2016-05-31 16:32:28 UTC (rev 3686)
+++ trunk/ftm/util/install-mxo.sh 2016-05-31 17:05:15 UTC (rev 3687)
@@ -27,7 +27,8 @@
objinstall=$installdir/Contents/MacOS/$base
FTMLIB_FRAMEWORK=`otool -L -arch i386 $objsrc | grep ftm.mxo | awk '{print $1}'`
-FTMLIB_FRAMEWORK_RELATIVE=`perl -e '$_ = shift; s(.*/(ftm.mxo))(\@loader_path/../../../$1); print $_;' $FTMLIB_FRAMEWORK`
+#FTMLIB_FRAMEWORK_RELATIVE=`perl -e '$_ = shift; s(.*/(ftm.mxo))(\@loader_path/../../../$1); print $_;' $FTMLIB_FRAMEWORK`
+FTMLIB_FRAMEWORK_RELATIVE='@loader_path/../../../ftm.mxo/Contents/MacOS/ftm'
echo "[patching dynamic library"
echo " from '$FTMLIB_FRAMEWORK'"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-05-31 16:32:31
|
Revision: 3686
http://sourceforge.net/p/ftm/code/3686
Author: diemo
Date: 2016-05-31 16:32:28 +0000 (Tue, 31 May 2016)
Log Message:
-----------
set to 32/64 compilation, fix mxo name for 64bit target
Modified Paths:
--------------
trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
Modified: trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2016-05-31 15:51:49 UTC (rev 3685)
+++ trunk/ftm/build/max5/osx-macho/ftmexternals.xcodeproj/project.pbxproj 2016-05-31 16:32:28 UTC (rev 3686)
@@ -3257,7 +3257,6 @@
218B72320E80091000A7CEAD /* Debug_optimised */ = {
isa = XCBuildConfiguration;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = ftm.mess;
};
name = Debug_optimised;
@@ -3747,7 +3746,6 @@
3B5DEDD70861C3ED00B9AEEA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = ftm.mess;
};
name = Debug;
@@ -3755,7 +3753,6 @@
3B5DEDD80861C3ED00B9AEEA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- COMBINE_HIDPI_IMAGES = YES;
PRODUCT_NAME = ftm.mess;
};
name = Release;
Modified: trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj
===================================================================
--- trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2016-05-31 15:51:49 UTC (rev 3685)
+++ trunk/ftm/build/max5/osx-macho/ftmlib.xcodeproj/project.pbxproj 2016-05-31 16:32:28 UTC (rev 3686)
@@ -888,7 +888,7 @@
/* Begin PBXFileReference section */
2125B07C1BA6F85900D5349C /* ftm-max6.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ftm-max6.mxo"; sourceTree = BUILT_PRODUCTS_DIR; };
21901A3F1760BB8A00024867 /* mapfuns_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mapfuns_test; sourceTree = BUILT_PRODUCTS_DIR; };
- 21CC80EE1BA8047000E7E6AE /* ftm.mxo copy.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "ftm.mxo copy.mxo"; sourceTree = BUILT_PRODUCTS_DIR; };
+ 21CC80EE1BA8047000E7E6AE /* ftm.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.mxo; sourceTree = BUILT_PRODUCTS_DIR; };
3B0075ED0B83237200B259E5 /* ffft.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ffft.h; sourceTree = "<group>"; };
3B0075F50B8323E500B259E5 /* ftsconfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ftsconfig.h; sourceTree = "<group>"; };
3B0313A90C904BA000DA4915 /* seqtxt.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = seqtxt.c; sourceTree = "<group>"; };
@@ -1095,7 +1095,7 @@
5C4E8D3F0D3B6C980092A6E8 /* libftm.a */,
21901A3F1760BB8A00024867 /* mapfuns_test */,
2125B07C1BA6F85900D5349C /* ftm-max6.mxo */,
- 21CC80EE1BA8047000E7E6AE /* ftm.mxo copy.mxo */,
+ 21CC80EE1BA8047000E7E6AE /* ftm.mxo */,
);
name = ftmlibProject;
sourceTree = "<group>";
@@ -1671,7 +1671,7 @@
);
name = "ftm.mxo 32bit";
productName = ftm.mxo;
- productReference = 21CC80EE1BA8047000E7E6AE /* ftm.mxo copy.mxo */;
+ productReference = 21CC80EE1BA8047000E7E6AE /* ftm.mxo */;
productType = "com.apple.product-type.bundle";
};
3BE2BBFF15F752F9008368F4 /* ftm.mxo */ = {
@@ -1848,7 +1848,7 @@
$EXTERNALS_DIR/ftm.mxo,
);
runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
+ shellPath = "/bin/sh -x";
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";
};
2195C5E91B908DC50035FEBD /* ShellScript */ = {
@@ -2365,7 +2365,7 @@
"-Uobject_method",
);
PREBINDING = YES;
- PRODUCT_NAME = "ftm-max6";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
};
name = Debug;
@@ -2405,7 +2405,7 @@
"-Uobject_method",
);
PREBINDING = YES;
- PRODUCT_NAME = "ftm-max6";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
};
name = Debug_optimised;
@@ -2440,7 +2440,7 @@
"-Uobject_method",
);
PREBINDING = NO;
- PRODUCT_NAME = "ftm-max6";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
};
name = Debug_harder;
@@ -2477,7 +2477,7 @@
"-Uobject_method",
);
PREBINDING = NO;
- PRODUCT_NAME = "ftm-max6";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
ZERO_LINK = NO;
};
@@ -2590,7 +2590,7 @@
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
PREBINDING = YES;
- PRODUCT_NAME = "ftm.mxo copy";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
};
name = Debug;
@@ -2619,7 +2619,7 @@
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
PREBINDING = YES;
- PRODUCT_NAME = "ftm.mxo copy";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
};
name = Debug_optimised;
@@ -2647,7 +2647,7 @@
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
PREBINDING = NO;
- PRODUCT_NAME = "ftm.mxo copy";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
};
name = Debug_harder;
@@ -2668,7 +2668,7 @@
INFOPLIST_FILE = ftmexternal.plist;
MACH_O_TYPE = mh_dylib;
PREBINDING = NO;
- PRODUCT_NAME = "ftm.mxo copy";
+ PRODUCT_NAME = ftm;
WRAPPER_EXTENSION = mxo;
ZERO_LINK = NO;
};
@@ -2830,7 +2830,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPYING_PRESERVES_HFS_DATA = YES;
COPY_PHASE_STRIP = YES;
@@ -3054,7 +3054,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPYING_PRESERVES_HFS_DATA = YES;
COPY_PHASE_STRIP = YES;
@@ -3084,7 +3084,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_SUFFIX = "";
EXTERNALS_DIR = "../../../../../build-max5";
@@ -3114,7 +3114,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2016-05-31 15:51:52
|
Revision: 3685
http://sourceforge.net/p/ftm/code/3685
Author: diemo
Date: 2016-05-31 15:51:49 +0000 (Tue, 31 May 2016)
Log Message:
-----------
fix runaway memory bug on 64bit: everything touched by attribute or dictionary has to be t_atom_long
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.mess.c
Modified: trunk/ftm/externals/max5/ftm.mess.c
===================================================================
--- trunk/ftm/externals/max5/ftm.mess.c 2016-02-15 09:19:54 UTC (rev 3684)
+++ trunk/ftm/externals/max5/ftm.mess.c 2016-05-31 15:51:49 UTC (rev 3685)
@@ -93,11 +93,11 @@
/* original message lines as symbols, abstraction args #1... NOT replaced */
t_symbol *lines[MAX_LINES];
- int n_lines;
+ t_atom_long n_lines;
t_atom_long loadlines; /* compatibility */
t_atom_long n_inlets;
- int n_inlets_next;
+ t_atom_long n_inlets_next;
int n_dollars;
fts_array_t args;
@@ -2012,10 +2012,10 @@
self->n_inlets = 2;
self->n_inlets_next = 2;
self->n_dollars = 0;
-
+
dictionary_getlong(d, gensym("numlines"), &self->loadlines);
- dictionary_getlong(d, gensym("numins"), &self->n_inlets);
-
+ dictionary_getlong(d, gensym("numins"), &self->n_inlets);
+
if(self->n_inlets < 2)
self->n_inlets = 2;
@@ -2045,6 +2045,7 @@
self->lists = (fts_array_t *)fts_malloc(self->n_inlets * sizeof(fts_array_t));
self->init_lists = (fts_array_t *)fts_malloc(self->n_inlets * sizeof(fts_array_t));
+
for(i=0; i<self->n_inlets; i++)
{
fts_array_init(self->lists + i, 0, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2016-02-15 09:19:57
|
Revision: 3684
http://sourceforge.net/p/ftm/code/3684
Author: borghesi
Date: 2016-02-15 09:19:54 +0000 (Mon, 15 Feb 2016)
Log Message:
-----------
adatpted to minor change in API
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.editor.cpp
Modified: trunk/ftm/externals/max5/ftm.editor.cpp
===================================================================
--- trunk/ftm/externals/max5/ftm.editor.cpp 2015-12-01 11:03:11 UTC (rev 3683)
+++ trunk/ftm/externals/max5/ftm.editor.cpp 2016-02-15 09:19:54 UTC (rev 3684)
@@ -5634,8 +5634,8 @@
if(have_editor)
{
- char *interfaces[256];
- char *public_names[256];
+ const char *interfaces[256];
+ const char *public_names[256];
int num_interfaces = 0;
char interface_names[2048];
int i = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2015-12-01 11:03:13
|
Revision: 3683
http://sourceforge.net/p/ftm/code/3683
Author: diemo
Date: 2015-12-01 11:03:11 +0000 (Tue, 01 Dec 2015)
Log Message:
-----------
Summary: tabify
Modified Paths:
--------------
trunk/ftm/ftmlib/classes/fmat.c
Modified: trunk/ftm/ftmlib/classes/fmat.c
===================================================================
--- trunk/ftm/ftmlib/classes/fmat.c 2015-09-18 15:00:56 UTC (rev 3682)
+++ trunk/ftm/ftmlib/classes/fmat.c 2015-12-01 11:03:11 UTC (rev 3683)
@@ -11,7 +11,7 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
@@ -177,17 +177,17 @@
/* zero rows that won't be moved */
if(old_m > move_m)
- memset(self->values + move_size, 0, sizeof(float) * (old_size - move_size));
+ memset(self->values + move_size, 0, sizeof(float) * (old_size - move_size));
/* from last to second row */
for(i=m-1; i>=1; i--)
{
- float *ptr = self->values + i * n;
- float *old_ptr = self->values + i * old_n;
-
- /* move one row to new position in memory and zero end of rows */
- memmove(ptr, old_ptr, sizeof(float) * old_n);
- memset(ptr + old_n, 0, sizeof(float) * pad);
+ float *ptr = self->values + i * n;
+ float *old_ptr = self->values + i * old_n;
+
+ /* move one row to new position in memory and zero end of rows */
+ memmove(ptr, old_ptr, sizeof(float) * old_n);
+ memset(ptr + old_n, 0, sizeof(float) * pad);
}
/* zero end of first row (no move required) */
@@ -200,14 +200,14 @@
/* from second to last row */
for(i=1; i<m; i++)
- memmove(self->values + i * n, self->values + i * old_n, sizeof(float) * n);
+ memmove(self->values + i * n, self->values + i * old_n, sizeof(float) * n);
/* zero atoms at the end that have been moved to fit new columns */
memset(self->values + new_size, 0, sizeof(float) * (move_size - new_size));
/* zero rows that have not been moved */
if(old_m > move_m)
- memset(self->values + move_size, 0, sizeof(float) * (old_size - move_size));
+ memset(self->values + move_size, 0, sizeof(float) * (old_size - move_size));
}
}
}
@@ -328,14 +328,14 @@
{
if (istup)
{ /* take atom list from tuple */
- fts_tuple_t *tup = (fts_tuple_t *) fts_get_object(at);
- ac = fts_tuple_get_size(tup);
- at = fts_tuple_get_atoms(tup);
+ fts_tuple_t *tup = (fts_tuple_t *) fts_get_object(at);
+ ac = fts_tuple_get_size(tup);
+ at = fts_tuple_get_atoms(tup);
}
/* clip to # of slice elements */
if(ac > size)
- ac = size;
+ ac = size;
fmat_set_from_atoms(self, onset, stride, ac, at);
@@ -344,22 +344,22 @@
else if (fts_is_object(at))
{
fts_object_t *obj = fts_get_object(at);
- int vec_size = 0, vec_stride;
- float *vec;
+ int vec_size = 0, vec_stride;
+ float *vec;
if (fmat_or_fvec_vector(obj, &vec, &vec_size, &vec_stride))
{
- float *ptr = self->values + onset;
- int i, j;
-
- if (vec_size > size)
- vec_size = size;
-
- for (i = 0, j = 0; i < vec_size * stride; i += stride, j += vec_stride)
- ptr[i] = vec[j];
+ float *ptr = self->values + onset;
+ int i, j;
+
+ if (vec_size > size)
+ vec_size = size;
+
+ for (i = 0, j = 0; i < vec_size * stride; i += stride, j += vec_stride)
+ ptr[i] = vec[j];
}
- return vec_size; /* return number of elements set */
+ return vec_size; /* return number of elements set */
}
}
@@ -443,27 +443,27 @@
{
if(schema != NULL)
{
- if(dim == 1)
- {
- if(self->rowschema != NULL)
- {
- fts_object_remove_listener((fts_object_t *)self->rowschema, self);
- fts_object_release((fts_object_t *) self->rowschema);
- }
- self->rowschema = schema;
- }
- else
- {
- if(self->colschema != NULL)
- {
- fts_object_remove_listener((fts_object_t *)self->colschema, self);
- fts_object_release((fts_object_t *) self->colschema);
- }
- self->colschema = schema;
- }
-
- fts_object_refer((fts_object_t *) schema);
- fts_object_add_listener((fts_object_t *)schema, self, fmat_schema_callback);
+ if(dim == 1)
+ {
+ if(self->rowschema != NULL)
+ {
+ fts_object_remove_listener((fts_object_t *)self->rowschema, self);
+ fts_object_release((fts_object_t *) self->rowschema);
+ }
+ self->rowschema = schema;
+ }
+ else
+ {
+ if(self->colschema != NULL)
+ {
+ fts_object_remove_listener((fts_object_t *)self->colschema, self);
+ fts_object_release((fts_object_t *) self->colschema);
+ }
+ self->colschema = schema;
+ }
+
+ fts_object_refer((fts_object_t *) schema);
+ fts_object_add_listener((fts_object_t *)schema, self, fmat_schema_callback);
}
}
@@ -766,7 +766,7 @@
fmat_set_n(fmat_t *self, int n)
{
int m = self->m;
- int old_n = self->n;
+ int old_n = self->n;
unsafe_reshape(self, m, n);
fm_rearrange(self, m, old_n);
@@ -825,84 +825,84 @@
fmat_resample_locked(fmat_t *in, fmat_t *out, double factor)
{
if(factor == 1.0)
- fmat_copy_locked(in, out);
+ fmat_copy_locked(in, out);
else if(in != out)
{
- int m = in->m;
- int n = in->n;
-
- /* limit resampling range here? */
- if(m > 3)
- {
- double inv = 1.0 / factor;
- int out_m = (int)floor((double)(m - 1) * inv) + 1;
- int out_head_m = (int)ceil(inv);
- int out_tailm2_m = (int)floor((double)(m - 2) * inv);
+ int m = in->m;
+ int n = in->n;
+
+ /* limit resampling range here? */
+ if(m > 3)
+ {
+ double inv = 1.0 / factor;
+ int out_m = (int)floor((double)(m - 1) * inv) + 1;
+ int out_head_m = (int)ceil(inv);
+ int out_tailm2_m = (int)floor((double)(m - 2) * inv);
float *out_values = fmat_lock_reshape(out, out_m, n);
float *in_values = fmat_lock(in);
- fts_idefix_t idefix;
- fts_idefix_t incr;
- int i, j;
-
- fts_idefix_set_float(&incr, factor);
-
- for (j=0; j<n; j++)
- {
- fts_idefix_set_zero(&idefix);
-
- /* copy first points without interpolation */
- for(i=j; i<out_head_m*n; i+=n)
- {
- int onset = fts_idefix_get_index(idefix);
- float frac = fts_idefix_get_frac(idefix);
- float left = in_values[j + onset * n];
- float right = in_values[j + onset * n + n];
+ fts_idefix_t idefix;
+ fts_idefix_t incr;
+ int i, j;
+
+ fts_idefix_set_float(&incr, factor);
+
+ for (j=0; j<n; j++)
+ {
+ fts_idefix_set_zero(&idefix);
+
+ /* copy first points without interpolation */
+ for(i=j; i<out_head_m*n; i+=n)
+ {
+ int onset = fts_idefix_get_index(idefix);
+ float frac = fts_idefix_get_frac(idefix);
+ float left = in_values[j + onset * n];
+ float right = in_values[j + onset * n + n];
- //out_values[i] = fts_cubic_calc_stride_head(in_values[j + onset] * n, ft, n);
- out_values[i] = left + (right - left) * frac;
- fts_idefix_incr(&idefix, incr);
- }
-
- for(; i<out_tailm2_m*n; i+=n)
- {
- fts_cubic_idefix_interpolate_stride(in_values + j, idefix, n, out_values + i);
- fts_idefix_incr(&idefix, incr);
- }
-
- /*
- for(; i<out_tailm1_m*n; i+=n)
- {
- fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
- int onset = fts_idefix_get_index(idefix);
+ //out_values[i] = fts_cubic_calc_stride_head(in_values[j + onset] * n, ft, n);
+ out_values[i] = left + (right - left) * frac;
+ fts_idefix_incr(&idefix, incr);
+ }
+
+ for(; i<out_tailm2_m*n; i+=n)
+ {
+ fts_cubic_idefix_interpolate_stride(in_values + j, idefix, n, out_values + i);
+ fts_idefix_incr(&idefix, incr);
+ }
+
+ /*
+ for(; i<out_tailm1_m*n; i+=n)
+ {
+ fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
+ int onset = fts_idefix_get_index(idefix);
- out_values[i] = fts_cubic_calc_stride_tailm2(in_values + j + onset * n, ft, n);
- fts_idefix_incr(&idefix, incr);
- }
- */
-
- for(; i<out_m*n; i+=n)
- {
- int onset = fts_idefix_get_index(idefix);
- float frac = fts_idefix_get_frac(idefix);
- float left = in_values[j + onset * n];
- float right = in_values[j + onset * n + n];
-
- //out_values[i] = fts_cubic_calc_stride_head(in_values[j + onset] * n, ft, n);
- out_values[i] = left + (right - left) * frac;
- fts_idefix_incr(&idefix, incr);
- }
- }
-
- out->onset = in->onset;
- out->domain = in->domain * inv;
+ out_values[i] = fts_cubic_calc_stride_tailm2(in_values + j + onset * n, ft, n);
+ fts_idefix_incr(&idefix, incr);
+ }
+ */
+
+ for(; i<out_m*n; i+=n)
+ {
+ int onset = fts_idefix_get_index(idefix);
+ float frac = fts_idefix_get_frac(idefix);
+ float left = in_values[j + onset * n];
+ float right = in_values[j + onset * n + n];
+
+ //out_values[i] = fts_cubic_calc_stride_head(in_values[j + onset] * n, ft, n);
+ out_values[i] = left + (right - left) * frac;
+ fts_idefix_incr(&idefix, incr);
+ }
+ }
+
+ out->onset = in->onset;
+ out->domain = in->domain * inv;
fmat_unlock(in);
fmat_unlock(out);
- }
- else
+ }
+ else
{
fmat_lock(out);
- fm_reshape(out, 0, n);
+ fm_reshape(out, 0, n);
fmat_unlock(out);
}
}
@@ -917,7 +917,7 @@
{
int m = in->m;
int n = in->n;
-
+
if(m > 3)
{
double inv = 1.0 / factor;
@@ -930,46 +930,46 @@
fts_idefix_t idefix;
fts_idefix_t incr;
int i, j;
-
+
fts_idefix_set_float(&incr, factor);
-
+
for (j=0; j<n; j++)
{
- fts_idefix_set_zero(&idefix);
-
- /* copy first points without interpolation */
- for(i=j; i<out_head_m*n; i+=n)
- {
- fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
- out_values[i] = fts_cubic_calc_stride_head(in_values + j + fts_idefix_get_index(idefix), ft, n);
- fts_idefix_incr(&idefix, incr);
- }
-
- for(; i<out_tailm2_m*n; i+=n)
- {
- fts_cubic_idefix_interpolate_stride(in_values + j, idefix, n, out_values + i);
- fts_idefix_incr(&idefix, incr);
- }
-
- for(; i<out_tailm1_m*n; i+=n)
- {
- fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
- int onset = fts_idefix_get_index(idefix);
-
- out_values[i] = fts_cubic_calc_stride_tailm2_xm1(in_values + j + onset * n, ft, n, in_values[j]);
- fts_idefix_incr(&idefix, incr);
- }
-
- for(; i<out_m*n; i+=n)
- {
- fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
- int onset = fts_idefix_get_index(idefix);
+ fts_idefix_set_zero(&idefix);
+
+ /* copy first points without interpolation */
+ for(i=j; i<out_head_m*n; i+=n)
+ {
+ fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
+ out_values[i] = fts_cubic_calc_stride_head(in_values + j + fts_idefix_get_index(idefix), ft, n);
+ fts_idefix_incr(&idefix, incr);
+ }
+
+ for(; i<out_tailm2_m*n; i+=n)
+ {
+ fts_cubic_idefix_interpolate_stride(in_values + j, idefix, n, out_values + i);
+ fts_idefix_incr(&idefix, incr);
+ }
+
+ for(; i<out_tailm1_m*n; i+=n)
+ {
+ fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
+ int onset = fts_idefix_get_index(idefix);
+
+ out_values[i] = fts_cubic_calc_stride_tailm2_xm1(in_values + j + onset * n, ft, n, in_values[j]);
+ fts_idefix_incr(&idefix, incr);
+ }
+
+ for(; i<out_m*n; i+=n)
+ {
+ fts_cubic_coefs_t *ft = fts_cubic_table + fts_cubic_get_table_index_from_idefix(idefix);
+ int onset = fts_idefix_get_index(idefix);
- out_values[i] = fts_cubic_calc_stride_tailm1_xm2_xm1(in_values + j + onset * n, ft, n, in_values[j], in_values[j + n]);
- fts_idefix_incr(&idefix, incr);
- }
+ out_values[i] = fts_cubic_calc_stride_tailm1_xm2_xm1(in_values + j + onset * n, ft, n, in_values[j], in_values[j + n]);
+ fts_idefix_incr(&idefix, incr);
+ }
}
-
+
out->onset = in->onset;
out->domain = in->domain * inv;
@@ -1074,7 +1074,7 @@
ptr[i] = ptr[i + col];
ptr[i + col] = f;
- }
+ }
}
}
@@ -1203,7 +1203,7 @@
range += size;
if(range < 0)
- range = 0;
+ range = 0;
}
}
@@ -1250,7 +1250,7 @@
if(fts_is_number(value))
x = fts_get_number_float(value);
- if (m > 0 && n > 0)
+ if (m > 0 && n > 0)
{
if(ac > 0 && fts_is_number(at))
i = fts_get_number_int(at);
@@ -1266,7 +1266,7 @@
i += m;
if(i < 0)
- i = 0;
+ i = 0;
}
if (j >= n)
@@ -1276,12 +1276,12 @@
j += n;
if(j < 0)
- j = 0;
+ j = 0;
}
-
+
fmat_lock(self);
fmat_set_element(self, i, j, x);
- fmat_unlock(self);
+ fmat_unlock(self);
fts_object_changed(o);
}
@@ -1314,7 +1314,7 @@
i += m;
if(i < 0)
- i = 0;
+ i = 0;
}
if (j >= n)
@@ -1324,12 +1324,12 @@
j += n;
if(j < 0)
- j = 0;
+ j = 0;
}
-
+
fmat_lock(self);
fts_set_float(ret, fmat_get_element(self, i, j));
- fmat_unlock(self);
+ fmat_unlock(self);
}
}
@@ -1455,7 +1455,7 @@
if (vec_stride == 1)
memcpy(ptr, vec_ptr, vec_size * sizeof(float));
else
- for (i = 0, j = 0; i < vec_size; i++, j += vec_stride)
+ for (i = 0, j = 0; i < vec_size; i++, j += vec_stride)
ptr[i] = vec_ptr[j];
fmat_unlock(self);
@@ -1540,23 +1540,23 @@
if(fmat_or_fvec_vector_lock(obj, &vec_ptr, &vec_size, &vec_stride))
{
- int j, k;
-
- if (vec_size + 1 > n)
- {
- /* extend matrix, leaving already copied data intact */
- n = vec_size + 1;
+ int j, k;
+
+ if (vec_size + 1 > n)
+ {
+ /* extend matrix, leaving already copied data intact */
+ n = vec_size + 1;
- fmat_unlock(self);
- ptr = fmat_lock_capacity(self, size * n);
- fmat_set_n_nogrow(self, n);
- }
-
- /* copy vector into fmat row starting from col 1 */
- for(j=0, k=0; j<vec_size; j++, k+=vec_stride)
- ptr[i * n + 1 + j] = vec_ptr[k];
-
- fmat_or_fvec_unlock(obj);
+ fmat_unlock(self);
+ ptr = fmat_lock_capacity(self, size * n);
+ fmat_set_n_nogrow(self, n);
+ }
+
+ /* copy vector into fmat row starting from col 1 */
+ for(j=0, k=0; j<vec_size; j++, k+=vec_stride)
+ ptr[i * n + 1 + j] = vec_ptr[k];
+
+ fmat_or_fvec_unlock(obj);
}
}
else
@@ -1592,7 +1592,7 @@
static fts_method_status_t
_fmat_set_from_track(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
- fmat_t *self = (fmat_t *) o;
+ fmat_t *self = (fmat_t *) o;
track_t *track = (track_t *)fts_get_object(at);
fts_atom_t k;
@@ -1627,7 +1627,7 @@
}
fmat_unlock(self);
- mat_unlock(mat);
+ mat_unlock(mat);
fts_set_symbol(&k, fts_s_replace);
fts_object_changed_with_arguments(o, 1, &k);
@@ -1643,8 +1643,8 @@
fmat_t *self = (fmat_t *) o;
dict_t *dict = (dict_t *) fts_get_object(at);
fts_iterator_t iter;
- float *ptr;
- int m = 0;
+ float *ptr;
+ int m = 0;
fts_atom_t k;
dict_lock_read(dict);
@@ -1662,7 +1662,7 @@
fts_iterator_next(&iter, &key);
dict_get(dict, &key, &value);
- *ptr++ = fts_is_number(&key) ? fts_get_number_float(&key) : 0;
+ *ptr++ = fts_is_number(&key) ? fts_get_number_float(&key) : 0;
*ptr++ = fts_is_number(&value) ? fts_get_number_float(&value) : 0;
}
@@ -1712,10 +1712,10 @@
fts_atom_t *atoms = fts_tuple_get_atoms(tuple);
if(size > 0 && fts_is_number(atoms))
- i = fts_get_number_int(atoms);
+ i = fts_get_number_int(atoms);
if(size > 1 && fts_is_number(atoms + 1))
- j = fts_get_number_int(atoms + 1);
+ j = fts_get_number_int(atoms + 1);
}
if(i >= m)
@@ -1752,18 +1752,18 @@
fts_atom_t *atoms = fts_tuple_get_atoms(tuple);
if(size > 0 && fts_is_number(atoms))
- i = fts_get_number_int(atoms);
+ i = fts_get_number_int(atoms);
if(size > 1 && fts_is_number(atoms + 1))
- j = fts_get_number_int(atoms + 1);
+ j = fts_get_number_int(atoms + 1);
}
if(i >= 0 && j >= 0)
{
if(fts_is_number(&value))
- fmat_set_element(self, i, j, fts_get_number_float(&value));
+ fmat_set_element(self, i, j, fts_get_number_float(&value));
else
- fmat_set_element(self, i, j, 0.0);
+ fmat_set_element(self, i, j, 0.0);
}
}
@@ -1785,7 +1785,7 @@
int n = self->n;
int size = m * n;
- if (size > 0 && ac > 2 && fts_is_number(at) && fts_is_number(at + 1))
+ if (size > 0 && ac > 2 && fts_is_number(at) && fts_is_number(at + 1))
{
int i = fts_get_number_int(at);
int j = fts_get_number_int(at + 1);
@@ -1802,7 +1802,7 @@
i += m;
if(i < 0)
- i = 0;
+ i = 0;
}
if (j >= n)
@@ -1812,9 +1812,9 @@
j += n;
if(j < 0)
- j = 0;
+ j = 0;
}
-
+
onset = i * n + j;
if(onset + ac > size)
ac = size - onset;
@@ -1849,7 +1849,7 @@
{
row += m;
if (row < 0)
- row = 0;
+ row = 0;
}
else if (row >= m)
m = row + 1;
@@ -1885,7 +1885,7 @@
{
col += n;
if (col < 0)
- col = 0;
+ col = 0;
}
else if (col >= n)
n = col + 1;
@@ -1942,18 +1942,18 @@
if(fts_is_number(at))
{
if(ac > m * n)
- ac = m * n;
+ ac = m * n;
for(i=0; i<ac; i++)
{
- if(fts_is_number(at + i))
- ptr[i] = (float)fts_get_number_float(at + i);
- else
- ptr[i] = 0.0;
+ if(fts_is_number(at + i))
+ ptr[i] = (float)fts_get_number_float(at + i);
+ else
+ ptr[i] = 0.0;
}
for(; i<m*n; i++)
- ptr[i] = ptr[i % ac];
+ ptr[i] = ptr[i % ac];
}
else if(fts_is_a(at, expr_class))
{
@@ -1982,20 +1982,20 @@
for(i=0; i<m; i++)
{
- fts_set_int(row_ptr, i);
-
- for(j=0; j<n; j++)
- {
- fts_set_int(col_ptr, j);
-
- fts_atom_void(&ret);
- expr_evaluate(expr, &locals, ac - 1, at + 1, &ret);
-
- if(fts_is_number(&ret))
- ptr[i * n + j] = fts_get_number_float(&ret);
- else
- ptr[i * n + j] = 0.0;
- }
+ fts_set_int(row_ptr, i);
+
+ for(j=0; j<n; j++)
+ {
+ fts_set_int(col_ptr, j);
+
+ fts_atom_void(&ret);
+ expr_evaluate(expr, &locals, ac - 1, at + 1, &ret);
+
+ if(fts_is_number(&ret))
+ ptr[i * n + j] = fts_get_number_float(&ret);
+ else
+ ptr[i * n + j] = 0.0;
+ }
}
fts_hashtable_destroy(&locals);
@@ -2064,7 +2064,7 @@
upper = 0.0;
if(fts_is_number(at))
- upper = fts_get_number_float(at);
+ upper = fts_get_number_float(at);
break;
default:
@@ -2072,10 +2072,10 @@
upper = 0.0;
if(fts_is_number(at))
- lower = fts_get_number_float(at);
+ lower = fts_get_number_float(at);
if(fts_is_number(at + 1))
- upper = fts_get_number_float(at + 1);
+ upper = fts_get_number_float(at + 1);
break;
}
@@ -2106,7 +2106,7 @@
if (ac > 1 && fts_is_number(at + 1))
hi = fts_get_number_float(at + 1);
- if(ac > 2 && fts_is_number(at + 2))
+ if(ac > 2 && fts_is_number(at + 2))
range = fts_get_number_float(at + 2);
fstride_fill_ramp(ptr, size, 1, lo, hi, range, 0);
@@ -2135,7 +2135,7 @@
if (ac > 1 && fts_is_number(at + 1))
hi = fts_get_number_float(at + 1);
- if(ac > 2 && fts_is_number(at + 2))
+ if(ac > 2 && fts_is_number(at + 2))
range = fts_get_number_float(at + 2);
fstride_fill_ramp(ptr, size, 1, lo, hi, range, 1);
@@ -2304,9 +2304,9 @@
i = fts_get_int(at);
if(i < 0)
- i = 0;
+ i = 0;
else if(i >= m)
- i = m - 1;
+ i = m - 1;
}
else if(fts_is_float(at))
{
@@ -2314,12 +2314,12 @@
if(i_arg > 0.0)
{
- i = (int)i_arg;
-
- if(i >= m - 1)
- i = m - 1;
- else
- i_frac = i_arg - floor(i_arg);
+ i = (int)i_arg;
+
+ if(i >= m - 1)
+ i = m - 1;
+ else
+ i_frac = i_arg - floor(i_arg);
}
}
@@ -2327,26 +2327,26 @@
{
if(fts_is_int(at + 1))
{
- j = fts_get_int(at + 1);
-
- if(j < 0)
- j = 0;
- else if(j >= m)
- j = m - 1;
+ j = fts_get_int(at + 1);
+
+ if(j < 0)
+ j = 0;
+ else if(j >= m)
+ j = m - 1;
}
else if(fts_is_float(at + 1))
{
- double j_arg = fts_get_float(at + 1);
-
- if(j_arg > 0.0)
- {
- j = (int)j_arg;
-
- if(j >= m - 1)
- j = m - 1;
- else
- j_frac = j_arg - floor(j_arg);
- }
+ double j_arg = fts_get_float(at + 1);
+
+ if(j_arg > 0.0)
+ {
+ j = (int)j_arg;
+
+ if(j >= m - 1)
+ j = m - 1;
+ else
+ j_frac = j_arg - floor(j_arg);
+ }
}
}
@@ -2356,9 +2356,9 @@
if(j_frac != 0.0)
{
- double g = (1.0 - i_frac) * ptr[i * n + j + 1] + i_frac * ptr[(i + 1) * n + j + 1];
-
- r = (1.0 - j_frac) * r + j_frac * g;
+ double g = (1.0 - i_frac) * ptr[i * n + j + 1] + i_frac * ptr[(i + 1) * n + j + 1];
+
+ r = (1.0 - j_frac) * r + j_frac * g;
}
}
else if(j_frac != 0.0)
@@ -2378,7 +2378,7 @@
static fts_method_status_t
_fmat_get_row (fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
- fmat_t *self = (fmat_t *) o;
+ fmat_t *self = (fmat_t *) o;
fts_tuple_t *rowtup = (fts_tuple_t *)fts_object_create(fts_tuple_class, 0, NULL);
fts_atom_t *atoms;
@@ -2391,23 +2391,23 @@
int size = n;
int j; /* column */
- if (ac > 1 && fts_is_number(at+1))
+ if (ac > 1 && fts_is_number(at+1))
{
offset = fts_get_number_int(at+1);
if (offset < 0)
- offset = 0;
+ offset = 0;
if (offset > n)
- offset = n;
+ offset = n;
}
- if (ac > 2 && fts_is_number(at+2))
+ if (ac > 2 && fts_is_number(at+2))
{
size = fts_get_number_int(at+2);
if (size < 0)
- size = 0;
+ size = 0;
if (size > n - offset)
- size = n - offset;
+ size = n - offset;
}
/* handle wraparound/clipping */
@@ -2419,7 +2419,7 @@
i += m;
if(i < 0)
- i = 0;
+ i = 0;
}
fts_tuple_set_size(rowtup, size);
@@ -2455,23 +2455,23 @@
int size = m;
int i; /* row */
- if (ac > 1 && fts_is_number(at+1))
+ if (ac > 1 && fts_is_number(at+1))
{
offset = fts_get_number_int(at+1);
if (offset < 0)
- offset = 0;
+ offset = 0;
if (offset > m)
- offset = m;
+ offset = m;
}
- if (ac > 2 && fts_is_number(at+2))
+ if (ac > 2 && fts_is_number(at+2))
{
size = fts_get_number_int(at+2);
if (size < 0)
- size = 0;
+ size = 0;
if (size > m - offset)
- size = m - offset;
+ size = m - offset;
}
/* handle wraparound/clipping */
@@ -2483,7 +2483,7 @@
j += n;
if(j < 0)
- j = 0;
+ j = 0;
}
fts_tuple_set_size(coltup, size);
@@ -2517,16 +2517,16 @@
int order = 3;
if(ac > 1 && fts_is_number(at + 1))
- order = fts_get_number_int(at + 1);
+ order = fts_get_number_int(at + 1);
if(order > 1)
{
- float *out_ptr = fmat_lock_reshape(self, size, 1);
-
- fstride_central_moving_average(ptr, size, 1, out_ptr, order);
- fmat_unlock(self);
-
- fts_object_changed(o);
+ float *out_ptr = fmat_lock_reshape(self, size, 1);
+
+ fstride_central_moving_average(ptr, size, 1, out_ptr, order);
+ fmat_unlock(self);
+
+ fts_object_changed(o);
}
fmat_or_fvec_unlock(obj);
@@ -2569,13 +2569,13 @@
if(diff < -0.5 * range)
{
- f += range;
- onset += range;
+ f += range;
+ onset += range;
}
else if(diff > 0.5 * range)
{
- f -= range;
- onset -= range;
+ f -= range;
+ onset -= range;
}
last = ptr[i] = f;
@@ -2762,7 +2762,7 @@
* @method insert
* @param int: pos index of row where to insert
* @param tuples: atoms list of tuples of rows of atoms to append,
- * will be clipped to width of matrix
+ * will be clipped to width of matrix
*/
static fts_method_status_t
_fmat_insert_rows(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
@@ -2813,15 +2813,15 @@
* @method insert
* @param int: pos index of row where to insert
* @param tuples: atoms list of tuples of rows of atoms to append,
- * will be clipped to width of matrix
+ * will be clipped to width of matrix
*/
static fts_method_status_t
_fmat_insert_columns(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fmat_t *self = (fmat_t *) o;
int n = self->n;
- int pos = 0; // col position at which to insert
- int num = 1; // number of columns to insert
+ int pos = 0; // col position at which to insert
+ int num = 1; // number of columns to insert
/* method returns this object in any case */
fts_set_object(ret, o);
@@ -2842,7 +2842,7 @@
fm_grow_locked(self, self->m * (n + num));
fmat_lock(self);
- fmat_insert_columns_nogrow(self, pos, num);
+ fmat_insert_columns_nogrow(self, pos, num);
fmat_unlock(self);
fts_object_changed(o);
@@ -2855,7 +2855,7 @@
_fmat_delete_columns(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fmat_t *self = (fmat_t *) o;
- int pos = 0;
+ int pos = 0;
int num = 1;// number of columns to delete
/* method returns this object in any case */
@@ -2886,8 +2886,8 @@
_fmat_delete_rows(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
fmat_t *self = (fmat_t *) o;
- int pos = 0;
- int numrows = 1;
+ int pos = 0;
+ int numrows = 1;
/* method returns this object in any case */
fts_set_object(ret, o);
@@ -2923,7 +2923,7 @@
for (i = 1; i < size; i++)
if (p[i] < min)
- min = p[i];
+ min = p[i];
fts_set_float(ret, min);
}
@@ -2945,7 +2945,7 @@
for (i = 1; i < size; i++)
if (p[i] > max)
- max = p[i];
+ max = p[i];
fts_set_float(ret, max);
}
@@ -2967,7 +2967,7 @@
for (i = 1; i < size; i++)
if (fabsf(p[i]) > max)
- max = fabsf(p[i]);
+ max = fabsf(p[i]);
fts_set_float(ret, max);
}
@@ -2996,10 +2996,10 @@
_fmat_get_prod (fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret)
{
const fmat_t *self = (fmat_t *) o;
- const int size = self->m * self->n;
+ const int size = self->m * self->n;
const float *p = self->values;
- double prod = 1.0;
- int i;
+ double prod = 1.0;
+ int i;
for (i = 0; i < size; i++)
prod *= p[i];
@@ -3051,8 +3051,8 @@
if(f != 0.0)
{
- zc += (prev * f) < 0.0;
- prev = f;
+ zc += (prev * f) < 0.0;
+ prev = f;
}
}
@@ -3082,7 +3082,7 @@
while(i < size && sum < q)
{
- sum += ptr[i];
+ sum += ptr[i];
i++;
}
}
@@ -3119,7 +3119,7 @@
i += m;
if(i < 0)
- i = 0;
+ i = 0;
}
if (j >= n)
@@ -3129,7 +3129,7 @@
j += n;
if(j < 0)
- j = 0;
+ j = 0;
}
ptr[i * n + j] += op;
@@ -3418,14 +3418,14 @@
{
fmat_t *self = (fmat_t *) o;
- if (ac > 1 && fts_is_number(at) && fts_is_number(at+1))
+ if (ac > 1 && fts_is_number(at) && fts_is_number(at+1))
{
# define sqrt_of_two_pi 2.5066282746310005024157652848110452530069867406099383
- float *p = fmat_lock(self);
- int size = self->m * self->n;
- double mu = fts_get_number_float(at);
+ float *p = fmat_lock(self);
+ int size = self->m * self->n;
+ double mu = fts_get_number_float(at);
double sigma = fts_get_number_float(at+1);
- int i;
+ int i;
double norm = 1 / (sigma * sqrt_of_two_pi);
for (i = 0; i < size; i++)
@@ -3452,13 +3452,13 @@
{
fmat_t *self = (fmat_t *) o;
- if (ac > 1 && fts_is_number(at) && fts_is_number(at+1))
+ if (ac > 1 && fts_is_number(at) && fts_is_number(at+1))
{
- float *p = fmat_lock(self);
- int size = self->m * self->n;
- double mu = fts_get_number_float(at);
+ float *p = fmat_lock(self);
+ int size = self->m * self->n;
+ double mu = fts_get_number_float(at);
double sigma = fts_get_number_float(at+1);
- int i;
+ int i;
for (i = 0; i < size; i++)
{
@@ -3919,8 +3919,8 @@
{
if(!float_equals(ptr[i], comp_ptr[i]))
{
- equals = 0;
- break;
+ equals = 0;
+ break;
}
}
}
@@ -4141,7 +4141,7 @@
int i;
for(i=0; i<m; i++)
- l[i] *= r[i];
+ l[i] *= r[i];
fmat_unlock(self);
}
@@ -4153,10 +4153,10 @@
for(i=m-1, j=(m-1)*2; i>=0; i--, j-=2)
{
- float re = l[i];
-
- l[j] = re * r[j];
- l[j + 1] = re * r[j + 1];
+ float re = l[i];
+
+ l[j] = re * r[j];
+ l[j + 1] = re * r[j + 1];
}
fmat_unlock(self);
@@ -4174,8 +4174,8 @@
for(i=0, j=0; i<m; i++, j+=2)
{
- l[j] *= r[i];
- l[j + 1] *= r[i];
+ l[j] *= r[i];
+ l[j + 1] *= r[i];
}
fmat_unlock(self);
@@ -4188,11 +4188,11 @@
for(i=0; i<m*2; i+=2)
{
- float re = l[i];
- float im = l[i + 1];
-
- l[i] = re * r[i] - im * r[i + 1];
- l[i + 1] = re * r[i + 1] + im * r[i];
+ float re = l[i];
+ float im = l[i + 1];
+
+ l[i] = re * r[i] - im * r[i + 1];
+ l[i + 1] = re * r[i + 1] + im * r[i];
}
fmat_unlock(self);
@@ -4225,7 +4225,7 @@
int m = self->m;
for(i=0; i<m*n; i++)
- l[i] *= r;
+ l[i] *= r;
fmat_unlock(self);
@@ -4323,12 +4323,12 @@
float abs2 = re * re + im * im;
if(abs2 > LOG_ARG_MIN)
- {
- ptr[i] = 0.5 * logf(abs2);
- }
- else
- ptr[i] = 0.5 * LOG_MIN;
- }
+ {
+ ptr[i] = 0.5 * logf(abs2);
+ }
+ else
+ ptr[i] = 0.5 * LOG_MIN;
+ }
fm_reshape(self, m, 1);
@@ -4362,13 +4362,13 @@
float abs2 = re * re + im * im;
if(abs2 > LOG_ARG_MIN)
- {
- ptr[i] = 0.5 * logf(abs2);
- }
+ {
+ ptr[i] = 0.5 * logf(abs2);
+ }
else
- {
- ptr[i] = 0.5 * LOG_MIN;
- }
+ {
+ ptr[i] = 0.5 * LOG_MIN;
+ }
ptr[i + 1] = (float)atan2(im, re);
}
@@ -4452,7 +4452,7 @@
fts_complex_t *fft_ptr = (fts_complex_t *)fmat_lock_reshape(self, fft_size, 2);
unsigned int i;
- /* zero padding */
+ /* zero padding */
for(i=m; i<fft_size; i++)
fft_ptr[i].re = fft_ptr[i].im = 0.0;
@@ -4482,7 +4482,7 @@
int fft_size = fts_get_fft_size(m);
int i;
- /* zero padding */
+ /* zero padding */
for(i=2*m; i<fft_size; i++)
ptr[i] = 0.0;
@@ -4517,7 +4517,7 @@
else
ptr[1] = 0.0;
- /* zero padding */
+ /* zero padding */
for(i=2*m; i<fft_size; i++)
ptr[i] = 0.0;
@@ -4561,13 +4561,13 @@
for(i_col=0; i_col<n; i_col++)
{
- float f = 0.0;
-
- for(i=0, j=0; i<m; i++, j+=n)
- f += in_row[i] * col[j];
-
- res_row[i_col] = f;
- col++;
+ float f = 0.0;
+
+ for(i=0, j=0; i<m; i++, j+=n)
+ f += in_row[i] * col[j];
+
+ res_row[i_col] = f;
+ col++;
}
/* next row */
@@ -4685,9 +4685,9 @@
double f = ptr[i];
if(f > max)
- max = f;
+ max = f;
else if(f < -max)
- max = -f;
+ max = -f;
}
if(max != 0.0)
@@ -4695,7 +4695,7 @@
double scale = norm / max;
for(i=0; i<size; i++)
- ptr[i] *= scale;
+ ptr[i] *= scale;
}
}
@@ -4752,7 +4752,7 @@
float scale = norm / sum;
for(i=0; i<size; i++)
- ptr[i] *= scale;
+ ptr[i] *= scale;
}
}
@@ -4884,8 +4884,8 @@
for(j=0; j<n; j++)
{
- ptr[j] *= f;
- rtp[j] *= f;
+ ptr[j] *= f;
+ rtp[j] *= f;
}
ptr += n;
@@ -4927,14 +4927,14 @@
int index = (int)i_index;
if(index >= fun_size - 1)
- ptr[i] = fun[(fun_size - 1) * fun_stride];
+ ptr[i] = fun[(fun_size - 1) * fun_stride];
else
{
- double frac = f_index - i_index;
- double fun_0 = fun[index * fun_stride];
- double fun_1 = fun[(index + 1) * fun_stride];
-
- ptr[i] = (1.0 - frac) * fun_0 + frac * fun_1;
+ double frac = f_index - i_index;
+ double fun_0 = fun[index * fun_stride];
+ double fun_1 = fun[(index + 1) * fun_stride];
+
+ ptr[i] = (1.0 - frac) * fun_0 + frac * fun_1;
}
}
}
@@ -5010,9 +5010,9 @@
expr_evaluate(expr, &locals, ac - 1, at + 1, &r);
if(fts_is_number(&r))
- ptr[i] = fts_get_number_float(&r);
+ ptr[i] = fts_get_number_float(&r);
else
- ptr[i] = 0.0;
+ ptr[i] = 0.0;
}
fts_hashtable_destroy(&locals);
@@ -5066,8 +5066,8 @@
fts_atom_void(&r);
expr_evaluate(expr, &locals, ac - 1, at + 1, &r);
- if (fts_is_number(&r) && fts_get_number_int(&r) != 0)
- ptr[j++] = i;
+ if (fts_is_number(&r) && fts_get_number_int(&r) != 0)
+ ptr[j++] = i;
}
fts_hashtable_destroy(&locals);
@@ -5174,7 +5174,7 @@
float swap = ptr[next];
if (next < end)
- end = next;
+ end = next;
ptr[next] = forward;
forward = swap;
@@ -5204,9 +5204,9 @@
if(size > 1)
{
- int shift = n; /* default: one row up */
+ int shift = n; /* default: one row up */
- if (ac > 0 && fts_is_number(at))
+ if (ac > 0 && fts_is_number(at))
shift = fts_get_number_int(at) * n;
/* rotate rows */
@@ -5224,7 +5224,7 @@
}
/* rotate columns */
- if (ac > 1 && fts_is_number(at + 1))
+ if (ac > 1 && fts_is_number(at + 1))
{
int i;
@@ -5233,18 +5233,18 @@
/* rotate columns for each row */
if (shift == 1)
{
- for (i = 0; i < m; i++)
- rotate_up(ptr + i * n, n);
+ for (i = 0; i < m; i++)
+ rotate_up(ptr + i * n, n);
}
else if (shift == -1)
{
- for (i = 0; i < m; i++)
- rotate_down(ptr + i * n, n);
+ for (i = 0; i < m; i++)
+ rotate_down(ptr + i * n, n);
}
else if (shift != 0)
{
- for (i = 0; i < m; i++)
- rotate_n(ptr + i * n, n, shift);
+ for (i = 0; i < m; i++)
+ rotate_n(ptr + i * n, n, shift);
}
}
}
@@ -5288,10 +5288,10 @@
for(j=0; j<n; j++)
{
- float f = row[j];
-
- row[j] = rand_row[j];
- rand_row[j] = f;
+ float f = row[j];
+
+ row[j] = rand_row[j];
+ rand_row[j] = f;
}
}
}
@@ -5409,12 +5409,12 @@
ptrj = ptri + n;
while (*ptri == *ptrj)
- j++, ptrj += n; /* look for contiguous lines with equal index */
+ j++, ptrj += n; /* look for contiguous lines with equal index */
if (j > 0)
{ /* remove lines with equal index.
- N.B.: self->m is changed! */
- fmat_delete_rows(self, i + 1, j);
+ N.B.: self->m is changed! */
+ fmat_delete_rows(self, i + 1, j);
}
ptri += n;
@@ -5439,7 +5439,7 @@
fts_spost(stream, " ");
for (j = 0; j < n - 1; j++)
- fts_spost(stream, "%.7g ", fmat_get_element(self, i, j));
+ fts_spost(stream, "%.7g ", fmat_get_element(self, i, j));
fts_spost(stream, "%.7g,\n", fmat_get_element(self, i, n-1));
}
@@ -5760,16 +5760,16 @@
fts_class_message(cl, fts_s_equals, fmat_class, _fmat_equals, "<fmat: other> return 1 if fmats are equal size and all values are equal");
-#define FUN INSTALL_FUN
-#define FUN4 INSTALL_MAPFUN
-#define FUN5 INSTALL_MAPFUN
-#define FUN6 INSTALL_MAPFUN
+#define FUN INSTALL_FUN
+#define FUN4 INSTALL_MAPFUN
+#define FUN5 INSTALL_MAPFUN
+#define FUN6 INSTALL_MAPFUN
#include "mathfuns.h"
#include "mapfunlist.h"
-#undef FUN
-#undef FUN4
-#undef FUN5
-#undef FUN6
+#undef FUN
+#undef FUN4
+#undef FUN5
+#undef FUN6
fts_class_message_void(cl, fts_new_symbol("sqrabs"), _fmat_sqrabs, "- calulate square of absolute values of current values");
@@ -5826,7 +5826,7 @@
fts_class_message_varargs(cl, fts_new_symbol("reshape"), _fmat_reshape, "- change matrix dimensions (without adapting content)");
fmat_null = (fmat_t *)fts_object_create(fmat_class, 0, 0);
- fts_object_refer((fts_object_t *)fmat_null);
+ fts_object_refer((fts_object_t *)fmat_null);
}
FTS_MODULE_INIT(fmat)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2015-09-18 15:00:59
|
Revision: 3682
http://sourceforge.net/p/ftm/code/3682
Author: borghesi
Date: 2015-09-18 15:00:56 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
Modified Paths:
--------------
trunk/ftm/patches/max5/help/ftm.editor.maxhelp
Modified: trunk/ftm/patches/max5/help/ftm.editor.maxhelp
===================================================================
--- trunk/ftm/patches/max5/help/ftm.editor.maxhelp 2015-09-18 14:43:12 UTC (rev 3681)
+++ trunk/ftm/patches/max5/help/ftm.editor.maxhelp 2015-09-18 15:00:56 UTC (rev 3682)
@@ -2,9 +2,11 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
- "major" : 6,
+ "major" : 7,
"minor" : 0,
- "revision" : 7
+ "revision" : 5,
+ "architecture" : "x86",
+ "modernui" : 1
}
,
"rect" : [ 410.0, 107.0, 781.0, 841.0 ],
@@ -13,25 +15,34 @@
"default_fontsize" : 10.0,
"default_fontface" : 0,
"default_fontname" : "Verdana",
- "gridonopen" : 0,
+ "gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
- "gridsnaponopen" : 0,
+ "gridsnaponopen" : 1,
+ "objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
+ "lefttoolbarpinned" : 0,
+ "toptoolbarpinned" : 0,
+ "righttoolbarpinned" : 0,
+ "bottomtoolbarpinned" : 0,
+ "toolbars_unpinned_last_save" : 0,
+ "tallnewobj" : 0,
"boxanimatetime" : 200,
- "imprint" : 0,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
+ "style" : "",
+ "subpatcher_template" : "",
"boxes" : [ {
"box" : {
"#init" : "",
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -42,9 +53,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 27.0, 426.0, 486.870056, 29.0 ],
+ "patching_rect" : [ 27.0, 426.0, 481.0, 29.0 ],
"presentation_linecount" : 2,
- "presentation_rect" : [ 27.0, 426.0, 486.870056, 29.0 ],
+ "presentation_rect" : [ 27.0, 426.0, 481.0, 29.0 ],
"text" : [ "_set $mbpf-ex3 multibpf $markers-ex3 markers, view 0 layout superposed, view 0 opacity 0.3,", "_view 0 foremost 2, view 0 name bpfs, view 1 name markers" ]
}
@@ -55,6 +66,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -65,9 +77,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 26.0, 394.0, 496.782227, 29.0 ],
+ "patching_rect" : [ 26.0, 394.0, 494.0, 29.0 ],
"presentation_linecount" : 2,
- "presentation_rect" : [ 26.0, 394.0, 496.782227, 29.0 ],
+ "presentation_rect" : [ 26.0, 394.0, 494.0, 29.0 ],
"text" : [ "_set $wave $markers-ex2 markers $bpf-ex2, view 1 fgcolor 1. 0. 0., view 2 fgcolor 0. 1. 0.,", "_opacity 0.5, foremost 2, foremost 1, view 0 name audio, view 1 name markers, view 2 name bpf" ]
}
@@ -77,12 +89,12 @@
"bgcolor" : [ 1.0, 1.0, 1.0, 0.603922 ],
"fontname" : "Verdana",
"fontsize" : 12.0,
- "frgb" : 0.0,
"id" : "obj-38",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 49.0, 342.0, 68.0, 21.0 ],
+ "style" : "",
"text" : "Examples"
}
@@ -93,6 +105,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -103,9 +116,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 26.0, 362.0, 521.874939, 29.0 ],
+ "patching_rect" : [ 26.0, 362.0, 516.0, 29.0 ],
"presentation_linecount" : 2,
- "presentation_rect" : [ 26.0, 362.0, 521.874939, 29.0 ],
+ "presentation_rect" : [ 26.0, 362.0, 516.0, 29.0 ],
"text" : [ "_set $sound-ex1 wave $markers-ex1 markers $means-ex1 sonogram, view 2 depth 0. 0.1, opacity 0.,", "_foremost 1, foremost 0, view 0 name audio, view 1 name markers, view 2 name means" ]
}
@@ -116,12 +129,12 @@
"fontface" : 1,
"fontname" : "Arial",
"fontsize" : 16.0,
- "frgb" : 0.0,
"id" : "obj-23",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 424.0, 725.0, 67.0, 24.0 ],
+ "style" : "",
"text" : "globals"
}
@@ -132,6 +145,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -141,8 +155,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 482.0, 244.0, 74.599121, 15.0 ],
- "presentation_rect" : [ 482.0, 244.0, 74.599121, 15.0 ],
+ "patching_rect" : [ 482.0, 244.0, 72.687851, 15.0 ],
+ "presentation_rect" : [ 482.0, 244.0, 72.687851, 15.0 ],
"text" : [ "_insert 0 $bpf3" ]
}
@@ -151,13 +165,13 @@
"box" : {
"fontname" : "Helvetica",
"fontsize" : 11.0,
- "frgb" : 0.0,
"id" : "obj-30",
"linecount" : 2,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 27.0, 244.0, 447.0, 28.0 ],
+ "style" : "",
"text" : "The Messages \"insert\", followed by index and an object reference (and an optional interface name), insert a new editor to the given position"
}
@@ -168,6 +182,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -177,8 +192,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 480.0, 221.0, 75.23291, 15.0 ],
- "presentation_rect" : [ 480.0, 221.0, 75.23291, 15.0 ],
+ "patching_rect" : [ 480.0, 221.0, 73.321953, 15.0 ],
+ "presentation_rect" : [ 480.0, 221.0, 73.321953, 15.0 ],
"text" : [ "_append $bpf1" ]
}
@@ -187,13 +202,13 @@
"box" : {
"fontname" : "Helvetica",
"fontsize" : 11.0,
- "frgb" : 0.0,
"id" : "obj-28",
"linecount" : 2,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 27.0, 215.0, 447.0, 28.0 ],
+ "style" : "",
"text" : "The Messages \"append\", followed by an object reference and an optional interface name, appends a new editor to the list of editors"
}
@@ -203,12 +218,12 @@
"bgcolor" : [ 1.0, 1.0, 1.0, 0.603922 ],
"fontname" : "Verdana",
"fontsize" : 12.0,
- "frgb" : 0.0,
"id" : "obj-25",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 49.0, 193.0, 122.0, 21.0 ],
+ "style" : "",
"text" : "Append and Insert"
}
@@ -219,6 +234,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -229,9 +245,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 455.0, 304.0, 100.906738, 26.0 ],
+ "patching_rect" : [ 455.0, 304.0, 99.0, 26.0 ],
"presentation_linecount" : 2,
- "presentation_rect" : [ 455.0, 304.0, 100.906738, 26.0 ],
+ "presentation_rect" : [ 455.0, 304.0, 99.0, 26.0 ],
"text" : [ "_clear,", "_$bpf1 $bpf2 $wave" ]
}
@@ -240,13 +256,13 @@
"box" : {
"fontname" : "Helvetica",
"fontsize" : 11.0,
- "frgb" : 0.0,
"id" : "obj-24",
"linecount" : 3,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 27.0, 297.0, 424.0, 39.0 ],
+ "style" : "",
"text" : "Using directly a list of FTM object references works like \"set\" when the editor is empty (using the default interfaces) or \"replace\" otherwise. Optional interface names could follow the refrence and will be used only for first \"set\"."
}
@@ -256,12 +272,12 @@
"bgcolor" : [ 1.0, 1.0, 1.0, 0.603922 ],
"fontname" : "Verdana",
"fontsize" : 12.0,
- "frgb" : 0.0,
"id" : "obj-20",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 49.0, 273.0, 156.0, 21.0 ],
+ "style" : "",
"text" : "List of object references"
}
@@ -272,6 +288,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -281,8 +298,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 390.0, 172.0, 74.604492, 15.0 ],
- "presentation_rect" : [ 390.0, 172.0, 74.604492, 15.0 ],
+ "patching_rect" : [ 390.0, 172.0, 72.693222, 15.0 ],
+ "presentation_rect" : [ 390.0, 172.0, 72.693222, 15.0 ],
"text" : [ "_replace $bpf2" ]
}
@@ -291,12 +308,12 @@
"box" : {
"fontname" : "Verdana",
"fontsize" : 10.0,
- "frgb" : 0.0,
"id" : "obj-14",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 329.0, 170.0, 51.0, 19.0 ],
+ "style" : "",
"text" : "AFTER :"
}
@@ -307,6 +324,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -328,13 +346,13 @@
"box" : {
"fontname" : "Helvetica",
"fontsize" : 11.0,
- "frgb" : 0.0,
"id" : "obj-16",
"linecount" : 4,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 26.0, 136.0, 286.0, 50.0 ],
+ "style" : "",
"text" : "The message \"replace\", followed by a list of FTM object references, replaces objects inside preexisting editors (if possible), preserving the current interfaces and properties."
}
@@ -343,12 +361,12 @@
"box" : {
"fontname" : "Verdana",
"fontsize" : 10.0,
- "frgb" : 0.0,
"id" : "obj-19",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 328.0, 134.0, 45.0, 19.0 ],
+ "style" : "",
"text" : "FIRST:"
}
@@ -358,12 +376,12 @@
"bgcolor" : [ 1.0, 1.0, 1.0, 0.603922 ],
"fontname" : "Verdana",
"fontsize" : 12.0,
- "frgb" : 0.0,
"id" : "obj-10",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 49.0, 114.0, 57.0, 21.0 ],
+ "style" : "",
"text" : "Replace"
}
@@ -372,13 +390,13 @@
"box" : {
"fontname" : "Helvetica",
"fontsize" : 11.0,
- "frgb" : 0.0,
"id" : "obj-5",
"linecount" : 4,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 28.0, 55.0, 292.0, 50.0 ],
+ "style" : "",
"text" : "The message \"set\" followed by a list of FTM object references, clears the ftm.editor and creates new editors. \nEach object can be optionnally followed by an interface name (if not a default interface name wiill be used)"
}
@@ -387,13 +405,13 @@
"box" : {
"fontname" : "Helvetica",
"fontsize" : 11.0,
- "frgb" : 0.0,
"id" : "obj-6",
"linecount" : 2,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 422.0, 83.0, 125.0, 28.0 ],
+ "style" : "",
"text" : "displays the fvec object\n with \"matrix\" interface"
}
@@ -402,13 +420,13 @@
"box" : {
"fontname" : "Helvetica",
"fontsize" : 11.0,
- "frgb" : 0.0,
"id" : "obj-7",
"linecount" : 2,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 388.0, 49.0, 161.0, 28.0 ],
+ "style" : "",
"text" : "displays the fvec object \nwith the default \"fvec\" interface"
}
@@ -419,6 +437,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -428,8 +447,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 324.0, 87.0, 90.470703, 15.0 ],
- "presentation_rect" : [ 324.0, 87.0, 90.470703, 15.0 ],
+ "patching_rect" : [ 324.0, 87.0, 88.567192, 15.0 ],
+ "presentation_rect" : [ 324.0, 87.0, 88.567192, 15.0 ],
"text" : [ "_set $wave matrix" ]
}
@@ -440,6 +459,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -449,8 +469,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 323.0, 56.0, 55.526855, 15.0 ],
- "presentation_rect" : [ 323.0, 56.0, 55.526855, 15.0 ],
+ "patching_rect" : [ 323.0, 56.0, 55.551064, 15.0 ],
+ "presentation_rect" : [ 323.0, 56.0, 55.551064, 15.0 ],
"text" : [ "_set $wave" ]
}
@@ -460,12 +480,12 @@
"bgcolor" : [ 1.0, 1.0, 1.0, 0.603922 ],
"fontname" : "Verdana",
"fontsize" : 12.0,
- "frgb" : 0.0,
"id" : "obj-13",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 49.0, 32.0, 31.0, 21.0 ],
+ "style" : "",
"text" : "Set"
}
@@ -476,12 +496,12 @@
"fontface" : 1,
"fontname" : "Arial",
"fontsize" : 16.0,
- "frgb" : 0.0,
"id" : "obj-2",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 32.0, 12.0, 222.0, 24.0 ],
+ "style" : "",
"text" : "Setting objects in ftm.editor"
}
@@ -498,9 +518,11 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
- "major" : 6,
+ "major" : 7,
"minor" : 0,
- "revision" : 7
+ "revision" : 5,
+ "architecture" : "x86",
+ "modernui" : 1
}
,
"rect" : [ 751.0, 413.0, 430.0, 296.0 ],
@@ -509,25 +531,34 @@
"default_fontsize" : 10.0,
"default_fontface" : 0,
"default_fontname" : "Verdana",
- "gridonopen" : 0,
+ "gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
- "gridsnaponopen" : 0,
+ "gridsnaponopen" : 1,
+ "objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
+ "lefttoolbarpinned" : 0,
+ "toptoolbarpinned" : 0,
+ "righttoolbarpinned" : 0,
+ "bottomtoolbarpinned" : 0,
+ "toolbars_unpinned_last_save" : 0,
+ "tallnewobj" : 0,
"boxanimatetime" : 200,
- "imprint" : 0,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
+ "style" : "",
+ "subpatcher_template" : "",
"boxes" : [ {
"box" : {
"#init" : "",
"#loadbang" : 1,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -537,8 +568,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 80.0, 269.0, 95.326172, 19.0 ],
- "presentation_rect" : [ 80.0, 269.0, 95.326172, 19.0 ],
+ "patching_rect" : [ 80.0, 269.0, 95.326172, 18.578125 ],
+ "presentation_rect" : [ 80.0, 269.0, 95.326172, 18.578125 ],
"text" : [ "_set $dictionary" ]
}
@@ -547,12 +578,12 @@
"box" : {
"fontname" : "Verdana",
"fontsize" : 14.0,
- "frgb" : 0.0,
"id" : "obj-114",
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 6.0, 241.0, 414.0, 24.0 ],
+ "style" : "",
"text" : "Dict class implements just the matrix interfaces: "
}
@@ -563,10 +594,11 @@
"autoupdate" : 120.0,
"bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"cursor_color" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "cursor_followmouse" : 0,
"cursor_position" : -1.0,
"cursor_size" : 3,
"cursor_visible" : 1,
- "domain_bounds" : [ 0.0, 0.0 ],
+ "domain_bounds" : [ -0.0, 1.1 ],
"domainruler_bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"domainruler_fgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"domainruler_grid" : 0,
@@ -625,20 +657,18 @@
]
}
,
- "patching_rect" : [ 324.0, 761.0, 49.0, 24.0 ],
+ "patching_rect" : [ 324.0, 761.0, 49.0, 26.0 ],
"saved_object_attributes" : {
- "default_fontface" : 0,
- "default_fontname" : "Verdana",
- "default_fontsize" : 10.0,
"description" : "",
"digest" : "",
- "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"globalpatchername" : "",
+ "style" : "",
"tags" : ""
}
,
+ "style" : "",
"text" : "p dict"
}
@@ -655,9 +685,11 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
- "major" : 6,
+ "major" : 7,
"minor" : 0,
- "revision" : 7
+ "revision" : 5,
+ "architecture" : "x86",
+ "modernui" : 1
}
,
"rect" : [ 742.0, 349.0, 435.0, 530.0 ],
@@ -666,25 +698,34 @@
"default_fontsize" : 10.0,
"default_fontface" : 0,
"default_fontname" : "Verdana",
- "gridonopen" : 0,
+ "gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
- "gridsnaponopen" : 0,
+ "gridsnaponopen" : 1,
+ "objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
+ "lefttoolbarpinned" : 0,
+ "toptoolbarpinned" : 0,
+ "righttoolbarpinned" : 0,
+ "bottomtoolbarpinned" : 0,
+ "toolbars_unpinned_last_save" : 0,
+ "tallnewobj" : 0,
"boxanimatetime" : 200,
- "imprint" : 0,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
+ "style" : "",
+ "subpatcher_template" : "",
"boxes" : [ {
"box" : {
"#init" : "",
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -695,9 +736,9 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 445.0, 249.0, 34.0 ],
+ "patching_rect" : [ 100.0, 445.0, 249.0, 33.15625 ],
"presentation_linecount" : 2,
- "presentation_rect" : [ 100.0, 445.0, 249.0, 34.0 ],
+ "presentation_rect" : [ 100.0, 445.0, 249.0, 33.15625 ],
"text" : [ "_set $trace traces,", "_view 0 depth 0 18, view 0 bounds 10 50" ]
}
@@ -708,6 +749,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -717,8 +759,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 385.0, 125.53125, 19.0 ],
- "presentation_rect" : [ 100.0, 385.0, 125.53125, 19.0 ],
+ "patching_rect" : [ 100.0, 385.0, 125.53125, 18.578125 ],
+ "presentation_rect" : [ 100.0, 385.0, 125.53125, 18.578125 ],
"text" : [ "_set $fmat_2cols bpf" ]
}
@@ -729,6 +771,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -738,8 +781,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 348.0, 125.53125, 19.0 ],
- "presentation_rect" : [ 100.0, 348.0, 125.53125, 19.0 ],
+ "patching_rect" : [ 100.0, 348.0, 125.53125, 18.578125 ],
+ "presentation_rect" : [ 100.0, 348.0, 125.53125, 18.578125 ],
"text" : [ "_set $fmat-pix pixels" ]
}
@@ -750,6 +793,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -759,8 +803,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 418.0, 120.791016, 19.0 ],
- "presentation_rect" : [ 100.0, 418.0, 120.791016, 19.0 ],
+ "patching_rect" : [ 100.0, 418.0, 120.791016, 18.578125 ],
+ "presentation_rect" : [ 100.0, 418.0, 120.791016, 18.578125 ],
"text" : [ "_set $mbpf multibpf" ]
}
@@ -771,6 +815,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -780,8 +825,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 246.0, 139.417969, 19.0 ],
- "presentation_rect" : [ 100.0, 246.0, 139.417969, 19.0 ],
+ "patching_rect" : [ 100.0, 246.0, 139.417969, 18.578125 ],
+ "presentation_rect" : [ 100.0, 246.0, 139.417969, 18.578125 ],
"text" : [ "_set $stereo multiwave" ]
}
@@ -792,6 +837,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -801,8 +847,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 316.0, 263.126953, 19.0 ],
- "presentation_rect" : [ 100.0, 316.0, 263.126953, 19.0 ],
+ "patching_rect" : [ 100.0, 316.0, 263.126953, 18.578125 ],
+ "presentation_rect" : [ 100.0, 316.0, 263.126953, 18.578125 ],
"text" : [ "_set $spectro sonogram, view depth -20 20" ]
}
@@ -813,6 +859,7 @@
"#loadbang" : 0,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -822,8 +869,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 281.0, 110.279297, 19.0 ],
- "presentation_rect" : [ 100.0, 281.0, 110.279297, 19.0 ],
+ "patching_rect" : [ 100.0, 281.0, 110.279297, 18.578125 ],
+ "presentation_rect" : [ 100.0, 281.0, 110.279297, 18.578125 ],
"text" : [ "_set $wave matrix" ]
}
@@ -834,6 +881,7 @@
"#loadbang" : 1,
"#triggerall" : 0,
"#untuple" : 0,
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -843,8 +891,8 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
- "patching_rect" : [ 100.0, 216.0, 66.9375, 19.0 ],
- "presentation_rect" : [ 100.0, 216.0, 66.9375, 19.0 ],
+ "patching_rect" : [ 100.0, 216.0, 66.9375, 18.578125 ],
+ "presentation_rect" : [ 100.0, 216.0, 66.9375, 18.578125 ],
"text" : [ "_set $wave" ]
}
@@ -853,13 +901,13 @@
"box" : {
"fontname" : "Verdana",
"fontsize" : 14.0,
- "frgb" : 0.0,
"id" : "obj-114",
"linecount" : 20,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 8.0, 176.0, 419.0, 347.0 ],
+ "style" : "",
"text" : "Fmat class implements the following interfaces:\n\nwave \n\nmultiwave, \n\nmatrix, \n\nsonogram, \n\npixels, \n\nbpf\n\nmultibpf\n\ntraces\n\nThe default interface is wave for fmat with 1 column, matrix otherwise."
}
@@ -870,10 +918,11 @@
"autoupdate" : 120.0,
"bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"cursor_color" : [ 1.0, 1.0, 1.0, 1.0 ],
+ "cursor_followmouse" : 0,
"cursor_position" : -1.0,
"cursor_size" : 3,
"cursor_visible" : 1,
- "domain_bounds" : [ 0.0, 0.0 ],
+ "domain_bounds" : [ 0.0, 2844.739258 ],
"domainruler_bgcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"domainruler_fgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"domainruler_grid" : 0,
@@ -995,20 +1044,18 @@
]
}
,
- "patching_rect" : [ 211.0, 761.0, 55.0, 24.0 ],
+ "patching_rect" : [ 211.0, 761.0, 55.0, 26.0 ],
"saved_object_attributes" : {
- "default_fontface" : 0,
- "default_fontname" : "Verdana",
- "default_fontsize" : 10.0,
"description" : "",
"digest" : "",
- "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"globalpatchername" : "",
+ "style" : "",
"tags" : ""
}
,
+ "style" : "",
"text" : "p fmat"
}
@@ -1024,9 +1071,11 @@
"patcher" : {
"fileversion" : 1,
"appversion" : {
- "major" : 6,
+ "major" : 7,
"minor" : 0,
- "revision" : 7
+ "revision" : 5,
+ "architecture" : "x86",
+ "modernui" : 1
}
,
"rect" : [ 630.0, 73.0, 704.0, 389.0 ],
@@ -1035,23 +1084,32 @@
"default_fontsize" : 12.0,
"default_fontface" : 0,
"default_fontname" : "Arial",
- "gridonopen" : 0,
+ "gridonopen" : 1,
"gridsize" : [ 15.0, 15.0 ],
- "gridsnaponopen" : 0,
+ "gridsnaponopen" : 1,
+ "objectsnaponopen" : 1,
"statusbarvisible" : 2,
"toolbarvisible" : 1,
+ "lefttoolbarpinned" : 0,
+ "toptoolbarpinned" : 0,
+ "righttoolbarpinned" : 0,
+ "bottomtoolbarpinned" : 0,
+ "toolbars_unpinned_last_save" : 0,
+ "tallnewobj" : 0,
"boxanimatetime" : 200,
- "imprint" : 0,
"enablehscroll" : 1,
"enablevscroll" : 1,
"devicewidth" : 0.0,
"description" : "",
"digest" : "",
"tags" : "",
+ "style" : "",
+ "subpatcher_template" : "",
"boxes" : [ {
"box" : {
"description" : "sequence marker",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Arial",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -1062,9 +1120,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 360.0, 286.0, 180.511719, 19.0 ],
+ "patching_rect" : [ 360.0, 286.0, 180.511719, 19.40625 ],
"persistence" : 1,
- "presentation_rect" : [ 360.0, 286.0, 180.511719, 19.0 ],
+ "presentation_rect" : [ 360.0, 286.0, 180.511719, 19.40625 ],
"scope" : 0,
"serialized_objects" : [ [ "sequence", "marker", 1 ], [ "marker", "cue", 1.0, "label", "first", "duration", 0.0, "offset", 0.0, 2 ], [ 1, "append", 100.0, "#2" ], [ "marker", "cue", 2.0, "label", "secondo", "duration", 0.0, "offset", 0.0, 3 ], [ 1, "append", 390.0, "#3" ], [ "marker", "cue", 3.0, "label", "troisième", "duration", 0.0, "offset", 0.0, 4 ], [ 1, "append", 570.0, "#4" ], [ "marker", "cue", 4.0, "label", "vierte", "duration", 0.0, "offset", 0.0, 5 ], [ 1, "append", 740.0, "#5" ] ],
"text" : "sequence marker"
@@ -1075,6 +1133,7 @@
"box" : {
"description" : "fmat",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Arial",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -1085,9 +1144,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 205.0, 32.0, 94.478508, 19.0 ],
+ "patching_rect" : [ 205.0, 32.0, 94.478508, 19.40625 ],
"persistence" : 1,
- "presentation_rect" : [ 205.0, 32.0, 94.478508, 19.0 ],
+ "presentation_rect" : [ 205.0, 32.0, 94.478508, 19.40625 ],
"scope" : 0,
"serialized_objects" : [ [ "fmat", 6 ], [ 6, "size", 6, 5 ], [ 6, "set", 0, 0, 0.0, -0.6, 0.4, 0.0, 0.0, 100.0, 0.4, 1.0, -0.4, 0.6, 390.0, 0.5, 0.12, 0.6, -0.23, 570.0, -0.5, 1.0, -0.4, 0.3, 740.0, 0.45, 0.4, 0.5, -0.5, 800.0, -1.0, 1.0, 0.0, 0.3 ] ],
"text" : "fmat"
@@ -1098,6 +1157,7 @@
"box" : {
"description" : "bpf",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Arial",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -1108,9 +1168,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 371.0, 118.0, 77.826172, 19.0 ],
+ "patching_rect" : [ 371.0, 118.0, 77.826172, 19.40625 ],
"persistence" : 1,
- "presentation_rect" : [ 371.0, 118.0, 77.826172, 19.0 ],
+ "presentation_rect" : [ 371.0, 118.0, 77.826172, 19.40625 ],
"scope" : 0,
"serialized_objects" : [ [ "bpf", 7 ], [ 7, "set", 0.0, 0.432432, 323.714294, 0.983784, 632.714294, 0.372973, 858.333374, 0.794595, 1079.047729, 0.335135, 1324.285889, 0.010811, 1515.571655, 0.535135, 1613.666992, 0.248649, 1751.000488, 0.043243, 2020.762573, 0.437838, 2285.619873, 0.605405, 2437.66748, 0.816216, 2682.905762, 0.416216, 2781.001221, 0.616216, 2839.858398, 0.427027 ] ],
"text" : "bpf"
@@ -1121,6 +1181,7 @@
"box" : {
"description" : "sequence marker",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Arial",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -1131,9 +1192,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 359.0, 264.0, 180.511719, 19.0 ],
+ "patching_rect" : [ 359.0, 264.0, 180.511719, 19.40625 ],
"persistence" : 1,
- "presentation_rect" : [ 359.0, 264.0, 180.511719, 19.0 ],
+ "presentation_rect" : [ 359.0, 264.0, 180.511719, 19.40625 ],
"scope" : 0,
"serialized_objects" : [ [ "sequence", "marker", 8 ], [ "marker", "cue", 1.0, "label", "", "duration", 0.0, "offset", 0.0, 9 ], [ 8, "append", 127.523819, "#9" ], [ "marker", "cue", 2.0, "label", "", "duration", 0.0, "offset", 0.0, 10 ], [ 8, "append", 627.809631, "#10" ], [ "marker", "cue", 3.0, "label", "", "duration", 0.0, "offset", 0.0, 11 ], [ 8, "append", 1074.143188, "#11" ], [ "marker", "cue", 4.0, "label", "", "duration", 0.0, "offset", 0.0, 12 ], [ 8, "append", 1510.667236, "#12" ], [ "marker", "cue", 5.0, "label", "", "duration", 0.0, "offset", 0.0, 13 ], [ 8, "append", 1697.04834, "#13" ], [ "marker", "cue", 6.0, "label", "", "duration", 0.0, "offset", 0.0, 14 ], [ 8, "append", 2035.477173, "#14" ], [ "marker", "cue", 7.0, "label", "", "duration", 0.0, "offset", 0.0, 15 ], [ 8, "append", 2678.001465, "#15" ], [ "marker", "cue", 8.0, "label", "", "duration", 0.0, "offset", 0.0, 16 ], [ 8, "append", 2834.954102, "#16" ] ],
"text" : "sequence marker"
@@ -1151,6 +1212,7 @@
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 17.0, 329.0, 158.0, 17.0 ],
+ "style" : "",
"text" : "loadmess import drumLoop.aif"
}
@@ -1159,6 +1221,7 @@
"box" : {
"description" : "fmat",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Helvetica",
"fontsize" : 11.0,
"ftm_objref_conv" : 0,
@@ -1169,9 +1232,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 17.0, 345.0, 92.829521, 16.0 ],
+ "patching_rect" : [ 17.0, 345.0, 92.829521, 16.994629 ],
"persistence" : 0,
- "presentation_rect" : [ 17.0, 345.0, 92.829521, 16.0 ],
+ "presentation_rect" : [ 17.0, 345.0, 92.829521, 16.994629 ],
"scope" : 0,
"text" : "fmat"
}
@@ -1181,6 +1244,7 @@
"box" : {
"description" : "sequence fmat",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Arial",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -1191,9 +1255,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 359.0, 240.0, 159.195312, 19.0 ],
+ "patching_rect" : [ 359.0, 240.0, 159.195312, 19.40625 ],
"persistence" : 1,
- "presentation_rect" : [ 359.0, 240.0, 159.195312, 19.0 ],
+ "presentation_rect" : [ 359.0, 240.0, 159.195312, 19.40625 ],
"scope" : 0,
"serialized_objects" : [ [ "sequence", "fmat", 17 ], [ "fmat", 18 ], [ 18, "size", 24, 1 ], [ 18, "set", 0, 0, 0.054718, 0.085102, 0.076028, 0.076684, 0.04974, 0.042709, 0.039089, 0.036508, 0.032435, 0.03331, 0.032916, 0.033667, 0.032608, 0.029353, 0.027359, 0.025877, 0.027053, 0.027102, 0.028935, 0.031974, 0.035108, 0.037637, 0.047866, 0.056221 ], [ 17, "append", 0.751266, "#18" ], [ "fmat", 19 ], [ 19, "size", 24, 1 ], [ 19, "set", 0, 0, 0.064126, 0.11148, 0.085064, 0.07482, 0.056667, 0.034212, 0.033257, 0.030037, 0.026613, 0.024095, 0.026142, 0.026852, 0.023495, 0.021167, 0.020889, 0.019634, 0.021273, 0.021086, 0.023975, 0.029332, 0.037317, 0.04422, 0.062024, 0.082223 ], [ 17, "append", 300.50058, "#19" ], [ "fmat", 20 ], [ 20, "size", 24, 1 ], [ 20, "set", 0, 0, 0.062128, 0.095487, 0.075968, 0.060534, 0.044449, 0.030634, 0.032581, 0.029672, 0.024154, 0.024391, 0.023752, 0.025351, 0.024225, 0.022988, 0.020753, 0.019678, 0.024078, 0.023407, 0.028168, 0.035163, 0.043592, 0.055965, 0.0741, 0.098782 ], [ 17, "append", 446.559784, "#20" ], [ "fmat", 21 ], [ 21, "size", 24, 1 ], [ 21, "set", 0, 0, 0.058765, 0.090502, 0.073862, 0.051517, 0.037345, 0.028691, 0.030157, 0.028193, 0.029611, 0.024258, 0.025428, 0.027587, 0.026358, 0.025427, 0.022226, 0.020642, 0.024381, 0.024547, 0.027468, 0.035736, 0.047945, 0.062784, 0.078534, 0.098035 ], [ 17, "append", 738.292114, "#21" ], [ "fmat", 22 ], [ 22, "size", 24, 1 ], [ 22, "set", 0, 0, 0.019667, 0.051381, 0.060906, 0.056413, 0.046313, 0.047111, 0.041732, 0.04629, 0.044812, 0.037324, 0.040249, 0.044744, 0.041783, 0.035525, 0.030144, 0.029012, 0.029096, 0.031424, 0.033319, 0.037464, 0.040768, 0.045568, 0.05063, 0.058326 ], [ 17, "append", 879.980713, "#22" ], [ "fmat", 23 ], [ 23, "size", 24, 1 ], [ 23, "set", 0, 0, 0.024026, 0.08093, 0.092838, 0.078315, 0.05613, 0.049647, 0.050068, 0.050606, 0.046605, 0.038253, 0.036942, 0.034289, 0.029833, 0.025161, 0.020733, 0.019905, 0.02007, 0.021634, 0.022858, 0.02603, 0.030131, 0.037836, 0.049085, 0.058074 ], [ 17, "append", 1183.333252, "#23" ], [ "fmat", 24 ], [ 24, "size", 24, 1 ], [ 24, "set", 0, 0, 0.031933, 0.085549, 0.091688, 0.070609, 0.061348, 0.044825, 0.045779, 0.043232, 0.035638, 0.029196, 0.026065, 0.025557, 0.0257, 0.023688, 0.020685, 0.019837, 0.021197, 0.024367, 0.025645, 0.032641, 0.035782, 0.044932, 0.058601, 0.075507 ], [ 17, "append", 1330.677856, "#24" ], [ "fmat", 25 ], [ 25, "size", 24, 1 ], [ 25, "set", 0, 0, 0.03201, 0.078478, 0.078119, 0.081297, 0.055961, 0.042829, 0.039587, 0.037267, 0.029469, 0.028042, 0.030708, 0.03381, 0.032577, 0.031545, 0.0281, 0.025849, 0.025349, 0.025941, 0.028969, 0.032108, 0.037371, 0.042047, 0.054168, 0.068401 ], [ 17, "append", 1446.536377, "#25" ], [ "fmat", 26 ], [ 26, "size", 24, 1 ], [ 26, "set", 0, 0, 0.020027, 0.05633, 0.070243, 0.066872, 0.050253, 0.045363, 0.037858, 0.039516, 0.035247, 0.031522, 0.033936, 0.038545, 0.039827, 0.037345, 0.031732, 0.029501, 0.029339, 0.031885, 0.037445, 0.038458, 0.04295, 0.044366, 0.052047, 0.059392 ], [ 17, "append", 1608.285889, "#26" ], [ "fmat", 27 ], [ 27, "size", 24, 1 ], [ 27, "set", 0, 0, 0.065939, 0.079338, 0.070032, 0.077199, 0.051387, 0.048889, 0.044045, 0.039478, 0.035526, 0.028804, 0.031252, 0.031871, 0.032499, 0.027952, 0.025187, 0.022213, 0.022137, 0.024369, 0.027397, 0.028677, 0.03559, 0.038492, 0.05128, 0.060448 ], [ 17, "append", 1759.523682, "#27" ], [ "fmat", 28 ], [ 28, "size", 24, 1 ], [ 28, "set", 0, 0, 0.036991, 0.085153, 0.090385, 0.083417, 0.062365, 0.046506, 0.037195, 0.036835, 0.032665, 0.027334, 0.026796, 0.029159, 0.028489, 0.02923, 0.026292, 0.022179, 0.022591, 0.022749, 0.027194, 0.030538, 0.034536, 0.041831, 0.055518, 0.064054 ], [ 17, "append", 1891.666626, "#28" ], [ "fmat", 29 ], [ 29, "size", 24, 1 ], [ 29, "set", 0, 0, 0.071688, 0.08873, 0.0721, 0.074058, 0.045407, 0.043922, 0.040906, 0.042583, 0.033306, 0.034055, 0.034501, 0.035703, 0.035431, 0.033642, 0.029739, 0.02763, 0.027712, 0.025606, 0.025528, 0.028037, 0.028835, 0.031499, 0.040436, 0.048942 ], [ 17, "append", 2029.014771, "#29" ], [ "fmat", 30 ], [ 30, "size", 24, 1 ], [ 30, "set", 0, 0, 0.050026, 0.086302, 0.078494, 0.080896, 0.049722, 0.036958, 0.039919, 0.032909, 0.029867, 0.028613, 0.028551, 0.030576, 0.030432, 0.026083, 0.022991, 0.022913, 0.025234, 0.025364, 0.025722, 0.032966, 0.037497, 0.044038, 0.05795, 0.075978 ], [ 17, "append", 2184.031738, "#30" ], [ "fmat", 31 ], [ 31, "size", 24, 1 ], [ 31, "set", 0, 0, 0.048284, 0.086037, 0.077961, 0.0902, 0.057991, 0.041027, 0.035477, 0.035315, 0.030228, 0.028885, 0.031623, 0.030603, 0.029472, 0.029294, 0.024774, 0.022007, 0.022686, 0.023441, 0.025046, 0.028433, 0.034255, 0.042928, 0.055758, 0.068272 ], [ 17, "append", 2304.166504, "#31" ], [ "fmat", 32 ], [ 32, "size", 24, 1 ], [ 32, "set", 0, 0, 0.082166, 0.099673, 0.077974, 0.082689, 0.058626, 0.048929, 0.042371, 0.036421, 0.033505, 0.032138, 0.030005, 0.031848, 0.033394, 0.031496, 0.026043, 0.022562, 0.019184, 0.020435, 0.022543, 0.024101, 0.026617, 0.03126, 0.038858, 0.047162 ], [ 17, "append", 2451.491211, "#32" ], [ "fmat", 33 ], [ 33, "size", 24, 1 ], [ 33, "set", 0, 0, 0.014689, 0.04296, 0.055412, 0.06318, 0.053607, 0.050517, 0.042295, 0.039991, 0.037223, 0.034571, 0.043562, 0.046629, 0.043872, 0.037422, 0.031237, 0.030851, 0.031875, 0.031652, 0.033245, 0.039332, 0.043615, 0.042892, 0.050607, 0.058764 ], [ 17, "append", 2608.305664, "#33" ], [ "fmat", 34 ], [ 34, "size", 24, 1 ], [ 34, "set", 0, 0, 0.021284, 0.062714, 0.074928, 0.077432, 0.066021, 0.058579, 0.052237, 0.041855, 0.038397, 0.031137, 0.034451, 0.035718, 0.031323, 0.029649, 0.023903, 0.022488, 0.024565, 0.024654, 0.025589, 0.031392, 0.040172, 0.040205, 0.048423, 0.062883 ], [ 17, "append", 2912.312012, "#34" ], [ "fmat", 35 ], [ 35, "size", 24, 1 ], [ 35, "set", 0, 0, 0.011858, 0.024532, 0.026792, 0.029036, 0.032557, 0.036102, 0.044144, 0.035804, 0.028287, 0.035124, 0.035635, 0.041052, 0.042402, 0.039804, 0.029551, 0.028648, 0.037133, 0.038789, 0.041221, 0.062696, 0.074675, 0.06208, 0.078758, 0.083321 ], [ 17, "append", 3043.575439, "#35" ], [ "fmat", 36 ], [ 36, "size", 24, 1 ], [ 36, "set", 0, 0, 0.026125, 0.063224, 0.065666, 0.075099, 0.05323, 0.041021, 0.042032, 0.036613, 0.030593, 0.027764, 0.029419, 0.032054, 0.030802, 0.03317, 0.028638, 0.026555, 0.030139, 0.029305, 0.033561, 0.042847, 0.047338, 0.049083, 0.059261, 0.066462 ], [ 17, "append", 3333.333252, "#36" ] ],
"text" : "sequence fmat"
@@ -1204,6 +1268,7 @@
"box" : {
"description" : "sequence marker",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Arial",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -1214,9 +1279,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 359.0, 217.0, 180.511719, 19.0 ],
+ "patching_rect" : [ 359.0, 217.0, 180.511719, 19.40625 ],
"persistence" : 1,
- "presentation_rect" : [ 359.0, 217.0, 180.511719, 19.0 ],
+ "presentation_rect" : [ 359.0, 217.0, 180.511719, 19.40625 ],
"scope" : 0,
"serialized_objects" : [ [ "sequence", "marker", 37 ], [ "marker", "cue", 2.0, 38 ], [ 37, "append", 0.751266, "#38" ], [ "marker", "cue", 4.0, 39 ], [ 37, "append", 300.50058, "#39" ], [ "marker", "cue", 6.0, 40 ], [ 37, "append", 446.559784, "#40" ], [ "marker", "cue", 14.0, 41 ], [ 37, "append", 738.292114, "#41" ], [ "marker", "cue", 16.0, 42 ], [ 37, "append", 879.980713, "#42" ], [ "marker", "cue", 18.0, 43 ], [ 37, "append", 1183.333252, "#43" ], [ "marker", "cue", 20.0, 44 ], [ 37, "append", 1330.677856, "#44" ], [ "marker", "cue", 22.0, 45 ], [ 37, "append", 1446.536377, "#45" ], [ "marker", "cue", 24.0, 46 ], [ 37, "append", 1608.285889, "#46" ], [ "marker", "cue", 26.0, 47 ], [ 37, "append", 1759.523682, "#47" ], [ "marker", "cue", 28.0, 48 ], [ 37, "append", 1891.666626, "#48" ], [ "marker", "cue", 30.0, 49 ], [ 37, "append", 2029.014771, "#49" ], [ "marker", "cue", 32.0, 50 ], [ 37, "append", 2184.031738, "#50" ], [ "marker", "cue", 34.0, 51 ], [ 37, "append", 2304.166504, "#51" ], [ "marker", "cue", 36.0, 52 ], [ 37, "append", 2451.491211, "#52" ], [ "marker", "cue", 38.0, 53 ], [ 37, "append", 2608.305664, "#53" ], [ "marker", "cue", 40.0, 54 ], [ 37, "append", 2912.312012, "#54" ], [ "marker", "cue", 42.0, 55 ], [ 37, "append", 3043.575439, "#55" ], [ "marker", "cue", 44.0, 56 ], [ 37, "append", 3333.333252, "#56" ] ],
"text" : "sequence marker"
@@ -1227,6 +1292,7 @@
"box" : {
"description" : "bpf",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Arial",
"fontsize" : 12.0,
"ftm_objref_conv" : 0,
@@ -1237,9 +1303,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 371.0, 96.0, 61.15625, 19.0 ],
+ "patching_rect" : [ 371.0, 96.0, 61.15625, 19.40625 ],
"persistence" : 1,
- "presentation_rect" : [ 371.0, 96.0, 61.15625, 19.0 ],
+ "presentation_rect" : [ 371.0, 96.0, 61.15625, 19.40625 ],
"scope" : 0,
"serialized_objects" : [ [ "bpf", 57 ], [ 57, "set", 0.0, 0.406387, 353.038696, 0.240254, 1186.209961, 0.38594, 1878.165894, 0.27348, 3276.198975, 0.401275, 3897.547119, 0.212139, 4958.447266, 0.286659, 5620.375977, 0.227474, 6704.387207, 0.283704, 7798.153809, 0.227474, 8926.577148, 0.296483, 9430.49707, 0.24281 ] ],
"text" : "bpf"
@@ -1250,6 +1316,7 @@
"box" : {
"description" : "sequence fmat",
"editor_interface" : "",
+ "fontface" : 0,
"fontname" : "Verdana",
"fontsize" : 10.0,
"ftm_objref_conv" : 0,
@@ -1260,9 +1327,9 @@
"numinlets" : 1,
"numoutlets" : 2,
"outlettype" : [ "", "" ],
- "patching_rect" : [ 359.0, 196.0, 151.139648, 18.0 ],
+ "patching_rect" : [ 359.0, 196.0, 151.139648, 18.148438 ],
"persistence" : 1,
- "presentation_rect" : [ 359.0, 196.0, 151.139648, 18.0 ],
+ "presentation_rect" : [ 359.0, 196.0, 151.139648, 18.148438 ],
"scope" : 0,
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bor...@us...> - 2015-09-18 14:43:14
|
Revision: 3681
http://sourceforge.net/p/ftm/code/3681
Author: borghesi
Date: 2015-09-18 14:43:12 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
ftm.editor: added "cursor follow mouse" attribute
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.editor.cpp
Modified: trunk/ftm/externals/max5/ftm.editor.cpp
===================================================================
--- trunk/ftm/externals/max5/ftm.editor.cpp 2015-09-18 14:04:39 UTC (rev 3680)
+++ trunk/ftm/externals/max5/ftm.editor.cpp 2015-09-18 14:43:12 UTC (rev 3681)
@@ -129,6 +129,7 @@
t_jrgba cursor_color;
float cursor_position;
long cursor_visible;
+ long cursor_followmouse;
long cursor_size;
t_jrgba split_color;
@@ -3901,6 +3902,18 @@
else
ret = -1;
}
+ else if(prop == fts_s_followmouse)
+ {
+ if(ac > 0 && fts_is_number(at))
+ {
+ self->cursor_followmouse = (int)fts_get_number_int(at);
+ self->container->editorContainer->setCursorFollowMouse(self->cursor_followmouse);
+
+ ret = 2;
+ }
+ else
+ ret = -1;
+ }
else if(prop == fts_s_empty_string)
{
if(ac==1 && fts_is_number(at))
@@ -5571,6 +5584,19 @@
return 0;
}
+
+static t_max_err
+ftmeditor_set_attribute_cursor_followmouse(ftmeditor_t *self, t_object *attr, long argc, t_atom *argv)
+{
+ if(argc == 1 && fts_is_number(argv))
+ {
+ int ret = ftmeditor_set_cursor_property(self, fts_s_followmouse, 1, argv);
+ if(ret > 0)
+ self->needs_refresh = 1;
+ }
+ return 0;
+}
+
t_max_err
ftmeditor_set_attribute_split_visible(ftmeditor_t *self, t_object *attr, long argc, t_atom *argv)
{
@@ -7305,6 +7331,7 @@
self->cursor_position = -1.0f;
self->cursor_visible = 1;
+ self->cursor_followmouse = 0;
self->cursor_size = ImtrTypes::CURSOR_DEFAULT_SIZE;
self->cursor_color.red = 1.0f; self->cursor_color.green = 0.0f;
self->cursor_color.blue = 0.0f; self->cursor_color.alpha = 1.0;
@@ -7977,6 +8004,13 @@
CLASS_ATTR_ACCESSORS(_mc, "cursor_color", NULL, ftmeditor_set_attribute_cursor_color);
CLASS_ATTR_ORDER(_mc, "cursor_color", 0, "904");
+ CLASS_ATTR_LONG(_mc, "cursor_followmouse", 0, ftmeditor_t, cursor_followmouse);
+ CLASS_ATTR_STYLE_LABEL(_mc, "cursor_followmouse", 0, "onoff", "Cursor Follows Mouse with CursorTool");
+ CLASS_ATTR_ACCESSORS(_mc, "cursor_followmouse", NULL, ftmeditor_set_attribute_cursor_followmouse);
+ CLASS_ATTR_PAINT(_mc,"cursor_followmouse", 0);
+ CLASS_ATTR_SAVE(_mc,"cursor_followmouse", 0);
+ CLASS_ATTR_ORDER(_mc, "cursor_followmouse", 0, "905");
+
CLASS_STICKY_ATTR_CLEAR(_mc, "category");
CLASS_STICKY_ATTR(_mc, "category", 0, "10-Split");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2015-09-18 14:04:41
|
Revision: 3680
http://sourceforge.net/p/ftm/code/3680
Author: diemo
Date: 2015-09-18 14:04:39 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
avoid most warnings: rm unused vars, use const char for doc, define protos, use long long int in sprintf
Modified Paths:
--------------
trunk/ftm/ftmlib/atomfile.c
trunk/ftm/ftmlib/classes/fmat.c
trunk/ftm/ftmlib/classes/fring.c
trunk/ftm/ftmlib/ftmext.c
trunk/ftm/ftmlib/ftmext.h
trunk/ftm/ftmlib/ftmrte.c
trunk/ftm/ftmlib/ftmsdif.c
trunk/ftm/ftmlib/functions.c
trunk/ftm/ftmlib/mapfuns.c
trunk/ftm/ftmlib/mapfuns.h
trunk/ftm/ftmlib/max5/maxext.c
trunk/ftm/ftmlib/types.h
Modified: trunk/ftm/ftmlib/atomfile.c
===================================================================
--- trunk/ftm/ftmlib/atomfile.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/atomfile.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -460,7 +460,7 @@
if (fts_is_float(at))
sprintf(buf, "%#.32g%c", fts_get_float(at), separator);
else if (fts_is_int(at))
- sprintf(buf, "%ld%c", fts_get_int(at), separator);
+ sprintf(buf, "%lld%c", (long long) fts_get_int(at), separator);
else if (fts_is_symbol(at))
{
const char *sym_str = fts_symbol_name(fts_get_symbol(at));
Modified: trunk/ftm/ftmlib/classes/fmat.c
===================================================================
--- trunk/ftm/ftmlib/classes/fmat.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/classes/fmat.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -2630,7 +2630,7 @@
static void
warn_about_append_rows_without_cols(fmat_t *self)
{
- static already_warned = 0;
+ static int already_warned = 0;
if(self->n == 0 && already_warned == 0)
{
Modified: trunk/ftm/ftmlib/classes/fring.c
===================================================================
--- trunk/ftm/ftmlib/classes/fring.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/classes/fring.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -130,9 +130,9 @@
void
fring_set_size(fring_t *self, int size)
{
- int old_size = self->size;
- int old_total = old_size * self->m * self->n;
- int total = self->m * self->n * size;
+ //unused: int old_size = self->size;
+ //unused: int old_total = old_size * self->m * self->n;
+ //unused: int total = self->m * self->n * size;
if(self->ring != 0)
fring_shift_data(self, -self->ring, size);
Modified: trunk/ftm/ftmlib/ftmext.c
===================================================================
--- trunk/ftm/ftmlib/ftmext.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/ftmext.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -1075,7 +1075,7 @@
}
static ftmext_message_t *
-ftmext_class_add_message(ftmext_class_t *cl, fts_symbol_t selector, fts_class_t *type, ftmext_method_t meth, char *doc)
+ftmext_class_add_message(ftmext_class_t *cl, fts_symbol_t selector, fts_class_t *type, ftmext_method_t meth, const char *doc)
{
ftmext_message_t *mess = (ftmext_message_t *)fts_malloc(sizeof(ftmext_message_t));
@@ -1102,7 +1102,7 @@
}
void
-ftmext_class_message(ftmext_class_t *cl, char *selector, fts_class_t *type, ftmext_method_t meth, char *doc)
+ftmext_class_message(ftmext_class_t *cl, const char *selector, fts_class_t *type, ftmext_method_t meth, const char *doc)
{
ftmext_class_add_message(cl, fts_new_symbol(selector), type, meth, doc);
}
@@ -1155,7 +1155,7 @@
}
void
-ftmext_class_inlet(ftmext_class_t *cl, int i, fts_class_t *type, char *doc)
+ftmext_class_inlet(ftmext_class_t *cl, int i, fts_class_t *type, const char *doc)
{
if(i >= 0)
{
@@ -1238,7 +1238,7 @@
}
void
-ftmext_class_outlet(ftmext_class_t *cl, int i, fts_class_t *type, char *doc)
+ftmext_class_outlet(ftmext_class_t *cl, int i, fts_class_t *type, const char *doc)
{
if(type != ftmext_pseudoclass_signal && cl->n_outlets_ctl <= i)
cl->n_outlets_ctl = i + 1;
@@ -1431,7 +1431,7 @@
*
*/
static ftmext_attribute_t *
-ftmext_class_add_attribute(ftmext_class_t *cl, fts_symbol_t name, fts_class_t *type, ftmext_method_t meth, int field, char *doc)
+ftmext_class_add_attribute(ftmext_class_t *cl, fts_symbol_t name, fts_class_t *type, ftmext_method_t meth, int field, const char *doc)
{
ftmext_attribute_t *attr = (ftmext_attribute_t *)fts_malloc(sizeof(ftmext_attribute_t));
@@ -1459,7 +1459,7 @@
}
void
-ftmext_class_attribute(ftmext_class_t *cl, char *name, fts_class_t *type, ftmext_method_t meth, int field, char *doc)
+ftmext_class_attribute(ftmext_class_t *cl, const char *name, fts_class_t *type, ftmext_method_t meth, int field, const char *doc)
{
ftmext_class_add_attribute(cl, fts_new_symbol(name), type, meth, field, doc);
}
Modified: trunk/ftm/ftmlib/ftmext.h
===================================================================
--- trunk/ftm/ftmlib/ftmext.h 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/ftmext.h 2015-09-18 14:04:39 UTC (rev 3680)
@@ -279,11 +279,11 @@
fts_symbol_t selector; /**< message selector */
fts_class_t *type; /**< type ... */
ftmext_method_union_t meth; /**< meth ... */
- char *doc; /**< doc string */
+ const char *doc; /**< doc string */
struct ftmext_message *next; /**< next message ... */
};
-FTS_API void ftmext_class_message(ftmext_class_t *cl, char *name, fts_class_t *type, ftmext_method_t meth, char *doc);
+FTS_API void ftmext_class_message(ftmext_class_t *cl, const char *name, fts_class_t *type, ftmext_method_t meth, const char *doc);
FTS_API int ftmext_class_has_message(ftmext_class_t *cl, fts_symbol_t selector);
/******************************************************************************
@@ -295,10 +295,10 @@
{
fts_class_t *type; /**< inlet type ... */
ftmext_method_union_t meth; /**< inlet meth */
- char *doc;
+ const char *doc;
};
-FTS_API void ftmext_class_inlet(ftmext_class_t *cl, int i, fts_class_t *type, char *doc);
+FTS_API void ftmext_class_inlet(ftmext_class_t *cl, int i, fts_class_t *type, const char *doc);
#define _FTMEXT_INLET_GET_TYPE(e, i) (ftmext_get_class(e)->inlets[(((i) < ftmext_get_class(e)->n_inlets_ctl)? (i): (ftmext_get_class(e)->n_inlets_ctl - 1))].type)
#define _FTMEXT_INLET_ERROR_UNDEFINED(i, e, a) do { ftmext_error((e), "inlet %d: doesn't understand %s", (i), fts_symbol_name(fts_get_class_name(a))); goto _ftmext_exit_label; } while(0)
@@ -321,10 +321,10 @@
struct ftmext_outlet
{
fts_class_t *type; /**< outlet type ... */
- char *doc; /**< outlet doc */
+ const char *doc; /**< outlet doc */
};
-FTS_API void ftmext_class_outlet(ftmext_class_t *cl, int i, fts_class_t *type, char *doc);
+FTS_API void ftmext_class_outlet(ftmext_class_t *cl, int i, fts_class_t *type, const char *doc);
/******************************************************************************
*
@@ -355,11 +355,11 @@
fts_class_t *type; /**< attribute type */
ftmext_method_union_t meth; /**< attribute method */
int field; /**< onset of a field in the class' C-structure holding the attribute's value */
- char *doc; /**< attribute doc */
+ const char *doc; /**< attribute doc */
struct ftmext_attribute *next;
};
-FTS_API void ftmext_class_attribute(ftmext_class_t *cl, char *name, fts_class_t *type, ftmext_method_t meth, int field, char *doc);
+FTS_API void ftmext_class_attribute(ftmext_class_t *cl, const char *name, fts_class_t *type, ftmext_method_t meth, int field, const char *doc);
FTS_API void ftmext_init_attributes(ftmext_t *ext);
FTS_API void ftmext_redefine_attributes(ftmext_t *ext);
Modified: trunk/ftm/ftmlib/ftmrte.c
===================================================================
--- trunk/ftm/ftmlib/ftmrte.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/ftmrte.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -20,6 +20,7 @@
*
*/
#include "fts.h"
+#include "ftmrte.h"
/* FTM pointer sharing (disabled)
extern void fts_mem_set_heaps(fts_heap_t **heaps);
Modified: trunk/ftm/ftmlib/ftmsdif.c
===================================================================
--- trunk/ftm/ftmlib/ftmsdif.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/ftmsdif.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -175,7 +175,7 @@
}
/* extend framespecs, repeat last def */
-void ftmsdif_copy_framespec (ftmsdif_t *base, int from, int to, int autoincrement)
+static void ftmsdif_copy_framespec (ftmsdif_t *base, int from, int to, int autoincrement)
{
framespec_t *tof = &base->framespec[to];
framespec_t *fromf = &base->framespec[from];
Modified: trunk/ftm/ftmlib/functions.c
===================================================================
--- trunk/ftm/ftmlib/functions.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/functions.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -122,6 +122,8 @@
else \
return fts_status_format("can't set parameters for function %s", #_NAME_); \
} \
+ else \
+ return fts_status_format("invalid arguments for function %s", #_NAME_); \
}
#define INSTALL_MAPFUN(NAME, FUNC, DESCR) fts_function_declare_varargs(fts_new_symbol(#NAME), _function_##NAME, DESCR_PREFIX DESCR);
Modified: trunk/ftm/ftmlib/mapfuns.c
===================================================================
--- trunk/ftm/ftmlib/mapfuns.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/mapfuns.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -20,7 +20,7 @@
#ifndef MAPFUNS_TEST
/* check numeric arguments for mapfuns */
-int mapfun_check_args(char *name, int n, int ac, fts_atom_t *at)
+int mapfun_check_args(char *name, int n, int ac, const fts_atom_t *at)
{
int i;
Modified: trunk/ftm/ftmlib/mapfuns.h
===================================================================
--- trunk/ftm/ftmlib/mapfuns.h 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/mapfuns.h 2015-09-18 14:04:39 UTC (rev 3680)
@@ -100,6 +100,6 @@
*/
/* check numeric arguments for mapfuns */
-int mapfun_check_args(char *name, int n, int ac, fts_atom_t *at);
+int mapfun_check_args(char *name, int n, int ac, const fts_atom_t *at);
#endif /* _MAPFUNS_H_ */
Modified: trunk/ftm/ftmlib/max5/maxext.c
===================================================================
--- trunk/ftm/ftmlib/max5/maxext.c 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/max5/maxext.c 2015-09-18 14:04:39 UTC (rev 3680)
@@ -1267,7 +1267,7 @@
{
int n_class_ins = ftmext_class_get_inlets(cl);
int i_doc = arg;
- char *doc = NULL;
+ const char *doc = NULL;
if(i_doc >= n_class_ins)
i_doc = n_class_ins - 1;
@@ -1476,6 +1476,7 @@
class_dspinit(mcd->maxclass);
class_addmethod(mcd->maxclass, (method)dsp_init, "dsp", A_CANT, 0);
+ //TODO: 64bit: (method) dsp_init, "dsp64",
}
void
@@ -1538,7 +1539,7 @@
}
static void
-declare_max_attribute(t_class *max_class, char *name, fts_class_t *type, method attr_set, int field)
+declare_max_attribute(t_class *max_class, const char *name, fts_class_t *type, method attr_set, int field)
{
char label[256];
Modified: trunk/ftm/ftmlib/types.h
===================================================================
--- trunk/ftm/ftmlib/types.h 2015-09-18 14:01:24 UTC (rev 3679)
+++ trunk/ftm/ftmlib/types.h 2015-09-18 14:04:39 UTC (rev 3680)
@@ -24,8 +24,9 @@
#ifndef NO_BARRIERS
+# include <pthread.h>
+
#ifdef WIN32
-# include <pthread.h>
# define fts_atomic_increment(x) (InterlockedIncrement((volatile LONG *)x))
# define fts_atomic_decrement(x) (InterlockedDecrement((volatile LONG *)x))
#elif defined __APPLE__
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <di...@us...> - 2015-09-18 14:01:26
|
Revision: 3679
http://sourceforge.net/p/ftm/code/3679
Author: diemo
Date: 2015-09-18 14:01:24 +0000 (Fri, 18 Sep 2015)
Log Message:
-----------
use max types (t_atom_long and t_fourcc) for interaction with Max6.1 API
Modified Paths:
--------------
trunk/ftm/externals/max5/ftm.mess.c
trunk/ftm/ftmlib/max5/ftmtypes.h
trunk/ftm/ftmlib/max5/maxfile.c
Modified: trunk/ftm/externals/max5/ftm.mess.c
===================================================================
--- trunk/ftm/externals/max5/ftm.mess.c 2015-09-18 13:59:09 UTC (rev 3678)
+++ trunk/ftm/externals/max5/ftm.mess.c 2015-09-18 14:01:24 UTC (rev 3679)
@@ -94,9 +94,9 @@
/* original message lines as symbols, abstraction args #1... NOT replaced */
t_symbol *lines[MAX_LINES];
int n_lines;
- int loadlines; /* compatibility */
+ t_atom_long loadlines; /* compatibility */
- int n_inlets;
+ t_atom_long n_inlets;
int n_inlets_next;
int n_dollars;
@@ -1642,9 +1642,9 @@
if(arg == 0)
sprintf(dstString, "set $*1, evaluate and output result");
else if(self->triggerall == 0)
- sprintf(dstString, "set $*%d", arg + 1);
+ sprintf(dstString, "set $*%ld", arg + 1);
else
- sprintf(dstString, "set $*%d, evaluate and output result", arg + 1);
+ sprintf(dstString, "set $*%ld, evaluate and output result", arg + 1);
}
else if(msg == ASSIST_OUTLET)
{
@@ -1743,7 +1743,6 @@
if(fts_is_symbol(argv + i))
{
fts_symbol_t sym = fts_get_symbol(argv + i);
- char str[MAX_CHARS];
debug_post("ftmmess_set_attribute_text %s", fts_symbol_name(sym));
lines_add_line(self, sym);
@@ -2014,8 +2013,8 @@
self->n_inlets_next = 2;
self->n_dollars = 0;
- dictionary_getlong(d, gensym("numlines"), (long *)&self->loadlines);
- dictionary_getlong(d, gensym("numins"), (long *)&self->n_inlets);
+ dictionary_getlong(d, gensym("numlines"), &self->loadlines);
+ dictionary_getlong(d, gensym("numins"), &self->n_inlets);
if(self->n_inlets < 2)
self->n_inlets = 2;
Modified: trunk/ftm/ftmlib/max5/ftmtypes.h
===================================================================
--- trunk/ftm/ftmlib/max5/ftmtypes.h 2015-09-18 13:59:09 UTC (rev 3678)
+++ trunk/ftm/ftmlib/max5/ftmtypes.h 2015-09-18 14:01:24 UTC (rev 3679)
@@ -152,7 +152,7 @@
{
t_pxjbox head;
t_object *patcher;
- long ftm_scope_flags;
+ t_atom_long ftm_scope_flags;
int ftm_objref_conv;
void **proxies;
int n_proxies;
Modified: trunk/ftm/ftmlib/max5/maxfile.c
===================================================================
--- trunk/ftm/ftmlib/max5/maxfile.c 2015-09-18 13:59:09 UTC (rev 3678)
+++ trunk/ftm/ftmlib/max5/maxfile.c 2015-09-18 14:01:24 UTC (rev 3679)
@@ -150,7 +150,7 @@
{
/* relative path: find file in Max search paths */
short path = 0;
- long type = 0;
+ t_fourcc type = 0;
if (locatefile_extended((char *) filename, &path, &type, NULL, 0) == 0)
{
@@ -187,7 +187,7 @@
char filename[MAX_FILENAME_CHARS];
char fullname[MAX_PATH_CHARS];
short pathId;
- long outtype;
+ t_fourcc outtype;
open_promptset(fts_symbol_name(prompt));
@@ -292,7 +292,7 @@
char filename[MAX_FILENAME_CHARS];
char fullname[MAX_PATH_CHARS];
short pathId;
- long outtype;
+ t_fourcc outtype;
int i;
if(argc > 3 && fts_is_symbol(argv + 3))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
