Menu
▾
▴
ftm-cvs — commit logs of ftm cvs
You can subscribe to this list here.
| 2005 |
Jan
(111) |
Feb
(91) |
Mar
(65) |
Apr
(94) |
May
(111) |
Jun
(54) |
Jul
(28) |
Aug
(9) |
Sep
(30) |
Oct
(20) |
Nov
(29) |
Dec
(30) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(26) |
Feb
(12) |
Mar
(7) |
Apr
(42) |
May
(15) |
Jun
(19) |
Jul
(49) |
Aug
(23) |
Sep
(90) |
Oct
(65) |
Nov
(37) |
Dec
(31) |
| 2007 |
Jan
(4) |
Feb
(149) |
Mar
(67) |
Apr
(167) |
May
(13) |
Jun
(21) |
Jul
(109) |
Aug
(51) |
Sep
(86) |
Oct
(187) |
Nov
(247) |
Dec
(185) |
| 2008 |
Jan
(195) |
Feb
(204) |
Mar
(77) |
Apr
(84) |
May
(66) |
Jun
(181) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Norbert S. <Nor...@on...> - 2008-06-29 15:44:28
|
Yes, its done. The SVN repository is (should be and seems to be) an exact copy of the CVS directory. A nice checkout of the main trunk of FTM would be for example this: svn co https://ftm.svn.sourceforge.net/svnroot/ftm/trunk/ftm ftm The notifications of commits with diffs are sent to the new mailing- list ft...@li.... I already forced the subscription of Diemo, Riccardo, IOhannes and Jean-Philippe. The subscription page is here: https://lists.sourceforge.net/lists/listinfo/ftm-svn CVS is now "disabled" (I don't know what exactly that implies, but anyway, any further changes of the CVS repository don't make sense). Happy subversioning! **NOS P.S.: I didn't migrate "ftm-sql" directory. Diemo, please let us know about your plans and take care for this. |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:50:52
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28249/ftmlib Modified Files: parser.h Log Message: Index: parser.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/parser.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** parser.h 19 Jun 2008 10:22:13 -0000 1.31 --- parser.h 28 Jun 2008 22:50:59 -0000 1.32 *************** *** 143,147 **** #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE ! #line 61 "/Users/borghesi/projects/ftm/build/max/osx-macho/../../../ftmlib/parser.y" { fts_atom_t a; --- 143,147 ---- #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE ! #line 61 "/Users/schnell/Development/ftm/build/max/osx-macho/../../../ftmlib/parser.y" { fts_atom_t a; |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:50:52
|
Update of /cvsroot/ftm/ftm/build/max/osx-macho/ftmexternals.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28249/build/max/osx-macho/ftmexternals.xcodeproj Modified Files: project.pbxproj Log Message: Index: project.pbxproj =================================================================== RCS file: /cvsroot/ftm/ftm/build/max/osx-macho/ftmexternals.xcodeproj/project.pbxproj,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** project.pbxproj 24 Jun 2008 10:17:16 -0000 1.104 --- project.pbxproj 28 Jun 2008 22:50:59 -0000 1.105 *************** *** 3852,3856 **** OTHER_LDFLAGS = "-lmx"; REZ_EXECUTABLE = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; WRAPPER_EXTENSION = mxo; }; --- 3852,3855 ---- |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:49:24
|
Update of /cvsroot/ftm/ftm/patches/max/help In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27484/patches/max/help Modified Files: ftm.class.track.help Log Message: no changes intended Index: ftm.class.track.help =================================================================== RCS file: /cvsroot/ftm/ftm/patches/max/help/ftm.class.track.help,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 Binary files /tmp/cvsfUEoeL and /tmp/cvsjNdTai differ |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:47:54
|
Update of /cvsroot/ftm/ftm/ftmlib/max In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27051/ftmlib/max Modified Files: maxext.c Log Message: adapted to changes for loader_scope_push function (scope argument added) Index: maxext.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/max/maxext.c,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** maxext.c 19 Apr 2008 20:27:59 -0000 1.58 --- maxext.c 28 Jun 2008 22:47:59 -0000 1.59 *************** *** 599,603 **** if(sym == fts_s_begin) ! ftmext_loader_push_scope(loader); else if(sym == fts_s_end) ftmext_loader_pop_scope(loader); --- 599,603 ---- if(sym == fts_s_begin) ! ftmext_loader_push_scope(loader, NULL); else if(sym == fts_s_end) ftmext_loader_pop_scope(loader); |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:46:23
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26639/ftmlib Modified Files: ftmdump.h Log Message: added scope to push and pop of loader scope Index: ftmdump.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/ftmdump.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ftmdump.h 18 Dec 2007 10:28:54 -0000 1.2 --- ftmdump.h 28 Jun 2008 22:46:31 -0000 1.3 *************** *** 52,57 **** FTS_API void ftmext_loader_reset(ftmext_loader_t *loader); ! FTS_API void ftmext_loader_push_scope(ftmext_loader_t *loader); ! FTS_API void ftmext_loader_pop_scope(ftmext_loader_t *loader); FTS_API void *ftmext_loader_get_scope_data(ftmext_loader_t *loader); FTS_API void ftmext_loader_set_scope_data(ftmext_loader_t *loader, void *data); --- 52,57 ---- FTS_API void ftmext_loader_reset(ftmext_loader_t *loader); ! FTS_API void ftmext_loader_push_scope(ftmext_loader_t *loader, fts_patcher_t *scope); ! FTS_API fts_patcher_t *ftmext_loader_pop_scope(ftmext_loader_t *loader); FTS_API void *ftmext_loader_get_scope_data(ftmext_loader_t *loader); FTS_API void ftmext_loader_set_scope_data(ftmext_loader_t *loader, void *data); |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:45:34
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25465/ftmlib Modified Files: ftmdump.c Log Message: added current scope to in loder stack (will be used to better check scopes in FTM 1.7 files and to implement FTM 2.3 scoping compatibility in Max 5) Index: ftmdump.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/ftmdump.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ftmdump.c 21 Feb 2008 15:14:57 -0000 1.8 --- ftmdump.c 28 Jun 2008 22:45:41 -0000 1.9 *************** *** 407,411 **** } loader_scope_t; - #define loader_scope_get_data(s) ((s)->data) #define loader_scope_set_data(s, d) ((s)->data = (d)) --- 407,410 ---- *************** *** 419,426 **** static void ! loader_scope_reset(loader_scope_t *loader_scope) { fts_hashtable_clear(&loader_scope->hash); ! loader_scope->scope = NULL; } --- 418,426 ---- static void ! loader_scope_reset(loader_scope_t *loader_scope, fts_patcher_t *scope) { fts_hashtable_clear(&loader_scope->hash); ! loader_scope->scope = scope; ! loader_scope->data = NULL; } *************** *** 511,516 **** void ! ftmext_loader_push_scope(ftmext_loader_t *loader) { loader->top++; --- 511,518 ---- void ! ftmext_loader_push_scope(ftmext_loader_t *loader, fts_patcher_t *scope) { + loader_scope_t *loader_scope = NULL; + loader->top++; *************** *** 518,531 **** loader_stack_grow(loader); ! loader_scope_reset(loader->stack + loader->top); } ! void ftmext_loader_pop_scope(ftmext_loader_t *loader) { loader_scope_t *loader_scope = loader_get_scope(loader); if(loader_scope != NULL) loader->top--; } --- 520,539 ---- loader_stack_grow(loader); ! loader_scope_reset(loader->stack + loader->top, scope); } ! fts_patcher_t * ftmext_loader_pop_scope(ftmext_loader_t *loader) { loader_scope_t *loader_scope = loader_get_scope(loader); + fts_patcher_t *scope = NULL; if(loader_scope != NULL) + { + scope = loader_scope->scope; loader->top--; + } + + return scope; } *************** *** 729,733 **** loader_scope_t *loader_scope = loader_get_scope(loader); ! return loader_scope_get_data(loader_scope); } --- 737,741 ---- loader_scope_t *loader_scope = loader_get_scope(loader); ! return loader_scope->data; } *************** *** 736,741 **** { loader_scope_t *loader_scope = loader_get_scope(loader); ! ! loader_scope_set_data(loader_scope, data); } --- 744,748 ---- { loader_scope_t *loader_scope = loader_get_scope(loader); ! loader_scope->data = data; } |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:42:43
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25034/ftmlib Modified Files: ftmcontext.c Log Message: fixed issue in resoring globally named values depending on other named values Index: ftmcontext.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/ftmcontext.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ftmcontext.c 3 Feb 2008 19:22:47 -0000 1.9 --- ftmcontext.c 28 Jun 2008 22:42:50 -0000 1.10 *************** *** 484,493 **** else { - /* redefine with old name (could have been used in mean time) */ - int old_global = ftm_context_is_global(context); - /* update name */ context->definition = NULL; ! ftm_context_set_name(context, NULL, old_global); } } --- 484,490 ---- else { /* update name */ context->definition = NULL; ! ftm_context_set_name(context, NULL, -1); } } *************** *** 544,548 **** if(wanted_global == -1) ! wanted_global = context->global; /* for situations where empty string doesn't work */ --- 541,545 ---- if(wanted_global == -1) ! wanted_global = (context->global != 0); /* for situations where empty string doesn't work */ *************** *** 582,585 **** --- 579,584 ---- if(context->definition != NULL) { + int got_global; + if(wanted_global) fts_definition_set_global(context->definition); *************** *** 587,591 **** fts_definition_set_local(context->definition); ! context->global = fts_definition_is_global(context->definition); } else --- 586,595 ---- fts_definition_set_local(context->definition); ! got_global = fts_definition_is_global(context->definition); ! ! if(wanted_global == 1 && got_global == 0) ! context->global = -1; ! else ! context->global = got_global; } else *************** *** 635,639 **** ftm_context_is_global(ftm_context_t *context) { ! return context->global; } --- 639,643 ---- ftm_context_is_global(ftm_context_t *context) { ! return (context->global > 0); } *************** *** 642,648 **** { if(global != context->global) - { ftm_context_set_name(context, NULL, global); - } } --- 646,650 ---- |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:41:28
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24636/ftmlib Modified Files: class.c Log Message: minor improvement of doc string for import/export handlers Index: class.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/class.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** class.c 7 Apr 2008 11:25:38 -0000 1.24 --- class.c 28 Jun 2008 22:41:36 -0000 1.25 *************** *** 980,985 **** if(!fts_class_get_method_varargs(cl, fts_s_import)) { ! fts_class_message_varargs(cl, fts_s_import, fts_object_import, "<sym: file name> [<any: additional args> ...] - import values from file (file type is derived from suffix)"); ! fts_class_message_varargs(cl, fts_s_importas, fts_object_import_as, "<sym: file type/suffix> <sym: file name> [<any: additional args> ...] - import values from file of given type"); } } --- 980,985 ---- if(!fts_class_get_method_varargs(cl, fts_s_import)) { ! fts_class_message_varargs(cl, fts_s_import, fts_object_import, "<sym: file name> [<list: additional args>] - import values from file (file type is derived from suffix)"); ! fts_class_message_varargs(cl, fts_s_importas, fts_object_import_as, "<sym: file type/suffix> <sym: file name> [<list: additional args>] - import values from file of given type"); } } |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:40:02
|
Update of /cvsroot/ftm/ftm/externals/max In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23806/externals/max Modified Files: ftm.object.c Log Message: removed unused values Index: ftm.object.c =================================================================== RCS file: /cvsroot/ftm/ftm/externals/max/ftm.object.c,v retrieving revision 1.85 retrieving revision 1.86 diff -C2 -d -r1.85 -r1.86 *** ftm.object.c 14 Jun 2008 12:07:50 -0000 1.85 --- ftm.object.c 28 Jun 2008 22:40:08 -0000 1.86 *************** *** 2901,2905 **** maxext_sym_hash_T->s_thing = (t_object *)self; ! maxext_init_finalize((ftmext_t *)self, ac, at); return self; --- 2901,2905 ---- maxext_sym_hash_T->s_thing = (t_object *)self; ! maxext_init_finalize((ftmext_t *)self, 0, NULL); return self; |
|
From: Norbert S. <nsc...@us...> - 2008-06-28 22:38:27
|
Update of /cvsroot/ftm/ftm/externals/max In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23032/externals/max Modified Files: ftm.mess.c Log Message: fixed weired occurence of @ Index: ftm.mess.c =================================================================== RCS file: /cvsroot/ftm/ftm/externals/max/ftm.mess.c,v retrieving revision 1.112 retrieving revision 1.113 diff -C2 -d -r1.112 -r1.113 *** ftm.mess.c 24 Jun 2008 16:57:18 -0000 1.112 --- ftm.mess.c 28 Jun 2008 22:38:32 -0000 1.113 *************** *** 998,1002 **** isArrowKey( int key) { ! return (key == @ || key == kDownKey || key == kLeftKey || key == kRightKey); } --- 998,1002 ---- isArrowKey( int key) { ! return (key == '@' || key == kDownKey || key == kLeftKey || key == kRightKey); } |
|
From: Diemo S. <di...@us...> - 2008-06-27 07:58:27
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20680/ftmlib/classes Modified Files: datafiles.c Log Message: fmat txt import: preallocate according to estimation based on file length instead of 256 element steps -> saves 60% load time (500ms instead of 1200ms for 150k elements) Index: datafiles.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/datafiles.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** datafiles.c 19 Jun 2008 00:16:11 -0000 1.20 --- datafiles.c 27 Jun 2008 07:58:33 -0000 1.21 *************** *** 55,58 **** --- 55,63 ---- if(file != NULL) { + long filelen = fts_atomfile_get_length(file); + int estimation = ceil(filelen / 8.); + + fmat_reshape(self, 1, estimation); + while(fts_atomfile_read(file, &a, &c)) { *************** *** 104,107 **** --- 109,119 ---- } + #if DEBUG + fts_post("fmat_import_textfile: estimated %d elements, allocated %d (%d), got %d (%d)\n", + estimation, self->alloc, self->alloc - estimation, + m * n, m * n - estimation); + #endif + + /* cut back to actual size */ fmat_reshape(self, m, n); *************** *** 241,245 **** { /* temp buffer to be resampled */ orig = fmat_create(m + 2, n); ! fts_object_refer((fts_object_t *) orig); ptr = fmat_get_ptr(orig); } --- 253,257 ---- { /* temp buffer to be resampled */ orig = fmat_create(m + 2, n); ! fts_object_refer((fts_object_t *) orig); ptr = fmat_get_ptr(orig); } *************** *** 275,278 **** --- 287,291 ---- } + static fts_method_status_t fmat_export_audiofile(fts_object_t *o, fts_symbol_t s, int ac, const fts_atom_t *at, fts_atom_t *ret) |
|
From: Diemo S. <di...@us...> - 2008-06-27 07:58:26
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20680/ftmlib Modified Files: atomfile.h atomfile.c Log Message: fmat txt import: preallocate according to estimation based on file length instead of 256 element steps -> saves 60% load time (500ms instead of 1200ms for 150k elements) Index: atomfile.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/atomfile.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** atomfile.h 11 Apr 2007 16:37:34 -0000 1.2 --- atomfile.h 27 Jun 2008 07:58:33 -0000 1.3 *************** *** 54,57 **** --- 54,59 ---- FTS_API fts_atomfile_t *fts_atomfile_open_write(fts_symbol_t name); FTS_API void fts_atomfile_close(fts_atomfile_t *f); + FTS_API long fts_atomfile_get_length (fts_atomfile_t *f); + FTS_API int fts_atomfile_read(fts_atomfile_t *f, fts_atom_t *at, char *separator); Index: atomfile.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/atomfile.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** atomfile.c 29 Feb 2008 15:45:05 -0000 1.7 --- atomfile.c 27 Jun 2008 07:58:33 -0000 1.8 *************** *** 104,107 **** --- 104,123 ---- } + + long fts_atomfile_get_length (fts_atomfile_t *f) + { + long ret = 0; + + if (fseek(f->file, 0, SEEK_END) >= 0) + { + ret = ftell(f->file); + rewind(f->file); + } + /* else: error in seek */ + + return ret; + } + + #define IS_SEPARATOR(c) ((((c) == ' ') || ((c) == '\t') || ((c) == '\r') || ((c) == '\n') || ((c) == '\0'))? (c): 0) #define IS_DIGIT(c) (('0' <= (c)) && ((c) <= '9')) |
|
From: Diemo S. <di...@us...> - 2008-06-27 07:56:18
|
Update of /cvsroot/ftm/ftm/build/max/osx-macho/ftmlib.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19680/build/max/osx-macho/ftmlib.xcodeproj Modified Files: project.pbxproj Log Message: fix definition of DEBUG=1 setting for debug mode set version to 2.3.6-pre0 to distinguish from released version Index: project.pbxproj =================================================================== RCS file: /cvsroot/ftm/ftm/build/max/osx-macho/ftmlib.xcodeproj/project.pbxproj,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** project.pbxproj 19 Jun 2008 00:20:49 -0000 1.102 --- project.pbxproj 27 Jun 2008 07:56:26 -0000 1.103 *************** *** 1421,1429 **** GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_WARN_UNINITIALIZED_AUTOS = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; VERSION_MAJOR = 2; VERSION_MINOR = 3; ! VERSION_RELEASE = 5; }; name = Debug; --- 1421,1431 ---- GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; + GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_WARN_UNINITIALIZED_AUTOS = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + VERSION_BETA = pre0; VERSION_MAJOR = 2; VERSION_MINOR = 3; ! VERSION_RELEASE = 6; }; name = Debug; *************** *** 1443,1449 **** GCC_UNROLL_LOOPS = YES; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; VERSION_MAJOR = 2; VERSION_MINOR = 3; ! VERSION_RELEASE = 5; }; name = Release; --- 1445,1452 ---- GCC_UNROLL_LOOPS = YES; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + VERSION_BETA = pre0; VERSION_MAJOR = 2; VERSION_MINOR = 3; ! VERSION_RELEASE = 6; }; name = Release; |
|
From: Diemo S. <di...@us...> - 2008-06-27 07:53:57
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18419/ftmlib Modified Files: ftsconfig.h Log Message: correct DEBUG=1 setting for debug mode Index: ftsconfig.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/ftsconfig.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ftsconfig.h 20 Jun 2008 11:36:53 -0000 1.16 --- ftsconfig.h 27 Jun 2008 07:54:02 -0000 1.17 *************** *** 24,29 **** #define _FTSCONFIG_H ! /* define to enable debug */ ! #undef DEBUG /* Use new functions of libsndfile (patch on imtr-libs trac --- 24,29 ---- #define _FTSCONFIG_H ! /* defined ONLY BY Debug build configuration to enable debugging and special functions, so DON'T undefine here! */ ! /* #undef DEBUG */ /* Use new functions of libsndfile (patch on imtr-libs trac |
|
From: Diemo S. <di...@us...> - 2008-06-25 14:58:41
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20818 Modified Files: mat.c Log Message: fixed crash for code-created mat when ac == 0: if(!fts_is_tuple(at)) Index: mat.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/mat.c,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** mat.c 23 Jun 2008 11:38:39 -0000 1.41 --- mat.c 25 Jun 2008 14:58:42 -0000 1.42 *************** *** 2132,2135 **** --- 2132,2138 ---- self->opened = 0; + if (ac == 0) + return fts_ok; + if(ac > 0 && fts_is_number(at)) m = fts_get_number_int(at); |
|
From: Diemo S. <di...@us...> - 2008-06-25 11:16:21
|
Update of /cvsroot/ftm/ftm/patches/max/help In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21248/patches/max/help Added Files: sdif-logo.png Log Message: sdif logo first attempt --- NEW FILE: sdif-logo.png --- (This appears to be a binary file; contents omitted.) |
|
From: Diemo S. <di...@us...> - 2008-06-25 11:15:57
|
Update of /cvsroot/ftm/ftm/patches/max/help In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20839/patches/max/help Modified Files: ftm.sdif.track.help ftm.sdif.help Log Message: sdif logo update urls Index: ftm.sdif.track.help =================================================================== RCS file: /cvsroot/ftm/ftm/patches/max/help/ftm.sdif.track.help,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ftm.sdif.track.help 8 Nov 2007 17:04:33 -0000 1.4 --- ftm.sdif.track.help 25 Jun 2008 11:15:57 -0000 1.5 *************** *** 1 **** ! max v2; #N vpatcher 4 63 1187 892; #P origin 8 -39; #P window setfont "Sans Serif" 9.; #P hidden newex 115 533 117 196617 ftm.print dict-in-track:; #P user ftm.mess 502 436 152 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_exportas sdif - { 1FOB 9 1FOF }"; #P user ftm.mess 530 456 210 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export /tmp/test.sdif { 1FOB 9 1FOF 1FQ0 }"; #P hidden newex 115 510 46 196617 ftm.iter; #P user ftm.mess 679 416 207 39 3 9 255 255 255 0 0 0 3 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export /tmp/test.sdif { XFOO 9 1FQ0 1FOF}"; #T _#line "_'1FTD XFOO { 1FQ0 FundamentalFrequency\;"; #T _#line "_ 1FOF FormantParameters\; }'"; #P user ftm.mess 333 416 50 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line _import; #P user ftm.mess 333 211 110 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_import /tmp/test.sdif"; #P number 943 555 35 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #P user ftm.mess 1019 555 82 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(print ($t size))"; #P message 986 555 27 196617 stop; #P message 906 555 32 196617 start; #P user ftm.mess 943 580 203 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(new scomark marker label (cat mark $1))"; #P newex 943 619 179 196617 ftm.record $t @mode clear @clone no; #P user ftm.mess 502 555 174 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(($t markers) exportas sdif - 1SEG)"; #P user ftm.mess 1019 416 83 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(print ($b size))"; #P message 986 416 27 196617 stop; #P message 906 416 32 196617 start; #P flonum 943 416 35 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #P user ftm.mess 943 440 194 27 3 9 255 255 255 0 0 0 2 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(new dict 1FQ0 $1"; #T _#line "_1FOF (new fmat 1 4 $1 ($1 * 2) $1 $1))"; #P newex 943 479 135 196617 ftm.record $b @mode clear; #P user ftm.mess 333 436 104 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_importas sdif - 1FOB"; #P comment 61 21 90 196617 FTM SDIF objects; #P window setfont "Sans Serif" 12.; #P window linecount 3; #P comment 677 91 195 196620 giving the frame (1FTD) and matrix type definitions (1MTD) in an additional argument; #P window setfont "Sans Serif" 9.; #P comment 61 73 195 196617 see http://www.ircam.fr/anasyn/sdif and http://ftm.ircam.fr for more information; #P user ftm.mess 677 187 208 39 3 9 255 255 255 0 0 0 3 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export /tmp/test.sdif XPAR"; #T _#line "_'1MTD XPAR { myparameter }"; #T _#line "_ 1FTD XPAR { XPAR myparametermatrix\; }'"; #P user ftm.mess 333 193 104 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_importas sdif - 1FQ0"; #P user ftm.mess 502 193 105 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_exportas sdif - 1NRG"; #P user ftm.mess 333 175 50 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line _import; #P user ftm.mess 502 211 138 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export /tmp/test.sdif XPAR"; #P user ftm.mess 502 175 75 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export - 1NRG"; #P user ftm.mess 943 208 63 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_($1 / 100.)"; #P user ftm.mess 1019 184 82 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(print ($f size))"; #P window linecount 1; #P message 986 184 27 196617 stop; #P message 906 184 32 196617 start; #P flonum 943 184 35 9 0 100. 2 3 0 0 0 221 221 221 222 222 222 0 0 0; #P newex 943 232 135 196617 ftm.record $f @mode clear; #P window setfont "Sans Serif" 12.; #P window linecount 2; #P comment 58 177 262 196620 A float track contains the first element of SDIF matrices as a float.; #P window setfont "Sans Serif" 9.; #P window linecount 1; #P hidden newex 39 260 105 196617 ftm.print float track:; #P button 31 197 15 0; #P window linecount 3; #P comment 144 233 174 196617 double-click to open the track editor \, control-click to get the pop-up menu and the inspector to set the range; #P window linecount 1; #P message 14 178 32 196617 clear; #P user ftm.object 31 233 81 22 3 12; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#scope begin; #T _#obj 1 track float; #T _#def 0 "_track float" f local; #P message 481 772 52 196617 ftm.mess; #P message 389 772 24 196617 ftm; #P message 420 772 57 196617 ftm.object; #P hidden user ftm.mess 459 797 50 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_help $1"; #P message 221 772 74 196617 ftm.sdif.write; #P message 97 772 45 196617 ftm.sdif; #P window setfont "Sans Serif" 12.; #P window linecount 5; #P comment 333 89 151 196620 giving the frame type \, stream \, and matrix types to select (no matrix type means: take all matrices); #P user ftm.mess 502 416 142 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export - { 1FOB 1 FQ0 1FOF }"; #P user ftm.mess 333 456 184 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_import /tmp/test.sdif { 1FOB 9 1FOF }"; #P user ftm.mess 333 555 110 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(($t markers) import)"; #P user ftm.mess 333 316 70 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_importas sdif"; #P user ftm.mess 333 337 136 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_import /tmp/test.sdif XFOO"; #P user ftm.mess 1019 296 83 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(print ($a size))"; #P window setfont "Sans Serif" 9.; #P window linecount 1; #P message 986 296 27 196617 stop; #P message 906 296 32 196617 start; #P flonum 943 296 35 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #P user ftm.mess 943 320 135 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_(new fmat 1 2 $1 ($1 * 2))"; #P newex 943 344 135 196617 ftm.record $a @mode clear; #P user ftm.mess 502 316 147 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_exportas sdif - { XFOO XMOO }"; #P user ftm.mess 502 295 117 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export - { XFOO XMOO }"; #P user ftm.mess 502 337 179 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export /tmp/test.sdif { XFOO XMOO }"; #P user ftm.mess 677 295 195 39 3 9 255 255 255 0 0 0 3 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_export /tmp/test.sdif { XFOO XMOO }"; #T _#line "_'1MTD XMOO { moocolumn\, maehcolumn }"; #T _#line "_ 1FTD XFOO { XMOO moomatrix\; }'"; #P window setfont "Sans Serif" 12.; #P window linecount 4; #P comment 502 91 138 196620 giving one frame and matrix type (no matrix type means: use the frame type); #P window setfont "Arial Rounded MT Bold" 12.; #P window linecount 1; #P comment 333 72 136 197066764 import from SDIF file; #P comment 677 72 198 197066764 export using your private types; #P comment 502 72 119 197066764 export to SDIF file; #P comment 906 72 130 197066764 generate some data; #P user ftm.mess 31 636 71 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_($1 markers)"; #P window setfont "Sans Serif" 9.; #P window linecount 6; #P comment 142 608 172 196617 double-click to open the track editor \, select 'show markers' in the context menu to see markers \, control click in the marker bar to display labels \, and click on the background to see the list of markers.; #P window setfont "Sans Serif" 12.; #P window linecount 3; #P comment 58 424 256 196620 A dict track contains an SDIF frame as a dict of fmat matrices with the matrix signatures as keys.; #P comment 58 553 255 196620 A scoob's marker track contains one marker for each SDIF matrix \, with the first element as label.; #P window setfont "Sans Serif" 9.; #P window linecount 1; #P hidden newex 39 654 115 196617 ftm.print marker track:; #P button 31 573 15 0; #P message 14 554 32 196617 clear; #P user ftm.object 31 608 87 22 3 12; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#obj 2 track scoob; #T _#def 0 "_track scoob" t local; #P window setfont "Sans Serif" 12.; #P window linecount 3; #P comment 58 303 262 196620 An fmat track contains SDIF matrices (the data converted to float \, regardless of the element type in the file).; #P window setfont "Sans Serif" 9.; #P comment 144 478 172 196617 double-click to open the track editor \, then click on the background to see the list of dicts; #P window linecount 1; #P hidden newex 8 510 101 196617 ftm.print dict-track:; #P hidden newex 39 386 105 196617 ftm.print fmat-track:; #P button 31 446 15 0; #P message 14 427 32 196617 clear; #P comment 168 731 85 196617 duration in ms; #P user ftm.object 31 478 75 22 3 12; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#obj 3 track dict; #T _#def 0 "_track dict" b local; #P hidden user ftm.mess 97 793 50 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_help $1"; #P message 151 772 66 196617 ftm.sdif.info; #P message 316 772 54 196617 track help; #P hidden user ftm.mess 316 793 116 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_help (cat ftm.class. $1)"; #P hidden newex 209 793 45 196617 pcontrol; #P number 105 706 60 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #N vpatcher 10 59 138 188; #P inlet 16 35 15 0; #P window setfont "Sans Serif" 9.; #P newex 16 79 45 196617 pcontrol; #P message 16 59 45 196617 help ftm; #P connect 2 0 0 0; #P hidden connect 0 0 1 0; #P pop; #P hidden newobj 0 79 33 196617 p ftm; #P button 31 323 15 0; #P window linecount 3; #P comment 144 359 174 196617 double-click to open the track editor \, then click on the background to see the list of fmats; #P user hint 0 23 52 95 "back to FTM object help" 750 100 0 65535 65535 52428 9 3 0 1 0 0 0; #P user ubutton 0 23 52 72 0 0; #P flonum 105 729 60 9 0 0 160 3 0 0 0 221 221 221 222 222 222 0 0 0; #P window linecount 1; #P comment 168 708 85 196617 number of events; #P user ftm.mess 50 707 51 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_($1 size)"; #P user ftm.mess 31 730 70 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_($1 duration)"; #P user ftm.mess 333 295 50 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line _import; #P message 14 304 32 196617 clear; #P user ftm.object 31 359 82 22 3 12; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#obj 4 track fmat; #T _#def 0 "_track fmat" a local; #T _#scope end; #P window setfont "Sans Serif" 24.; #P comment 59 32 705 196632 SDIF import/export with an FTM track; #P user fpic -1 22 54 74 ftm.help.jpg 0 0 0 0. 0 0 0; #P window setfont "Sans Serif" 9.; #P comment 33 772 50 196617 see also:; #P user panel 895 68 258 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P user panel 671 68 219 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P user panel 495 68 171 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P user panel 327 68 163 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P hidden connect 14 0 18 0; #P hidden connect 25 0 30 0; #P fasten 83 0 68 0 507 230 36 230; #P fasten 80 0 68 0 507 230 36 230; #P fasten 103 0 68 0 338 230 36 230; #P connect 69 0 68 0; #P connect 71 0 68 0; #P fasten 82 0 68 0 338 230 36 230; #P fasten 85 0 68 0 682 230 36 230; #P fasten 84 0 68 0 338 230 36 230; #P fasten 81 0 68 0 507 230 36 230; #P connect 17 0 7 0; #P connect 8 0 7 0; #P fasten 57 0 7 0 338 356 36 356; #P fasten 46 0 7 0 682 356 36 356; #P fasten 56 0 7 0 338 356 36 356; #P fasten 47 0 7 0 507 356 36 356; #P hidden fasten 9 0 7 0 338 356 36 356; #P fasten 48 0 7 0 507 356 36 356; #P fasten 49 0 7 0 507 356 36 356; #P fasten 108 0 25 0 507 475 36 475; #P fasten 107 0 25 0 535 475 36 475; #P fasten 104 0 25 0 338 475 36 475; #P connect 27 0 25 0; #P connect 28 0 25 0; #P fasten 89 0 25 0 338 475 36 475; #P fasten 59 0 25 0 338 475 36 475; #P fasten 60 0 25 0 507 475 36 475; #P fasten 105 0 25 0 684 475 36 475; #P connect 34 0 33 0; #P connect 35 0 33 0; #P fasten 58 0 33 0 338 604 36 604; #P fasten 96 0 33 0 507 604 36 604; #P connect 33 0 40 0; #P hidden fasten 25 0 10 0 36 490 36 490; #P hidden fasten 7 0 10 0 36 357 36 357; #P hidden connect 40 0 10 0; #P hidden connect 68 0 72 0; #P hidden connect 7 0 29 0; #P hidden connect 40 0 36 0; #P hidden fasten 25 0 11 0 36 610 55 610; #P hidden fasten 7 0 11 0 36 691 55 691; #P hidden connect 40 0 11 0; #P hidden connect 23 0 24 0; #P hidden connect 62 0 24 0; #P hidden connect 63 0 24 0; #P hidden connect 11 0 19 0; #P hidden connect 10 0 13 0; #P hidden connect 25 0 106 0; #P hidden connect 106 0 109 0; #P hidden connect 24 0 20 0; #P hidden connect 21 0 20 0; #P hidden connect 64 0 20 0; #P hidden connect 22 0 21 0; #P hidden connect 67 0 64 0; #P hidden connect 66 0 64 0; #P hidden connect 65 0 64 0; #P connect 75 0 79 0; #P connect 76 0 74 0; #P connect 77 0 74 0; #P connect 79 0 74 0; #P connect 52 0 51 0; #P connect 51 0 50 0; #P connect 54 0 50 0; #P connect 53 0 50 0; #P connect 92 0 91 0; #P connect 91 0 90 0; #P connect 94 0 90 0; #P connect 93 0 90 0; #P connect 102 0 98 0; #P connect 99 0 97 0; #P connect 100 0 97 0; #P connect 98 0 97 0; #P pop; \ No newline at end of file --- 1 ---- ! max v2; #N vpatcher 430 72 1604 884; #P origin 8 -41; #P window setfont "Sans Serif" 9.; #N vpatcher 785 415 1246 717; #P inlet 16 35 15 0; #P window setfont "Sans Serif" 9.; #P hidden newex 16 79 45 196617 pcontrol; #P hidden message 16 59 67 196617 help ftm.sdif; #P connect 2 0 0 0; #P hidden connect 0 0 1 0; #P pop; #P hidden newobj 22 95 54 196617 p ftm.sdif; #P user ubutton 4 13 72 65 0 0; #P user fpic 3 17 73 62 sdif-logo.png 0 0 0 0. 100 100 3; #X interp 1; #P comment 76 21 90 196617 FTM SDIF objects; #P window linecount 2; #P comment 76 91 194 196617 see http://sdif.sourceforge.net and http://ftm.ircam.fr for more information; #P window linecount 1; #N vpatcher 10 59 138 188; #P inlet 16 35 15 0; #P window setfont "Sans Serif" 9.; #P newex 16 79 45 196617 pcontrol; #P message 16 59 45 196617 help ftm; #P connect 2 0 0 0; #P hidden connect 0 0 1 0; #P pop; #P hidden newobj 1064 131 33 196617 p ftm; #P user hint 1099 0 1151 72 "back to FTM object help" 750 100 0 65535 65535 52428 9 3 0 1 0 0 0; #P user ubutton 1100 0 52 72 0 0; #P window setfont "Sans Serif" 24.; #P comment 76 32 956 196632 Sound Description Interchange Format import/export with an FTM track; #P user fpic 1099 -1 54 74 ftm.help.jpg 0 0 0 0. 0 0 0; #P window setfont "Sans Serif" 9.; #N ftm.print dict-in-track: --> 0; #T _#ftm version 2 3; #T _#scope begin; #T _#absargs $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #P hidden newobj 115 535 117 196617 ftm.print dict-in-track:; #P user ftm.mess 502 438 152 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_exportas sdif - { 1FOB 9 1FOF }"; #P user ftm.mess 530 458 210 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_export /tmp/test.sdif { 1FOB 9 1FOF 1FQ0 }"; #N ftm.iter --> 0; #P hidden newobj 115 512 46 196617 ftm.iter; #P user ftm.mess 679 418 207 39 3 9 255 255 255 0 0 0 3 2 0 0 0 --> 0; #T _#line "_export /tmp/test.sdif { XFOO 9 1FQ0 1FOF}"; #T _#line "_'1FTD XFOO { 1FQ0 FundamentalFrequency\;"; #T _#line "_ 1FOF FormantParameters\; }'"; #P user ftm.mess 333 418 50 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line _import; #P user ftm.mess 333 213 110 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_import /tmp/test.sdif"; #P number 943 557 35 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #P user ftm.mess 1019 557 82 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(print ($t size))"; #P message 986 557 27 196617 stop; #P message 906 557 32 196617 start; #P user ftm.mess 943 582 203 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(new scomark marker label (cat mark $1))"; #N ftm.record $t @mode clear @clone no --> 0; #P newobj 943 621 179 196617 ftm.record $t @mode clear @clone no; #P user ftm.mess 502 557 174 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(($t markers) exportas sdif - 1SEG)"; #P user ftm.mess 1019 418 83 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(print ($b size))"; #P message 986 418 27 196617 stop; #P message 906 418 32 196617 start; #P flonum 943 418 35 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #P user ftm.mess 943 442 194 27 3 9 255 255 255 0 0 0 2 2 0 0 0 --> 0; #T _#line "_(new dict 1FQ0 $1"; #T _#line "_1FOF (new fmat 1 4 $1 ($1 * 2) $1 $1))"; #N ftm.record $b @mode clear --> 0; #P newobj 943 481 135 196617 ftm.record $b @mode clear; #P user ftm.mess 333 438 104 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_importas sdif - 1FOB"; #P window setfont "Sans Serif" 12.; #P window linecount 3; #P comment 677 93 195 196620 giving the frame (1FTD) and matrix type definitions (1MTD) in an additional argument; #P user ftm.mess 677 189 208 39 3 9 255 255 255 0 0 0 3 2 0 0 0 --> 0; #T _#line "_export /tmp/test.sdif XPAR"; #T _#line "_'1MTD XPAR { myparameter }"; #T _#line "_ 1FTD XPAR { XPAR myparametermatrix\; }'"; #P user ftm.mess 333 195 104 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_importas sdif - 1FQ0"; #P user ftm.mess 502 195 105 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_exportas sdif - 1NRG"; #P user ftm.mess 333 177 50 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line _import; #P user ftm.mess 502 213 138 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_export /tmp/test.sdif XPAR"; #P user ftm.mess 502 177 75 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_export - 1NRG"; #P user ftm.mess 943 210 63 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_($1 / 100.)"; #P user ftm.mess 1019 186 82 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(print ($f size))"; #P window setfont "Sans Serif" 9.; #P window linecount 1; #P message 986 186 27 196617 stop; #P message 906 186 32 196617 start; #P flonum 943 186 35 9 0 100. 2 3 0 0 0 221 221 221 222 222 222 0 0 0; #N ftm.record $f @mode clear --> 0; #P newobj 943 234 135 196617 ftm.record $f @mode clear; #P window setfont "Sans Serif" 12.; #P window linecount 2; #P comment 58 179 262 196620 A float track contains the first element of SDIF matrices as a float.; #P window setfont "Sans Serif" 9.; #P window linecount 1; #N ftm.print float track: --> 0; #P hidden newobj 39 262 105 196617 ftm.print float track:; #P button 31 199 15 0; #P window linecount 3; #P comment 144 235 174 196617 double-click to open the track editor \, control-click to get the pop-up menu and the inspector to set the range; #P window linecount 1; #P message 14 180 32 196617 clear; #P user ftm.object 31 235 81 22 3 12 --> 0; #T _#obj 1 track number; #T _#def 0 "_track float" f local; #P message 481 774 52 196617 ftm.mess; #P message 389 774 24 196617 ftm; #P message 420 774 57 196617 ftm.object; #P hidden user ftm.mess 459 799 50 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_help $1"; #P message 221 774 74 196617 ftm.sdif.write; #P message 97 774 45 196617 ftm.sdif; #P window setfont "Sans Serif" 12.; #P window linecount 5; #P comment 333 91 151 196620 giving the frame type \, stream \, and matrix types to select (no matrix type means: take all matrices); #P user ftm.mess 502 418 142 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_export - { 1FOB 1 FQ0 1FOF }"; #P user ftm.mess 333 458 184 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_import /tmp/test.sdif { 1FOB 9 1FOF }"; #P user ftm.mess 333 557 110 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(($t markers) import)"; #P user ftm.mess 333 318 70 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_importas sdif"; #P user ftm.mess 333 339 136 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_import /tmp/test.sdif XFOO"; #P user ftm.mess 1019 298 83 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(print ($a size))"; #P window setfont "Sans Serif" 9.; #P window linecount 1; #P message 986 298 27 196617 stop; #P message 906 298 32 196617 start; #P flonum 943 298 35 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #P user ftm.mess 943 322 135 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_(new fmat 1 2 $1 ($1 * 2))"; #N ftm.record $a @mode clear --> 0; #P newobj 943 346 135 196617 ftm.record $a @mode clear; #P user ftm.mess 502 318 147 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_exportas sdif - { XFOO XMOO }"; #P user ftm.mess 502 297 117 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_export - { XFOO XMOO }"; #P user ftm.mess 502 339 179 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_export /tmp/test.sdif { XFOO XMOO }"; #P user ftm.mess 677 297 195 39 3 9 255 255 255 0 0 0 3 2 0 0 0 --> 0; #T _#line "_export /tmp/test.sdif { XFOO XMOO }"; #T _#line "_'1MTD XMOO { moocolumn\, maehcolumn }"; #T _#line "_ 1FTD XFOO { XMOO moomatrix\; }'"; #P window setfont "Sans Serif" 12.; #P window linecount 4; #P comment 502 93 138 196620 giving one frame and matrix type (no matrix type means: use the frame type); #P window setfont "Arial Rounded MT Bold" 12.; #P window linecount 1; #P comment 333 74 136 197066764 import from SDIF file; #P comment 677 74 198 197066764 export using your private types; #P comment 502 74 119 197066764 export to SDIF file; #P comment 906 74 130 197066764 generate some data; #P user ftm.mess 31 638 71 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_($1 markers)"; #P window setfont "Sans Serif" 9.; #P window linecount 6; #P comment 142 610 172 196617 double-click to open the track editor \, select 'show markers' in the context menu to see markers \, control click in the marker bar to display labels \, and click on the background to see the list of markers.; #P window setfont "Sans Serif" 12.; #P window linecount 3; #P comment 58 426 256 196620 A dict track contains an SDIF frame as a dict of fmat matrices with the matrix signatures as keys.; #P comment 58 555 255 196620 A scoob's marker track contains one marker for each SDIF matrix \, with the first element as label.; #P window setfont "Sans Serif" 9.; #P window linecount 1; #N ftm.print marker track: --> 0; #P hidden newobj 39 656 115 196617 ftm.print marker track:; #P button 31 575 15 0; #P message 14 556 32 196617 clear; #P user ftm.object 31 610 87 22 3 12 --> 0; #T _#obj 2 track scoob; #T _#def 0 "_track scoob" t local; #P window setfont "Sans Serif" 12.; #P window linecount 3; #P comment 58 305 262 196620 An fmat track contains SDIF matrices (the data converted to float \, regardless of the element type in the file).; #P window setfont "Sans Serif" 9.; #P comment 144 480 172 196617 double-click to open the track editor \, then click on the background to see the list of dicts; #P window linecount 1; #N ftm.print dict-track: --> 0; #P hidden newobj 8 512 101 196617 ftm.print dict-track:; #N ftm.print fmat-track: --> 0; #P hidden newobj 39 388 105 196617 ftm.print fmat-track:; #P button 31 448 15 0; #P message 14 429 32 196617 clear; #P comment 168 733 85 196617 duration in ms; #P user ftm.object 31 480 75 22 3 12 --> 0; #T _#obj 3 track dict; #T _#def 0 "_track dict" b local; #P hidden user ftm.mess 97 795 50 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_help $1"; #P message 151 774 66 196617 ftm.sdif.info; #P message 316 774 54 196617 track help; #P hidden user ftm.mess 316 795 116 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_help (cat ftm.class. $1)"; #P hidden newex 209 795 45 196617 pcontrol; #P number 105 708 60 9 0 0 0 3 0 0 0 221 221 221 222 222 222 0 0 0; #P button 31 325 15 0; #P window linecount 3; #P comment 144 361 174 196617 double-click to open the track editor \, then click on the background to see the list of fmats; #P flonum 105 731 60 9 0 0 160 3 0 0 0 221 221 221 222 222 222 0 0 0; #P window linecount 1; #P comment 168 710 85 196617 number of events; #P user ftm.mess 50 709 51 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_($1 size)"; #P user ftm.mess 31 732 70 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line "_($1 duration)"; #P user ftm.mess 333 297 50 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#line _import; #P message 14 306 32 196617 clear; #P user ftm.object 31 361 82 22 3 12 --> 0; #T _#obj 4 track fmat; #T _#def 0 "_track fmat" a local; #T _#scope end; #P comment 33 774 50 196617 see also:; #P user panel 895 70 258 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P user panel 671 70 219 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P user panel 495 70 171 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P user panel 327 70 163 640; #X brgb 129 193 218; #X frgb 255 255 255; #X border 1; #X rounded 0; #X shadow 0; #X done; #P background; #P hidden connect 20 0 25 0; #P hidden connect 111 0 112 0; #P fasten 76 0 63 0 507 232 36 232; #P fasten 79 0 63 0 338 232 36 232; #P fasten 80 0 63 0 682 232 36 232; #P fasten 77 0 63 0 338 232 36 232; #P connect 66 0 63 0; #P connect 64 0 63 0; #P fasten 96 0 63 0 338 232 36 232; #P fasten 75 0 63 0 507 232 36 232; #P fasten 78 0 63 0 507 232 36 232; #P fasten 44 0 5 0 507 358 36 358; #P fasten 43 0 5 0 507 358 36 358; #P hidden fasten 7 0 5 0 338 358 36 358; #P fasten 42 0 5 0 507 358 36 358; #P fasten 51 0 5 0 338 358 36 358; #P fasten 41 0 5 0 682 358 36 358; #P fasten 52 0 5 0 338 358 36 358; #P connect 6 0 5 0; #P connect 13 0 5 0; #P fasten 98 0 20 0 684 477 36 477; #P fasten 55 0 20 0 507 477 36 477; #P fasten 54 0 20 0 338 477 36 477; #P fasten 82 0 20 0 338 477 36 477; #P connect 23 0 20 0; #P connect 22 0 20 0; #P fasten 97 0 20 0 338 477 36 477; #P fasten 100 0 20 0 535 477 36 477; #P fasten 101 0 20 0 507 477 36 477; #P fasten 89 0 28 0 507 606 36 606; #P fasten 53 0 28 0 338 606 36 606; #P connect 30 0 28 0; #P connect 29 0 28 0; #P connect 28 0 35 0; #P hidden connect 35 0 8 0; #P hidden fasten 20 0 8 0 36 492 36 492; #P hidden fasten 5 0 8 0 36 359 36 359; #P hidden connect 63 0 67 0; #P hidden connect 5 0 24 0; #P hidden connect 35 0 31 0; #P hidden connect 35 0 9 0; #P hidden fasten 20 0 9 0 36 612 55 612; #P hidden fasten 5 0 9 0 36 693 55 693; #P hidden connect 58 0 19 0; #P hidden connect 57 0 19 0; #P hidden connect 18 0 19 0; #P hidden connect 9 0 14 0; #P hidden connect 8 0 11 0; #P hidden connect 20 0 99 0; #P hidden connect 99 0 102 0; #P hidden connect 59 0 15 0; #P hidden connect 16 0 15 0; #P hidden connect 19 0 15 0; #P hidden connect 17 0 16 0; #P hidden connect 60 0 59 0; #P hidden connect 61 0 59 0; #P hidden connect 62 0 59 0; #P connect 70 0 74 0; #P connect 74 0 69 0; #P connect 72 0 69 0; #P connect 71 0 69 0; #P connect 47 0 46 0; #P connect 48 0 45 0; #P connect 49 0 45 0; #P connect 46 0 45 0; #P connect 85 0 84 0; #P connect 86 0 83 0; #P connect 87 0 83 0; #P connect 84 0 83 0; #P connect 95 0 91 0; #P connect 91 0 90 0; #P connect 93 0 90 0; #P connect 92 0 90 0; #P hidden connect 105 0 107 0; #P pop; \ No newline at end of file Index: ftm.sdif.help =================================================================== RCS file: /cvsroot/ftm/ftm/patches/max/help/ftm.sdif.help,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ftm.sdif.help 8 Nov 2007 17:05:03 -0000 1.5 --- ftm.sdif.help 25 Jun 2008 11:15:58 -0000 1.6 *************** *** 1 **** ! max v2; #N vpatcher 0 44 496 306; #P origin 7 -22; #P window setfont "Sans Serif" 9.; #P window linecount 3; #P comment 276 185 195 196617 see http://www.ircam.fr/anasyn/sdif and http://ftm.ircam.fr for more information; #P window linecount 1; #P message 208 185 54 196617 ftm.mess; #P message 116 185 24 196617 ftm; #P message 147 185 54 196617 ftm.object; #P comment 61 185 50 196617 see also:; #P message 276 121 74 196617 ftm.sdif.write; #P window setfont "Sans Serif" 10.; #P comment 61 121 255 196618 ¥ writing directly to an SDIF file:; #P window setfont "Sans Serif" 9.; #P message 276 100 73 196617 ftm.sdif.track; #P hidden user ftm.mess 276 167 50 15 3 9 255 255 255 0 0 0 1 2 0 0; #T _#aa $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_help $1"; #P message 276 142 66 196617 ftm.sdif.info; #P hidden newex 276 187 45 196617 pcontrol; #N vpatcher 10 59 138 188; #P inlet 16 35 15 0; #P window setfont "Sans Serif" 9.; #P newex 16 79 45 196617 pcontrol; #P message 16 59 45 196617 help ftm; #P connect 2 0 0 0; #P hidden connect 0 0 1 0; #P pop; #P hidden newobj 1 62 33 196617 p ftm; #P user hint 1 6 53 78 "back to FTM object help" 750 100 0 65535 65535 52428 9 3 0 1 0 0 0; #P user ubutton 1 6 52 72 0 0; #P window setfont "Sans Serif" 24.; #P window linecount 2; #P comment 60 8 415 196632 SDIF Sound Description Interchange Format support in FTM; #P user fpic 0 5 54 74 ftm.help.jpg 0 0 0 0. 0 0 0; #P window setfont "Sans Serif" 10.; #P window linecount 1; #P comment 61 142 255 196618 ¥ getting information about an SDIF file:; #P comment 61 100 255 196618 ¥ import/export to an FTM track object:; #P hidden connect 4 0 6 0; #P hidden connect 12 0 9 0; #P hidden connect 8 0 9 0; #P hidden connect 10 0 9 0; #P hidden connect 15 0 9 0; #P hidden connect 14 0 9 0; #P hidden connect 16 0 9 0; #P hidden connect 9 0 7 0; #P pop; \ No newline at end of file --- 1 ---- ! max v2; #N vpatcher 0 44 523 309; #P origin -26 -37; #P user fpic 18 21 75 68 sdif-logo.png 0 0 0 0. 100 100 3; #X interp 1; #P window setfont "Sans Serif" 9.; #P window linecount 2; #P comment 309 200 195 196617 see http://sdif.sourceforge.net and http://ftm.ircam.fr for more information; #P window linecount 1; #P message 241 200 54 196617 ftm.mess; #P message 149 200 24 196617 ftm; #P message 180 200 54 196617 ftm.object; #P comment 94 200 50 196617 see also:; #P message 309 136 74 196617 ftm.sdif.write; #P window setfont "Sans Serif" 10.; #P comment 94 136 255 196618 ¥ writing directly to an SDIF file:; #P window setfont "Sans Serif" 9.; #P message 309 115 73 196617 ftm.sdif.track; #P hidden user ftm.mess 309 182 50 15 3 9 255 255 255 0 0 0 1 2 0 0 0 --> 0; #T _#ftm version 2 3; #T _#scope begin; #T _#absargs $0_ $1_ $2_ $3_ $4_ $5_ $6_ $7_ $8_ $9_; #T _#line "_help $1"; #T _#scope end; #P message 309 157 66 196617 ftm.sdif.info; #P hidden newex 309 202 45 196617 pcontrol; #N vpatcher 10 59 138 188; #P inlet 16 35 15 0; #P window setfont "Sans Serif" 9.; #P newex 16 79 45 196617 pcontrol; #P message 16 59 45 196617 help ftm; #P connect 2 0 0 0; #P hidden connect 0 0 1 0; #P pop; #P hidden newobj 455 77 33 196617 p ftm; #P user hint 455 21 507 93 "back to FTM object help" 750 100 0 65535 65535 52428 9 3 0 1 0 0 0; #P user ubutton 455 21 52 72 0 0; #P window setfont "Sans Serif" 24.; #P window linecount 2; #P comment 93 23 415 196632 Sound Description Interchange Format support in FTM; #P user fpic 454 20 54 74 ftm.help.jpg 0 0 0 0. 0 0 0; #P window setfont "Sans Serif" 10.; #P window linecount 1; #P comment 94 157 255 196618 ¥ getting information about an SDIF file:; #P comment 94 115 255 196618 ¥ import/export to an FTM track object:; #P user panel 8 8 65 202; #X brgb 247 247 247; #X frgb 231 231 231; #X border 1; #X rounded 8; #X shadow 0; #X done; #P hidden connect 17 0 10 0; #P hidden connect 15 0 10 0; #P hidden connect 16 0 10 0; #P hidden connect 11 0 10 0; #P hidden connect 9 0 10 0; #P hidden connect 13 0 10 0; #P hidden connect 10 0 8 0; #P hidden connect 5 0 7 0; #P pop; \ No newline at end of file |
|
From: Diemo S. <di...@us...> - 2008-06-25 11:15:31
|
Update of /cvsroot/ftm/ftm/patches/max/help In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20822/patches/max/help Modified Files: ftm.help Log Message: sdif logo replaced non-functional loadbangs with ftm loadbang init for class selection bigger button to open class help Index: ftm.help =================================================================== RCS file: /cvsroot/ftm/ftm/patches/max/help/ftm.help,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 Binary files /tmp/cvswYakY2 and /tmp/cvscvWhkw differ |
|
From: Riccardo B. <bor...@us...> - 2008-06-24 16:57:12
|
Update of /cvsroot/ftm/ftm/gui/Juce/common In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26817/gui/Juce/common Modified Files: CursorTool.cpp EditTool.cpp EditorContainer.cpp EditorContainer.h ImtrEditorListener.h RegionTool.cpp ScrollZoomTool.cpp Log Message: ftm.editor: fixed open help patch in locked patcher Index: ScrollZoomTool.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/ScrollZoomTool.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ScrollZoomTool.cpp 3 Jun 2008 14:34:24 -0000 1.1 --- ScrollZoomTool.cpp 24 Jun 2008 16:57:18 -0000 1.2 *************** *** 91,100 **** if (e.mods.isPopupMenu()) editor->openPopupMenu(); ! else ! if(e.mods.isCommandDown()) ! { ! zooming = true; ! e.eventComponent->setMouseCursor(JUCE_EDITOR_NAMESPACE::MouseCursor(container->isVertical() ? JUCE_EDITOR_NAMESPACE::MouseCursor::UpDownResizeCursor : JUCE_EDITOR_NAMESPACE::MouseCursor::LeftRightResizeCursor)); ! } else e.eventComponent->setMouseCursor(JUCE_EDITOR_NAMESPACE::MouseCursor(JUCE_EDITOR_NAMESPACE::MouseCursor::DraggingHandCursor)); --- 91,103 ---- if (e.mods.isPopupMenu()) editor->openPopupMenu(); ! else if(e.mods.isAltDown())//open help patch ! { ! container->getImtrListener()->doAction(JUCE_EDITOR_NAMESPACE::String("help")); ! } ! else if(e.mods.isCommandDown()) ! { ! zooming = true; ! e.eventComponent->setMouseCursor(JUCE_EDITOR_NAMESPACE::MouseCursor(container->isVertical() ? JUCE_EDITOR_NAMESPACE::MouseCursor::UpDownResizeCursor : JUCE_EDITOR_NAMESPACE::MouseCursor::LeftRightResizeCursor)); ! } else e.eventComponent->setMouseCursor(JUCE_EDITOR_NAMESPACE::MouseCursor(JUCE_EDITOR_NAMESPACE::MouseCursor::DraggingHandCursor)); Index: ImtrEditorListener.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/ImtrEditorListener.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ImtrEditorListener.h 3 Jun 2008 14:34:24 -0000 1.1 --- ImtrEditorListener.h 24 Jun 2008 16:57:18 -0000 1.2 *************** *** 69,72 **** --- 69,78 ---- */ virtual void postError(JUCE_EDITOR_NAMESPACE::String error) = 0; + /** + * @brief do an action by name + * @param action name + * @ingroup ImtrEditorListener + */ + virtual void doAction(JUCE_EDITOR_NAMESPACE::String action) = 0; }; Index: EditorContainer.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/EditorContainer.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EditorContainer.cpp 10 Jun 2008 16:36:34 -0000 1.4 --- EditorContainer.cpp 24 Jun 2008 16:57:18 -0000 1.5 *************** *** 658,661 **** --- 658,667 ---- } + void EditorContainer::mouseDown(const JUCE_EDITOR_NAMESPACE::MouseEvent& e) + { + if(e.mods.isAltDown()) + listener->doAction(JUCE_EDITOR_NAMESPACE::String("help")); + } + /*************************************** -------- EditorResizerListener ---------- Index: EditorContainer.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/EditorContainer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EditorContainer.h 3 Jun 2008 14:34:23 -0000 1.1 --- EditorContainer.h 24 Jun 2008 16:57:18 -0000 1.2 *************** *** 675,678 **** --- 675,680 ---- void objectChanged(void *obj); + void mouseDown(const JUCE_EDITOR_NAMESPACE::MouseEvent& e); + JUCE_EDITOR_NAMESPACE::Colour getBackgroundColor(){return backcolor;} void setColorShades(JUCE_EDITOR_NAMESPACE::Colour color); *************** *** 682,686 **** void outputSplit(); void outputIntegers(JUCE_EDITOR_NAMESPACE::StringArray symbols, JUCE_EDITOR_NAMESPACE::Array <int> values){ listener->outputIntegers(symbols, values);} ! void postError(JUCE_EDITOR_NAMESPACE::String error); --- 684,688 ---- void outputSplit(); void outputIntegers(JUCE_EDITOR_NAMESPACE::StringArray symbols, JUCE_EDITOR_NAMESPACE::Array <int> values){ listener->outputIntegers(symbols, values);} ! ImtrEditorListener *getImtrListener(){return listener;} void postError(JUCE_EDITOR_NAMESPACE::String error); *************** *** 719,723 **** float getVisibleMax(); void getHorizontalRange(float *dmin, float *dmax); ! void drawVerticalRange(JUCE_EDITOR_NAMESPACE::Graphics& g, ImtrEditor *editor); /** @} Others... */ --- 721,725 ---- float getVisibleMax(); void getHorizontalRange(float *dmin, float *dmax); ! void drawVerticalRange(JUCE_EDITOR_NAMESPACE::Graphics& g, ImtrEditor *editor); /** @} Others... */ Index: CursorTool.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/CursorTool.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CursorTool.cpp 3 Jun 2008 14:34:23 -0000 1.1 --- CursorTool.cpp 24 Jun 2008 16:57:18 -0000 1.2 *************** *** 61,64 **** --- 61,68 ---- if(e.mods.isPopupMenu()) editor->openPopupMenu(); + if(e.mods.isAltDown())//open help patch + { + container->getImtrListener()->doAction(JUCE_EDITOR_NAMESPACE::String("help")); + } else { Index: RegionTool.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/RegionTool.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RegionTool.cpp 3 Jun 2008 14:34:24 -0000 1.1 --- RegionTool.cpp 24 Jun 2008 16:57:18 -0000 1.2 *************** *** 85,88 **** --- 85,92 ---- if (e.mods.isPopupMenu()) editor->openPopupMenu(); + else if(e.mods.isAltDown())//open help patch + { + container->getImtrListener()->doAction(JUCE_EDITOR_NAMESPACE::String("help")); + } else { Index: EditTool.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/EditTool.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EditTool.cpp 3 Jun 2008 14:34:23 -0000 1.1 --- EditTool.cpp 24 Jun 2008 16:57:18 -0000 1.2 *************** *** 102,112 **** editor->addToLocation(x, y, e.mods.isShiftDown()); else ! if(e.mods.isAltDown()) /*start select_region */ { ! if(container->isRegionSelected()) /* deselect region selection */ ! container->deselectRegion(); ! container->setRegionSelection( editor->editorGetInvX(x), editor->editorGetInvX(x)); ! editor->setSelectingRegion(true); } else --- 102,117 ---- editor->addToLocation(x, y, e.mods.isShiftDown()); else ! if(e.mods.isAltDown()) { ! if(e.mods.isShiftDown()) /*start select_region */ ! { ! if(container->isRegionSelected()) /* deselect region selection */ ! container->deselectRegion(); ! container->setRegionSelection( editor->editorGetInvX(x), editor->editorGetInvX(x)); ! editor->setSelectingRegion(true); ! } ! else //open help patch ! container->getImtrListener()->doAction(JUCE_EDITOR_NAMESPACE::String("help")); } else |
|
From: Riccardo B. <bor...@us...> - 2008-06-24 16:57:11
|
Update of /cvsroot/ftm/ftm/externals/max In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26817/externals/max Modified Files: ftm.editor.cpp ftm.mess.c Log Message: ftm.editor: fixed open help patch in locked patcher Index: ftm.editor.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/externals/max/ftm.editor.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** ftm.editor.cpp 19 Jun 2008 15:05:29 -0000 1.62 --- ftm.editor.cpp 24 Jun 2008 16:57:18 -0000 1.63 *************** *** 180,183 **** --- 180,199 ---- } + void doAction(JUCE_NAMESPACE::String action) + { + static t_object *pcontrol = NULL; + + if(action == JUCE_NAMESPACE::String("help")) + { + fts_atom_t a; + + if(pcontrol == NULL) + pcontrol = (t_object *)newinstance(gensym("pcontrol"), 0, NULL); + + fts_set_symbol(&a, gensym("ftm.editor")); + typedmess(pcontrol, gensym("help"), 1, &a); + } + } + void paint (JUCE_NAMESPACE::Graphics& g) { Index: ftm.mess.c =================================================================== RCS file: /cvsroot/ftm/ftm/externals/max/ftm.mess.c,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** ftm.mess.c 24 Jun 2008 09:25:51 -0000 1.111 --- ftm.mess.c 24 Jun 2008 16:57:18 -0000 1.112 *************** *** 998,1005 **** isArrowKey( int key) { ! return (key == kUpKey || key == kDownKey || key == kLeftKey || key == kRightKey); } - #ifndef WIN32 --- 998,1004 ---- isArrowKey( int key) { ! return (key == @ || key == kDownKey || key == kLeftKey || key == kRightKey); } #ifndef WIN32 |
|
From: Riccardo B. <bor...@us...> - 2008-06-24 15:37:32
|
Update of /cvsroot/ftm/ftm/patches/max/help In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv20883 Modified Files: ftm.help Log Message: changed see also in ftm.help main patch Index: ftm.help =================================================================== RCS file: /cvsroot/ftm/ftm/patches/max/help/ftm.help,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 Binary files /tmp/cvsC99Dsh and /tmp/cvseckkGx differ |
|
From: Riccardo B. <bor...@us...> - 2008-06-24 11:03:28
|
Update of /cvsroot/ftm/ftm/gui/Juce/common In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv21583/common Modified Files: BpfEditor.cpp MarkersEditor.cpp Log Message: ftm.editor: fixed crash with bad interaction between tools and tableView (for bpf and markers) Index: MarkersEditor.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/MarkersEditor.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MarkersEditor.cpp 23 Jun 2008 16:56:51 -0000 1.8 --- MarkersEditor.cpp 24 Jun 2008 11:03:27 -0000 1.9 *************** *** 71,74 **** --- 71,76 ---- JUCE_EDITOR_NAMESPACE::Font *markerFont; + EditorContainer::tool_name currentToolToRestore; + public: MarkersEditor(void *obj, imtr_guiInterfaceMarkers *markersGui, EditorContainer *container, ImtrEditorListener *listener) : listener(listener), container(container), obj(obj), markersGui(markersGui) *************** *** 118,121 **** --- 120,125 ---- redraw_offscreen = true; description = JUCE_EDITOR_NAMESPACE::String("markers"); + + currentToolToRestore = EditorContainer::edit_tool; } *************** *** 894,897 **** --- 898,903 ---- void showMarkersAsList() { + currentToolToRestore = container->getCurrentToolName(); + container->setTool(EditorContainer::lock_tool); markersList = createMarkersTableView(this, obj, markersGui); this->addAndMakeVisible(markersList); *************** *** 1004,1007 **** --- 1010,1014 ---- { removeChildComponent(markersList); + container->setTool(currentToolToRestore); markersList = NULL; } Index: BpfEditor.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/BpfEditor.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BpfEditor.cpp 18 Jun 2008 14:58:29 -0000 1.3 --- BpfEditor.cpp 24 Jun 2008 11:03:26 -0000 1.4 *************** *** 129,132 **** --- 129,134 ---- bpf_shape_mode shape; + EditorContainer::tool_name currentToolToRestore; + /*-------- offscreen -------*/ JUCE_EDITOR_NAMESPACE::Image *offscreen; *************** *** 172,175 **** --- 174,179 ---- redraw_offscreen = true; description = JUCE_EDITOR_NAMESPACE::String("bpf"); + + currentToolToRestore = EditorContainer::edit_tool; } *************** *** 1162,1165 **** --- 1166,1171 ---- this->addAndMakeVisible (d); d->setBounds (20, 100, 200, 80);*/ + currentToolToRestore = container->getCurrentToolName(); + container->setTool(EditorContainer::lock_tool); bpfList = createBpfTableView(this, obj, bpfGui); this->addAndMakeVisible(bpfList); *************** *** 1171,1174 **** --- 1177,1181 ---- { removeChildComponent(bpfList); + container->setTool(currentToolToRestore); bpfList = NULL; } |
|
From: Riccardo B. <bor...@us...> - 2008-06-24 10:25:07
|
Update of /cvsroot/ftm/ftm/gui/Juce In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv5945 Modified Files: FTMJUCE-README Log Message: Index: FTMJUCE-README =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/FTMJUCE-README,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FTMJUCE-README 20 Feb 2008 11:54:24 -0000 1.2 --- FTMJUCE-README 24 Jun 2008 10:25:12 -0000 1.3 *************** *** 1,5 **** How to compile ftm.editor with Juce: ! 1) download Juce (release 1.45) from this address: http://www.rawmaterialsoftware.com/juce/download.php --- 1,5 ---- How to compile ftm.editor with Juce: ! 1) download Juce (release 1.46) from this address: http://www.rawmaterialsoftware.com/juce/download.php *************** *** 10,17 **** with the file ftm/gui/Juce/juce_mac_Windowing.cpp ! 4) edit the juce.xconfig file in the Juce project: changes (if you haven't it on your machine) ! every reference to 10.2.8.sdk with 10.4U.sdk ! ! 5) edit the juce_Config.h file in the Juce project (Windows platform): if you have not ASIO support comment the following lines: --- 10,14 ---- with the file ftm/gui/Juce/juce_mac_Windowing.cpp ! 4) If you are compiling on "Windows platform" edit the juce_Config.h file in the Juce project : if you have not ASIO support comment the following lines: *************** *** 20,26 **** #endif ! 6) compile juce in release mode (with the xcode project: juce/build/macosx/Juce.xcodeproj) ! ! 7) copy the lib juce/bin/UninstalledProducts/libjuce.a in build-macho ! 8) compile the target "ftm.editor juce-static" in ftmexternals.xcodeproj \ No newline at end of file --- 17,21 ---- #endif ! 5) compile juce in release mode (with the xcode project: juce/build/macosx/Juce.xcodeproj) ! 6) compile the target "ftm.editor" in ftmexternals.xcodeproj \ No newline at end of file |
|
From: Riccardo B. <bor...@us...> - 2008-06-24 10:21:36
|
Update of /cvsroot/ftm/ftm/gui/Juce/examples/osx-application/juce_application.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv4252/juce_application.xcodeproj Modified Files: project.pbxproj Log Message: Index: project.pbxproj =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/examples/osx-application/juce_application.xcodeproj/project.pbxproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** project.pbxproj 23 Jun 2008 11:38:40 -0000 1.2 --- project.pbxproj 24 Jun 2008 10:21:40 -0000 1.3 *************** *** 11,14 **** --- 11,15 ---- 3B68AF010DF5899E00A07177 /* Main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B68AF000DF5899E00A07177 /* Main.cpp */; }; 3B68AF130DF58A1E00A07177 /* EditTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B68AF120DF58A1E00A07177 /* EditTool.cpp */; }; + 3B8DE2400E1101E9000757BC /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B8DE23F0E1101E9000757BC /* AppKit.framework */; }; 3BE201330DF3F5990072ED88 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BE201320DF3F5990072ED88 /* OpenGL.framework */; }; 3BE2017A0DF3F6AB0072ED88 /* BpfEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BE201600DF3F6AB0072ED88 /* BpfEditor.cpp */; }; *************** *** 36,39 **** --- 37,41 ---- 3B68AF000DF5899E00A07177 /* Main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Main.cpp; sourceTree = SOURCE_ROOT; }; 3B68AF120DF58A1E00A07177 /* EditTool.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = EditTool.cpp; sourceTree = "<group>"; }; + 3B8DE23F0E1101E9000757BC /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 3BE201320DF3F5990072ED88 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; 3BE201600DF3F6AB0072ED88 /* BpfEditor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = BpfEditor.cpp; sourceTree = "<group>"; }; *************** *** 79,82 **** --- 81,85 ---- 3BE201330DF3F5990072ED88 /* OpenGL.framework in Frameworks */, 3B3BD5B00DF54D75004C9D1E /* libjuce.a in Frameworks */, + 3B8DE2400E1101E9000757BC /* AppKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 138,141 **** --- 141,145 ---- children = ( 3B3BD5AF0DF54D75004C9D1E /* libjuce.a */, + 3B8DE23F0E1101E9000757BC /* AppKit.framework */, 3BE201320DF3F5990072ED88 /* OpenGL.framework */, 20286C33FDCF999611CA2CEA /* Carbon.framework */, |