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: Jean-Philippe L. <jp_...@us...> - 2008-06-19 16:03:44
|
Update of /cvsroot/ftm/ftm/build/max/osx-macho/ftmexternals.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv2920/build/max/osx-macho/ftmexternals.xcodeproj Added Files: lambert.mode1 lambert.pbxuser Log Message: added my own (lambert) projects preferences --- NEW FILE: lambert.mode1 --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>ActivePerspectiveName</key> <string>Project</string> <key>AllowedModules</key> <array> <dict> <key>BundleLoadPath</key> <string></string> <key>MaxInstances</key> <string>n</string> <key>Module</key> <string>PBXSmartGroupTreeModule</string> <key>Name</key> <string>Groups and Files Outline View</string> </dict> <dict> [...1325 lines suppressed...] <key>StatusbarIsVisible</key> <integer>0</integer> <key>TableOfContents</key> <array> <string>1C0AD2AF069F1E9B00FABCE6</string> <string>1C0AD2B0069F1E9B00FABCE6</string> <string>1CA6456E063B45B4001379D8</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.classbrowser</string> <key>WindowString</key> <string>385 179 630 352 0 0 1440 878 </string> <key>WindowToolGUID</key> <string>1C0AD2AF069F1E9B00FABCE6</string> <key>WindowToolIsVisible</key> <integer>0</integer> </dict> </array> </dict> </plist> --- NEW FILE: lambert.pbxuser --- // !$*UTF8*$! { 1D4B04910E0AAA2600AF9550 /* Source Control */ = { isa = PBXSourceControlManager; fallbackIsa = XCSourceControlManager; isSCMEnabled = 0; scmConfiguration = { }; scmType = ""; }; 1D4B04920E0AAA2600AF9550 /* Code sense */ = { isa = PBXCodeSenseManager; indexTemplatePath = ""; }; 1D4B04B70E0AABC300AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3B35E1950C05AD6D00567CE9 /* BpfEditor.cpp */; name = "BpfEditor.cpp: 1"; rLen = 0; rLoc = 0; rType = 0; vrLen = 994; vrLoc = 0; }; 1D4B04B80E0AABC300AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3B35E1950C05AD6D00567CE9 /* BpfEditor.cpp */; name = "BpfEditor.cpp: 1"; rLen = 0; rLoc = 0; rType = 0; vrLen = 1028; vrLoc = 1060; }; 1D4B04C50E0AAC9200AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3B35E1950C05AD6D00567CE9 /* BpfEditor.cpp */; name = "BpfEditor.cpp: 1"; rLen = 0; rLoc = 0; rType = 0; vrLen = 1028; vrLoc = 1060; }; 1D4B05110E0AB98D00AF9550 /* MaxMSP */ = { isa = PBXExecutable; activeArgIndex = 2147483647; activeArgIndices = ( ); argumentStrings = ( ); autoAttachOnCrash = 1; configStateDict = { }; customDataFormattersEnabled = 1; debuggerPlugin = GDBDebugging; disassemblyDisplayState = 0; dylibVariantSuffix = ""; enableDebugStr = 1; environmentEntries = ( ); executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; launchableReference = 1D4B05120E0AB98E00AF9550 /* MaxMSP.app */; libgmallocEnabled = 0; name = MaxMSP; sourceDirectories = ( ); }; 1D4B05120E0AB98E00AF9550 /* MaxMSP.app */ = { isa = PBXFileReference; explicitFileType = wrapper.application; name = MaxMSP.app; path = "/Applications/MaxMSP 4.6/MaxMSP.app"; sourceTree = "<absolute>"; }; 1D4B05150E0AB9C800AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3B35E1950C05AD6D00567CE9 /* BpfEditor.cpp */; name = "BpfEditor.cpp: 1"; rLen = 0; rLoc = 0; rType = 0; vrLen = 1028; vrLoc = 1060; }; 1D4B05210E0AB9C900AF9550 /* XCBreakpointsBucket */ = { isa = XCBreakpointsBucket; name = "Project Breakpoints"; objects = ( ); }; 211ADFD20A7902A2007B20AA /* ftm.sqlite */ = { activeExec = 0; }; 2195DDFA09A24A63007DEFAF /* ftm.sdif.write */ = { activeExec = 0; }; 3B1982BD0A55805600B2841E /* ftm.client */ = { activeExec = 0; }; 3B1B81BB06D4A550009827F3 /* Project object */ = { activeBuildConfigurationName = Debug; activeExecutable = 1D4B05110E0AB98D00AF9550 /* MaxMSP */; activeTarget = 3BFEBB400AB172170026E8D4 /* all */; breakpointsGroup = 1D4B05210E0AB9C900AF9550 /* XCBreakpointsBucket */; codeSenseManager = 1D4B04920E0AAA2600AF9550 /* Code sense */; executables = ( 1D4B05110E0AB98D00AF9550 /* MaxMSP */, ); perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXExecutablesDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXExecutablesDataSource_NameID; PBXFileTableDataSourceColumnWidthsKey = ( 22, 300, 400, ); PBXFileTableDataSourceColumnsKey = ( PBXExecutablesDataSource_ActiveFlagID, PBXExecutablesDataSource_NameID, PBXExecutablesDataSource_CommentsID, ); }; PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, 684, 20, 48, 43, 43, 20, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, PBXFileDataSource_Filename_ColumnID, PBXFileDataSource_Built_ColumnID, PBXFileDataSource_ObjectSize_ColumnID, PBXFileDataSource_Errors_ColumnID, PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Target_ColumnID, ); }; PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, 200, 470, 20, 48, 43, 43, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, PBXFileDataSource_Filename_ColumnID, PBXTargetDataSource_PrimaryAttribute, PBXFileDataSource_Built_ColumnID, PBXFileDataSource_ObjectSize_ColumnID, PBXFileDataSource_Errors_ColumnID, PBXFileDataSource_Warnings_ColumnID, ); }; PBXPerProjectTemplateStateSaveDate = 235579905; PBXWorkspaceStateSaveDate = 235579905; }; perUserProjectItems = { 1D4B04B70E0AABC300AF9550 /* PBXTextBookmark */ = 1D4B04B70E0AABC300AF9550 /* PBXTextBookmark */; 1D4B04B80E0AABC300AF9550 /* PBXTextBookmark */ = 1D4B04B80E0AABC300AF9550 /* PBXTextBookmark */; 1D4B04C50E0AAC9200AF9550 /* PBXTextBookmark */ = 1D4B04C50E0AAC9200AF9550 /* PBXTextBookmark */; 1D4B05150E0AB9C800AF9550 /* PBXTextBookmark */ = 1D4B05150E0AB9C800AF9550 /* PBXTextBookmark */; }; sourceControlManager = 1D4B04910E0AAA2600AF9550 /* Source Control */; userBuildSettings = { }; }; 3B1B81D106D4A618009827F3 /* ftm.print */ = { activeExec = 0; }; 3B1B82DE06D4B2E5009827F3 /* ftm.vecdisplay */ = { activeExec = 0; }; 3B1B82FA06D4B5A3009827F3 /* basic */ = { activeExec = 0; }; 3B1B845506D4C5A0009827F3 /* ftm.object */ = { activeExec = 0; }; 3B1B84C506D4EE19009827F3 /* ftm.mess */ = { activeExec = 0; }; 3B1B84E906D4EFE1009827F3 /* ftm.copy */ = { activeExec = 0; }; 3B1B84F806D4F06A009827F3 /* ftm.clone */ = { activeExec = 0; }; 3B1B850706D4F0B0009827F3 /* ftm.value */ = { activeExec = 0; }; 3B1B853406D4F2D0009827F3 /* ftm.iter */ = { activeExec = 0; }; 3B1B855206D4F3A4009827F3 /* ftm.schedule */ = { activeExec = 0; }; 3B1B856106D4F506009827F3 /* ftm.play */ = { activeExec = 0; }; 3B1B857006D4F568009827F3 /* ftm.record */ = { activeExec = 0; }; 3B1B857F06D4F5C8009827F3 /* ftm.list */ = { activeExec = 0; }; 3B1B858E06D4F654009827F3 /* ftm.midiunparse */ = { activeExec = 0; }; 3B1B859D06D4F6AF009827F3 /* ftm.midiparse */ = { activeExec = 0; }; 3B1CA7CA0C467B12005F0280 /* ftm.editor */ = { activeExec = 0; }; 3B35E1950C05AD6D00567CE9 /* BpfEditor.cpp */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1106, 29680}}"; sepNavSelRange = "{0, 0}"; sepNavVisRect = "{{0, 460}, {882, 528}}"; }; }; 3B3E8C9E0AB81AB100EE3FAB /* ftm.guilistener */ = { activeExec = 0; }; 3BE056D30DE6E6440060DD66 /* ftm.editor DOC */ = { activeExec = 0; }; 3BE5012A0D059384006C9C44 /* ftm.inspector */ = { activeExec = 0; }; 3BFEBB400AB172170026E8D4 /* all */ = { activeExec = 0; }; 5C23142007A28B3D00CC6F2E /* ftm.buffer */ = { activeExec = 0; }; 5C3DB7A00AB078B000BE8005 /* ftmjs */ = { activeExec = 0; }; 5C5F084F0782214600A59DE2 /* ftm.inter */ = { activeExec = 0; }; 5C5F086F078222B700A59DE2 /* ftm.tween */ = { activeExec = 0; }; 5C864E510C9BD8300016C432 /* ftm.disthread */ = { activeExec = 0; }; 5C8BFCCE083DD9670077C8A2 /* ftm.o */ = { activeExec = 0; }; 5CA8B03C0D3AC133009FC9D9 /* ftm.m */ = { activeExec = 0; }; 5CCF9CE50AAB84E900DD7255 /* ftm.javascript */ = { activeExec = 0; }; 5CEF80BA0AB157E500AE1943 /* additional */ = { activeExec = 0; }; 5CEF80CD0AB1590700AE1943 /* ftm.jitter */ = { activeExec = 0; }; 5CFCB87C0AA5A86800DAB9A5 /* ftm.absargs */ = { activeExec = 0; }; F4781FEE0838E92400D47E77 /* ftm.sdif.info */ = { activeExec = 0; }; F47D6AE708A36663001D9636 /* install */ = { activeExec = 0; }; } |
From: Jean-Philippe L. <jp_...@us...> - 2008-06-19 16:03:44
|
Update of /cvsroot/ftm/ftm/build/max/osx-macho/ftmlib.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv2920/build/max/osx-macho/ftmlib.xcodeproj Added Files: lambert.mode1 lambert.pbxuser Log Message: added my own (lambert) projects preferences --- NEW FILE: lambert.mode1 --- <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> <key>ActivePerspectiveName</key> <string>Project</string> <key>AllowedModules</key> <array> <dict> <key>BundleLoadPath</key> <string></string> <key>MaxInstances</key> <string>n</string> <key>Module</key> <string>PBXSmartGroupTreeModule</string> <key>Name</key> <string>Groups and Files Outline View</string> </dict> <dict> [...1317 lines suppressed...] <key>StatusbarIsVisible</key> <integer>0</integer> <key>TableOfContents</key> <array> <string>1C0AD2AF069F1E9B00FABCE6</string> <string>1C0AD2B0069F1E9B00FABCE6</string> <string>1CA6456E063B45B4001379D8</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.classbrowser</string> <key>WindowString</key> <string>385 179 630 352 0 0 1440 878 </string> <key>WindowToolGUID</key> <string>1C0AD2AF069F1E9B00FABCE6</string> <key>WindowToolIsVisible</key> <integer>0</integer> </dict> </array> </dict> </plist> --- NEW FILE: lambert.pbxuser --- // !$*UTF8*$! { 0867D690FE84028FC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; activeExecutable = 1D4B05130E0AB9A500AF9550 /* MaxMSP */; activeTarget = 8D07F2BC0486CC7A007CD1D0 /* ftmlib */; addToTargets = ( 8D07F2BC0486CC7A007CD1D0 /* ftmlib */, ); codeSenseManager = 1D90FCEA0E0A732E00E1AFEC /* Code sense */; executables = ( 1D4B05130E0AB9A500AF9550 /* MaxMSP */, ); perUserDictionary = { PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, 493, 20, 48, 43, 43, 20, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, PBXFileDataSource_Filename_ColumnID, PBXFileDataSource_Built_ColumnID, PBXFileDataSource_ObjectSize_ColumnID, PBXFileDataSource_Errors_ColumnID, PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Target_ColumnID, ); }; PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = { PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; PBXFileTableDataSourceColumnWidthsKey = ( 20, 200, 313, 20, 48, 43, 43, ); PBXFileTableDataSourceColumnsKey = ( PBXFileDataSource_FiletypeID, PBXFileDataSource_Filename_ColumnID, PBXTargetDataSource_PrimaryAttribute, PBXFileDataSource_Built_ColumnID, PBXFileDataSource_ObjectSize_ColumnID, PBXFileDataSource_Errors_ColumnID, PBXFileDataSource_Warnings_ColumnID, ); }; PBXPerProjectTemplateStateSaveDate = 235575000; PBXWorkspaceStateSaveDate = 235575000; }; perUserProjectItems = { 1D4B02A50E0A972D00AF9550 /* PBXTextBookmark */ = 1D4B02A50E0A972D00AF9550 /* PBXTextBookmark */; 1D4B02A60E0A972D00AF9550 /* PBXTextBookmark */ = 1D4B02A60E0A972D00AF9550 /* PBXTextBookmark */; 1D4B02AB0E0A973D00AF9550 /* PBXTextBookmark */ = 1D4B02AB0E0A973D00AF9550 /* PBXTextBookmark */; 1D4B02AD0E0A99BB00AF9550 /* PBXTextBookmark */ = 1D4B02AD0E0A99BB00AF9550 /* PBXTextBookmark */; 1D4B02C10E0A9A5300AF9550 /* PBXTextBookmark */ = 1D4B02C10E0A9A5300AF9550 /* PBXTextBookmark */; 1D4B02C20E0A9A5700AF9550 /* PBXTextBookmark */ = 1D4B02C20E0A9A5700AF9550 /* PBXTextBookmark */; 1D4B02C50E0AA30E00AF9550 /* PBXTextBookmark */ = 1D4B02C50E0AA30E00AF9550 /* PBXTextBookmark */; 1D4B02C60E0AA31600AF9550 /* PBXTextBookmark */ = 1D4B02C60E0AA31600AF9550 /* PBXTextBookmark */; 1D4B02D60E0AA51100AF9550 /* PBXTextBookmark */ = 1D4B02D60E0AA51100AF9550 /* PBXTextBookmark */; 1D4B02D80E0AA52E00AF9550 /* PBXTextBookmark */ = 1D4B02D80E0AA52E00AF9550 /* PBXTextBookmark */; 1D4B02D90E0AA55F00AF9550 /* PBXTextBookmark */ = 1D4B02D90E0AA55F00AF9550 /* PBXTextBookmark */; 1D4B02DA0E0AA59300AF9550 /* PBXTextBookmark */ = 1D4B02DA0E0AA59300AF9550 /* PBXTextBookmark */; 1D4B02DC0E0AA5F400AF9550 /* PBXTextBookmark */ = 1D4B02DC0E0AA5F400AF9550 /* PBXTextBookmark */; 1D4B02DD0E0AA60400AF9550 /* PBXTextBookmark */ = 1D4B02DD0E0AA60400AF9550 /* PBXTextBookmark */; 1D4B02DF0E0AA62700AF9550 /* PBXTextBookmark */ = 1D4B02DF0E0AA62700AF9550 /* PBXTextBookmark */; 1D4B02E30E0AA65700AF9550 /* PBXTextBookmark */ = 1D4B02E30E0AA65700AF9550 /* PBXTextBookmark */; 1D90FD000E0A965600E1AFEC = 1D90FD000E0A965600E1AFEC /* PBXTextBookmark */; 1D90FD010E0A965600E1AFEC = 1D90FD010E0A965600E1AFEC /* PBXBookmark */; 1D90FD020E0A965600E1AFEC = 1D90FD020E0A965600E1AFEC /* PBXTextBookmark */; }; sourceControlManager = 1D90FCE90E0A732E00E1AFEC /* Source Control */; userBuildSettings = { }; }; 1D4B02A50E0A972D00AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; comments = "error: sndfile.h: No such file or directory"; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; rLen = 1; rLoc = 22; rType = 1; }; 1D4B02A60E0A972D00AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B02AB0E0A973D00AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1058; vrLoc = 0; }; 1D4B02AD0E0A99BB00AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B02C10E0A9A5300AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B02C20E0A9A5700AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1058; vrLoc = 0; }; 1D4B02C50E0AA30E00AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B02C60E0AA31600AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1058; vrLoc = 0; }; 1D4B02D60E0AA51100AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B02D80E0AA52E00AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B02D90E0AA55F00AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1058; vrLoc = 0; }; 1D4B02DA0E0AA59300AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1058; vrLoc = 0; }; 1D4B02DC0E0AA5F400AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B02DD0E0AA60400AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1058; vrLoc = 0; }; 1D4B02DF0E0AA62700AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1058; vrLoc = 0; }; 1D4B02E30E0AA65700AF9550 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1285; vrLoc = 0; }; 1D4B05130E0AB9A500AF9550 /* MaxMSP */ = { isa = PBXExecutable; activeArgIndex = 2147483647; activeArgIndices = ( ); argumentStrings = ( ); autoAttachOnCrash = 1; configStateDict = { }; customDataFormattersEnabled = 1; debuggerPlugin = GDBDebugging; disassemblyDisplayState = 0; dylibVariantSuffix = ""; enableDebugStr = 1; environmentEntries = ( ); executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; launchableReference = 1D4B05140E0AB9A500AF9550 /* MaxMSP.app */; libgmallocEnabled = 0; name = MaxMSP; sourceDirectories = ( ); }; 1D4B05140E0AB9A500AF9550 /* MaxMSP.app */ = { isa = PBXFileReference; explicitFileType = wrapper.application; name = MaxMSP.app; path = "/Applications/MaxMSP 4.6/MaxMSP.app"; sourceTree = "<absolute>"; }; 1D90FCE90E0A732E00E1AFEC /* Source Control */ = { isa = PBXSourceControlManager; fallbackIsa = XCSourceControlManager; isSCMEnabled = 0; scmConfiguration = { }; scmType = ""; }; 1D90FCEA0E0A732E00E1AFEC /* Code sense */ = { isa = PBXCodeSenseManager; indexTemplatePath = ""; }; 1D90FD000E0A965600E1AFEC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1481; vrLoc = 11; }; 1D90FD010E0A965600E1AFEC /* PBXBookmark */ = { isa = PBXBookmark; fRef = 5CB4C03E0B8D0BC60069B542 /* sndfile.h */; }; 1D90FD020E0A965600E1AFEC /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3BFA295E0B81D64F0056EC15 /* audiofile.h */; name = "#include <sndfile.h>"; rLen = 21; rLoc = 908; rType = 0; vrLen = 1481; vrLoc = 11; }; 3BFA295E0B81D64F0056EC15 /* audiofile.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {896, 1582}}"; sepNavSelRange = "{908, 21}"; sepNavVisRect = "{{0, 0}, {691, 381}}"; }; }; 5C0B80BF082E1D0500E7F7D3 /* maxclient.c */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {905, 4256}}"; sepNavSelRange = "{8638, 16}"; sepNavVisRect = "{{0, 3761}, {905, 495}}"; }; }; 5C209E120D0EDF8200BF135F /* libftm */ = { activeExec = 0; }; 5C7009230B836A3F001663C7 /* libftmlight */ = { activeExec = 0; }; 5CA214530DA59AEB00FA6B15 /* doc */ = { activeExec = 0; }; 5CB4C03E0B8D0BC60069B542 /* sndfile.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {691, 7770}}"; sepNavSelRange = "{0, 0}"; sepNavVisRect = "{{0, 0}, {691, 555}}"; }; }; 8D07F2BC0486CC7A007CD1D0 /* ftmlib */ = { activeExec = 0; }; } |
From: Riccardo B. <bor...@us...> - 2008-06-19 15:05:55
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9368/ftmlib/classes Modified Files: mat.c Log Message: mat: added markers gui interface to mat class Index: mat.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/mat.c,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** mat.c 19 Jun 2008 14:00:11 -0000 1.35 --- mat.c 19 Jun 2008 15:05:29 -0000 1.36 *************** *** 29,32 **** --- 29,34 ---- fts_class_t *mat_class = NULL; + static imtr_guiInterfaceMarkers *mat_gui_interface_markers = NULL; + static void mat_changed(mat_t *mat) *************** *** 1530,1533 **** --- 1532,1663 ---- + /************************************************************ + * + * Markers Gui Interface + * + */ + static int + mat_gui_markers_is_vector(void) + { + return 1; + } + + static int + mat_gui_markers_get_size(void *obj) + { + return mat_get_m((mat_t *)obj); + } + + static double + mat_gui_markers_get_duration(void *obj) + { + int m = mat_get_m((mat_t *)obj); + int n = mat_get_n((mat_t *)obj); + if(m > 0 && n > 2) + { + fts_atom_t *val = mat_get_element( (mat_t *)obj, m-1, 0); + if(fts_is_number(val)) return fts_get_number_float(val); + } + return -1.0; + } + static void * + mat_gui_markers_get_by_index(void *obj, int index, double *time, int *cue, char **label) + { + int m = mat_get_m((mat_t *)obj); + int n = mat_get_n((mat_t *)obj); + + *time = -1.0; + *cue = -1; + *label = 0; + if((m > 0 && n > 2) && (index > 0 && index < m)) + { + fts_atom_t *val; + /* time */ + val = mat_get_element( (mat_t *)obj, index, 0); + if(fts_is_number(val)) *time = fts_get_number_float(val); + /* cue */ + val = mat_get_element( (mat_t *)obj, index, 1); + if(fts_is_number(val)) *cue = fts_get_number_int(val); + /* label */ + val = mat_get_element( (mat_t *)obj, index, 2); + if(fts_is_symbol(val)) *label = fts_symbol_name(fts_get_symbol(val)); + } + return NULL; + } + + static void * + mat_gui_markers_add(void *obj, double time) + { + /*event_t *evt = NULL; + fts_atom_t a; + + fts_object_t *marker = fts_object_create(marker_class, 0, NULL); + + fts_set_object(&a, marker); + evt = (event_t *)fts_object_create(event_class, 1, &a); + sequence_add_event((sequence_t *)obj, time, evt); + return (void *)evt;*/ + } + static void + mat_gui_markers_move(void *obj, void *evt, int index, double time) + { + //sequence_move_event((sequence_t *)obj, (event_t *)evt, time); + } + static void + mat_gui_markers_remove(void *obj, void *marker, int index) + { + mat_delete_rows((mat_t *)obj, index, 1); + } + static void + mat_gui_markers_set_label(void *obj, void *marker, int index, char *label) + { + int m = mat_get_m((mat_t *)obj); + int n = mat_get_n((mat_t *)obj); + + if(m > 0 && n > 2 && index > 0 && index < m) + { + fts_atom_t k; + fts_set_symbol(&k, fts_new_symbol(label)); + mat_set_element((mat_t *)obj, index, 2, &k); + } + } + + static void + mat_gui_markers_set_cue(void *obj, void *marker, int index, int cue) + { + int m = mat_get_m((mat_t *)obj); + int n = mat_get_n((mat_t *)obj); + + if(m > 0 && n > 2 && index > 0 && index < m) + { + fts_atom_t k; + fts_set_int(&k, cue); + mat_set_element((mat_t *)obj, index, 1, &k); + } + } + + static double + mat_gui_markers_get_time(void *obj, void *marker) + { + return -1.0; + } + + static void * + mat_gui_markers_get_first(void *obj, double *time, int *cue, char **label) + { + *time = -1.0; + *cue = -1; + *label = 0; + return NULL; + } + static void * + mat_gui_markers_get_next(void *obj, void *marker, double *time, int *cue, char **label) + { + *time = -1.0; + *cue = -1; + *label = 0; + return NULL; + } + /******************************************************************** * *************** *** 1682,1685 **** --- 1812,1832 ---- fts_class_message_varargs(cl, fts_s_closeEditor, mat_close_editor, NULL); fts_class_message_varargs(cl, fts_s_destroyEditor, mat_destroy_editor, NULL); + + mat_gui_interface_markers = (imtr_guiInterfaceMarkers *)fts_malloc(sizeof(imtr_guiInterfaceMarkers)); + ((imtr_guiInterface *)mat_gui_interface_markers)->name = fts_symbol_name(fts_s_markers); + mat_gui_interface_markers->isVector = mat_gui_markers_is_vector; + mat_gui_interface_markers->getSize = mat_gui_markers_get_size; + mat_gui_interface_markers->getDuration = mat_gui_markers_get_duration; + mat_gui_interface_markers->getFirst = mat_gui_markers_get_first; + mat_gui_interface_markers->getByIndex = mat_gui_markers_get_by_index; + mat_gui_interface_markers->getNext = mat_gui_markers_get_next; + mat_gui_interface_markers->add = mat_gui_markers_add; + mat_gui_interface_markers->move = mat_gui_markers_move; + mat_gui_interface_markers->remove = mat_gui_markers_remove; + mat_gui_interface_markers->setLabel = mat_gui_markers_set_label; + mat_gui_interface_markers->setCue = mat_gui_markers_set_cue; + mat_gui_interface_markers->getTime = mat_gui_markers_get_time; + + fts_class_gui_interface(cl, fts_s_markers, mat_gui_interface_markers); } |
From: Riccardo B. <bor...@us...> - 2008-06-19 15:05:53
|
Update of /cvsroot/ftm/ftm/gui/Juce/common In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9368/gui/Juce/common Modified Files: MarkersEditor.cpp Log Message: mat: added markers gui interface to mat class Index: MarkersEditor.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/MarkersEditor.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MarkersEditor.cpp 19 Jun 2008 10:59:17 -0000 1.4 --- MarkersEditor.cpp 19 Jun 2008 15:05:29 -0000 1.5 *************** *** 170,181 **** { markersGui->getByIndex(obj, i, &next_time, &next_cue, &next_label); ! if(i_time >= startTime) { first = i; break; } ! i_time = next_time; ! i_cue = next_cue; ! i_label = next_label; } if(first > 0) --- 170,184 ---- { markersGui->getByIndex(obj, i, &next_time, &next_cue, &next_label); ! if(next_time >= startTime) { first = i; break; } ! else ! { ! i_time = next_time; ! i_cue = next_cue; ! i_label = next_label; ! } } if(first > 0) *************** *** 473,477 **** void *evt = NULL; void *evt_after = NULL; ! double start_time, end_time, evt_time, evt_after_time; int cue; char *evt_label; --- 476,480 ---- void *evt = NULL; void *evt_after = NULL; ! double start_time, end_time, evt_time; int cue; char *evt_label; *************** *** 637,641 **** int first_idx = getFirstVisibleIndex(&evt_time, &cue, &evt_label); int last_idx = getLastVisibleIndex(&last_time); ! g.setColour(forecolor); if(!container->isVertical()) --- 640,644 ---- int first_idx = getFirstVisibleIndex(&evt_time, &cue, &evt_label); int last_idx = getLastVisibleIndex(&last_time); ! g.setColour(forecolor); if(!container->isVertical()) |
From: Riccardo B. <bor...@us...> - 2008-06-19 15:05:53
|
Update of /cvsroot/ftm/ftm/externals/max In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv9368/externals/max Modified Files: ftm.editor.cpp Log Message: mat: added markers gui interface to mat class Index: ftm.editor.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/externals/max/ftm.editor.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** ftm.editor.cpp 3 Jun 2008 14:34:21 -0000 1.61 --- ftm.editor.cpp 19 Jun 2008 15:05:29 -0000 1.62 *************** *** 1219,1222 **** --- 1219,1226 ---- } } + else if(cl == mat_class) + { + gui_interface = (imtr_guiInterface *)fts_object_get_gui_interface(obj, fts_s_markers); + } return gui_interface; } |
From: Norbert S. <nsc...@us...> - 2008-06-19 14:29:23
|
Update of /cvsroot/ftm/ftm/externals/max In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25547/externals/max Modified Files: ftm.vecdisplay.c Log Message: adjustments to the fmat multi-thread API Index: ftm.vecdisplay.c =================================================================== RCS file: /cvsroot/ftm/ftm/externals/max/ftm.vecdisplay.c,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** ftm.vecdisplay.c 19 Jun 2008 00:12:13 -0000 1.60 --- ftm.vecdisplay.c 19 Jun 2008 14:29:28 -0000 1.61 *************** *** 1738,1744 **** else { ! float *store_ptr = fmat_lock_reshape(store, in_m, 2); int i, j; for(i=0, j=0; i<2*in_m; i+=2, j+=in_n) { --- 1738,1746 ---- else { ! float *store_ptr = fmat_lock_grow(store, in_m * 2); int i, j; + fmat_reshape_nogrow(store, in_m, 2); + for(i=0, j=0; i<2*in_m; i+=2, j+=in_n) { |
From: Norbert S. <nsc...@us...> - 2008-06-19 14:29:21
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25547/ftmlib/classes Modified Files: fmat.c fmat.h Log Message: adjustments to the fmat multi-thread API Index: fmat.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/fmat.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** fmat.h 19 Jun 2008 00:20:19 -0000 1.25 --- fmat.h 19 Jun 2008 14:29:28 -0000 1.26 *************** *** 38,44 **** /** ! * @brief The fmat class identifier (pointer to class instance). ! * @ingroup fts_data_fmat ! */ FTS_API fts_class_t *fmat_class; FTS_API fts_symbol_t fmat_symbol; --- 38,44 ---- /** ! * @brief The fmat class identifier (pointer to class instance). ! * @ingroup fts_data_fmat ! */ FTS_API fts_class_t *fmat_class; FTS_API fts_symbol_t fmat_symbol; *************** *** 73,86 **** /** * @brief - * Get a pointer to the raw float data vector of an fmat. - * - * @param fmat the fmat - * @return pointer to raw float data vector - * @ingroup fts_data_fmat - */ - float *fmat_get_ptr(fmat_t *fmat); - - /** - * @brief * Get a thread-safe shared pointer to the raw float data vector of an fmat. * --- 73,76 ---- *************** *** 126,130 **** #else - #define fmat_get_ptr(m) ((m)->values) #define fmat_get_m(x) ((x)->m) #define fmat_get_n(x) ((x)->n) --- 116,119 ---- *************** *** 135,142 **** #endif - void fmat_set_editor_open(fmat_t *fmat); - void fmat_set_editor_close(fmat_t *fmat); - #define fmat_editor_is_open(m) ((m)->opened == 1) - /** * @brief --- 124,127 ---- *************** *** 150,153 **** --- 135,140 ---- FTS_API fmat_t *fmat_create(int m, int n); + FTS_API float *fmat_lock_grow(fmat_t *self, int capacity); + /** * @brief *************** *** 158,171 **** * @param m number of rows * @param n number of columns ! * @return pointer to values * @ingroup fts_data_fmat */ ! FTS_API float *fmat_reshape(fmat_t *self, int m, int n); ! FTS_API float *fmat_lock_reshape(fmat_t *self, int m, int n); ! FTS_API void fmat_rearrange_columns(fmat_t *self, int old_m, int old_n); ! FTS_API void fmat_rearrange_insert_rows(fmat_t *self, int pos, int num); ! FTS_API void fmat_rearrange_insert_columns(fmat_t *self, int pos, int num); ! FTS_API void fmat_rearrange_delete_rows(fmat_t *self, int pos, int num); ! FTS_API void fmat_rearrange_delete_columns(fmat_t *self, int pos, int num); /** --- 145,152 ---- * @param m number of rows * @param n number of columns ! * @return actual number of rows obtained * @ingroup fts_data_fmat */ ! FTS_API int fmat_reshape_nogrow(fmat_t *self, int m, int n); /** *************** *** 179,187 **** * @param m number of rows * @param n number of columns * @ingroup fts_data_fmat * * If you want to resize the memory block without moving data, use fmat_reshape. */ ! FTS_API void fmat_set_size(fmat_t *fmat, int m, int n); /** --- 160,169 ---- * @param m number of rows * @param n number of columns + * @return actual number of rows obtained * @ingroup fts_data_fmat * * If you want to resize the memory block without moving data, use fmat_reshape. */ ! FTS_API int fmat_set_size_nogrow(fmat_t *self, int m, int n); /** *************** *** 191,197 **** * @param fmat the fmat * @param m new number of rows * @ingroup fts_data_fmat */ ! FTS_API void fmat_set_m(fmat_t *fmat, int m); /** --- 173,180 ---- * @param fmat the fmat * @param m new number of rows + * @return actual number of rows obtained * @ingroup fts_data_fmat */ ! FTS_API int fmat_set_m_nogrow(fmat_t *self, int m); /** *************** *** 201,207 **** * @param fmat the fmat * @param n new number of columns * @ingroup fts_data_fmat */ ! FTS_API void fmat_set_n(fmat_t *fmat, int n); /** --- 184,191 ---- * @param fmat the fmat * @param n new number of columns + * @return actual number of columns obtained * @ingroup fts_data_fmat */ ! FTS_API int fmat_set_n_nogrow(fmat_t *self, int n); /** *************** *** 212,218 **** * @param pos index where insert new cols * @param numcols number of columns to insert * @ingroup fts_data_fmat */ ! FTS_API void fmat_insert_columns(fmat_t *fmat, int pos, int numcols); /** --- 196,203 ---- * @param pos index where insert new cols * @param numcols number of columns to insert + * @return actual number of rows inserted * @ingroup fts_data_fmat */ ! FTS_API int fmat_insert_rows_nogrow(fmat_t *self, int pos, int num); /** *************** *** 223,251 **** * @param pos index where insert new rows * @param numrows number of rows to insert * @ingroup fts_data_fmat */ ! FTS_API void fmat_insert_rows(fmat_t *fmat, int pos, int numrows); /** ! * @brief ! * Delete given numner of columns from given index. ! * ! * @param fmat the fmat ! * @param start_idx start index ! * @param numcols number of columns to delete ! * @ingroup fts_data_fmat ! */ ! FTS_API void fmat_delete_columns(fmat_t *fmat, int start_idx, int numcols); /** ! * @brief ! * Delete given number of rows from given index. ! * ! * @param fmat the fmat ! * @param start_idx start index ! * @param numrows number of rows to delete ! * @ingroup fts_data_fmat ! */ ! FTS_API void fmat_delete_rows(fmat_t *fmat, int start_idx, int numrows); #ifdef DOXYGEN_DOC --- 208,248 ---- * @param pos index where insert new rows * @param numrows number of rows to insert + * @return actual number of columns inserted * @ingroup fts_data_fmat */ ! FTS_API int fmat_insert_columns_nogrow(fmat_t *self, int pos, int num); /** ! * @brief ! * Delete given number of rows from given index. ! * ! * @param fmat the fmat ! * @param start_idx start index ! * @param numrows number of rows to delete ! * @return actual number of rows deleted ! * @ingroup fts_data_fmat ! */ ! FTS_API int fmat_delete_rows(fmat_t *fmat, int start_idx, int numrows); /** ! * @brief ! * Delete given numner of columns from given index. ! * ! * @param fmat the fmat ! * @param start_idx start index ! * @param numcols number of columns to delete ! * @return actual number of columns deleted ! * @ingroup fts_data_fmat ! */ ! FTS_API int fmat_delete_columns(fmat_t *fmat, int start_idx, int numcols); ! ! /* deprecated functions */ ! #define fmat_get_ptr(m) ((m)->values) ! FTS_API float *fmat_reshape(fmat_t *self, int m, int n); ! FTS_API void fmat_set_size(fmat_t *fmat, int m, int n); ! FTS_API void fmat_set_m(fmat_t *fmat, int m); ! FTS_API void fmat_set_n(fmat_t *fmat, int n); ! FTS_API void fmat_insert_columns(fmat_t *fmat, int pos, int numcols); ! FTS_API void fmat_insert_rows(fmat_t *fmat, int pos, int numrows); #ifdef DOXYGEN_DOC *************** *** 335,351 **** * @code ! float *ptr ! int size; ! int stride; ! ! if(fmat_or_fvec_vector(obj, &ptr, &size, &stride) != 0) ! { ! int i; ! ! for(i=0, j=0; i<size; i++, j+=stride) ! { ! out[i] = ptr[j]; ! } ! } * @endcode --- 332,348 ---- * @code ! float *ptr ! int size; ! int stride; ! ! if(fmat_or_fvec_vector(obj, &ptr, &size, &stride) != 0) ! { ! int i; ! ! for(i=0, j=0; i<size; i++, j+=stride) ! { ! out[i] = ptr[j]; ! } ! } * @endcode *************** *** 420,424 **** */ FTS_API void fmat_copy_locked(fmat_t *orig, fmat_t *copy); ! FTS_API void fmat_copy_noresize(fmat_t *orig, fmat_t *copy); /* deprecated */ --- 417,421 ---- */ FTS_API void fmat_copy_locked(fmat_t *orig, fmat_t *copy); ! FTS_API void fmat_copy_nogrow(fmat_t *orig, fmat_t *copy); /* deprecated */ *************** *** 498,501 **** --- 495,502 ---- FTS_API void fstride_fill_ramp(float *ptr, int size, int stride, double lo, double hi, int range); + void fmat_set_editor_open(fmat_t *fmat); + void fmat_set_editor_close(fmat_t *fmat); + #define fmat_editor_is_open(m) ((m)->opened == 1) + /** * @brief Index: fmat.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/fmat.c,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** fmat.c 19 Jun 2008 00:19:50 -0000 1.76 --- fmat.c 19 Jun 2008 14:29:28 -0000 1.77 *************** *** 95,99 **** /* value allocation or reallocation wrapper */ static float * ! fm_realloc(fmat_t *self, size_t size, int locked) { float *values = self->values; --- 95,99 ---- /* value allocation or reallocation wrapper */ static float * ! fm_realloc(fmat_t *self, size_t size, int lock) { [...4352 lines suppressed...] ! sym_text = fts_new_symbol("text"); sym_vec = fts_new_symbol("vec"); *************** *** 5391,5397 **** sym_mag = fts_new_symbol("mag"); sym_arg = fts_new_symbol("arg"); ! fmat_class = fts_class_install(fmat_symbol, fmat_instantiate); ! fmat_null = NULL; } --- 5513,5519 ---- sym_mag = fts_new_symbol("mag"); sym_arg = fts_new_symbol("arg"); ! fmat_class = fts_class_install(fmat_symbol, fmat_instantiate); ! fmat_null = NULL; } |
From: Diemo S. <di...@us...> - 2008-06-19 14:00:06
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12690 Modified Files: mat.c Log Message: must init elements in creation: ma_init replaces ma_reshape Index: mat.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/mat.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mat.c 19 Jun 2008 00:17:45 -0000 1.34 --- mat.c 19 Jun 2008 14:00:11 -0000 1.35 *************** *** 55,65 **** ! static void ma_reshape(mat_t *self, int m, int n) { int size = m * n; ! if (size > self->alloc) ma_realloc(self, size); self->m = m; self->n = n; --- 55,69 ---- ! static void ma_init (mat_t *self, int m, int n) { int size = m * n; ! int i; ! if (size > self->alloc) ma_realloc(self, size); + for (i = 0; i < size; i++) + fts_set_int(self->data + i, 0); + self->m = m; self->n = n; *************** *** 1545,1553 **** if (ac == 0) ! ma_reshape(self, 0, 0); else if (ac == 1 && fts_is_int(at)) ! ma_reshape(self, fts_get_int(at), 1); else if (ac == 2 && fts_is_int(at) && fts_is_int(at + 1)) ! ma_reshape(self, fts_get_int(at), fts_get_int(at + 1)); else if(ac > 2 && fts_is_int(at) && fts_is_int(at + 1)) /* init from atom list */ { --- 1549,1557 ---- if (ac == 0) ! ma_init(self, 0, 0); else if (ac == 1 && fts_is_int(at)) ! ma_init(self, fts_get_int(at), 1); else if (ac == 2 && fts_is_int(at) && fts_is_int(at + 1)) ! ma_init(self, fts_get_int(at), fts_get_int(at + 1)); else if(ac > 2 && fts_is_int(at) && fts_is_int(at + 1)) /* init from atom list */ { *************** *** 1556,1560 **** int size = m * n; int i = 0; ! ma_reshape(self, m, n); mat_set_with_onset_from_atoms( self, 0, ac-2, at+2); --- 1560,1565 ---- int size = m * n; int i = 0; ! ! ma_init(self, m, n); mat_set_with_onset_from_atoms( self, 0, ac-2, at+2); *************** *** 1586,1590 **** } ! ma_reshape(self, m, n); mat_set_from_tuples(self, ac, at); } --- 1591,1595 ---- } ! ma_init(self, m, n); mat_set_from_tuples(self, ac, at); } |
From: Riccardo B. <bor...@us...> - 2008-06-19 11:18:31
|
Update of /cvsroot/ftm/ftm/gui/Juce/cpp_gui In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27125/gui/Juce/cpp_gui Modified Files: guiinterfaces.h Log Message: Index: guiinterfaces.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/cpp_gui/guiinterfaces.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** guiinterfaces.h 19 Jun 2008 10:59:18 -0000 1.4 --- guiinterfaces.h 19 Jun 2008 11:18:06 -0000 1.5 *************** *** 103,121 **** imtr_guiInterfaceMarkers(){setName("markers");} virtual ~imtr_guiInterfaceMarkers() {} virtual int isVector() = 0; virtual int getSize(void *obj) = 0; virtual double getDuration(void *obj) = 0; virtual void *getByIndex(void *obj, int the_index, double *time, int *cue, char **label) = 0; - virtual void *add(void *obj, double the_time) = 0; virtual void *move(void *obj, void *marker, int index, double the_time) = 0; virtual void remove(void *obj, void *marker, int index) = 0; ! virtual void *getFirst(void *obj, double *time, int *cue, char **label) = 0; virtual void *getNext(void *obj, void *marker, double *time, int *cue, char **label) = 0; ! virtual double getTime(void *obj, void *marker) = 0; ! ! virtual void setLabel(void *obj, void *marker, char *label) = 0; ! virtual void setCue(void *obj, void *marker, int cue) = 0; }; --- 103,122 ---- imtr_guiInterfaceMarkers(){setName("markers");} virtual ~imtr_guiInterfaceMarkers() {} + + /* used in both cases: if isVector() == 1, you will use the index, else you will use the marker object */ virtual int isVector() = 0; virtual int getSize(void *obj) = 0; virtual double getDuration(void *obj) = 0; virtual void *getByIndex(void *obj, int the_index, double *time, int *cue, char **label) = 0; virtual void *add(void *obj, double the_time) = 0; virtual void *move(void *obj, void *marker, int index, double the_time) = 0; virtual void remove(void *obj, void *marker, int index) = 0; ! virtual void setLabel(void *obj, void *marker, int index, char *label) = 0; ! virtual void setCue(void *obj, void *marker, int index, int cue) = 0; ! ! /* used only if isVector() == 0 */ virtual void *getFirst(void *obj, double *time, int *cue, char **label) = 0; virtual void *getNext(void *obj, void *marker, double *time, int *cue, char **label) = 0; ! virtual double getTime(void *obj, void *marker) = 0; }; |
From: Riccardo B. <bor...@us...> - 2008-06-19 11:18:30
|
Update of /cvsroot/ftm/ftm/gui/Juce/common In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27125/gui/Juce/common Modified Files: MarkersTableView.cpp Log Message: Index: MarkersTableView.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/MarkersTableView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarkersTableView.cpp 19 Jun 2008 10:22:15 -0000 1.3 --- MarkersTableView.cpp 19 Jun 2008 11:18:05 -0000 1.4 *************** *** 237,243 **** JUCE_EDITOR_NAMESPACE::String text = label->getText(); JUCE_EDITOR_NAMESPACE::String oldText = JUCE_EDITOR_NAMESPACE::String::empty; ! void *evt = getEventPropertyAsText(row, column, &oldText); ! if(evt != NULL) { if(oldText != text) --- 237,243 ---- JUCE_EDITOR_NAMESPACE::String text = label->getText(); JUCE_EDITOR_NAMESPACE::String oldText = JUCE_EDITOR_NAMESPACE::String::empty; ! void *evt = getEventPropertyAsText(row, column, &oldText); ! if(owner.markersGui->isVector() || (!owner.markersGui->isVector() && evt != NULL)) { if(oldText != text) *************** *** 248,255 **** { case 1: ! owner.markersGui->move(owner.obj, evt, -1, text.getFloatValue()); break; case 2: ! owner.markersGui->setCue(owner.obj, evt, text.getIntValue()); break; case 3: --- 248,255 ---- { case 1: ! owner.markersGui->move(owner.obj, evt, row, text.getFloatValue()); break; case 2: ! owner.markersGui->setCue(owner.obj, evt, row, text.getIntValue()); break; case 3: *************** *** 259,263 **** buff[len] = '\0'; buff[len+1] = '\0'; ! owner.markersGui->setLabel(owner.obj, evt, buff); break; } --- 259,263 ---- buff[len] = '\0'; buff[len+1] = '\0'; ! owner.markersGui->setLabel(owner.obj, evt, row, buff); break; } |
From: Riccardo B. <bor...@us...> - 2008-06-19 11:18:29
|
Update of /cvsroot/ftm/ftm/gui/Juce/c_gui In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27125/gui/Juce/c_gui Modified Files: guiinterfaces.h Log Message: Index: guiinterfaces.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/c_gui/guiinterfaces.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** guiinterfaces.h 19 Jun 2008 10:59:16 -0000 1.4 --- guiinterfaces.h 19 Jun 2008 11:18:04 -0000 1.5 *************** *** 433,437 **** * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_set_label_t)(void *obj, void *marker, char *label); /** * @brief sets the cue to given marker --- 433,437 ---- * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_set_label_t)(void *obj, void *marker, int index, char *label); /** * @brief sets the cue to given marker *************** *** 441,445 **** * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_set_cue_t)(void *obj, void *marker, int cue); /** --- 441,445 ---- * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_set_cue_t)(void *obj, void *marker, int index, int cue); /** |
From: Riccardo B. <bor...@us...> - 2008-06-19 11:18:28
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27125/ftmlib/classes Modified Files: sequence.c Log Message: Index: sequence.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/sequence.c,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** sequence.c 19 Jun 2008 10:59:07 -0000 1.57 --- sequence.c 19 Jun 2008 11:18:04 -0000 1.58 *************** *** 2510,2514 **** } static void ! sequence_gui_markers_set_label(void *obj, void *marker, char *label) { fts_atom_t k; --- 2510,2514 ---- } static void ! sequence_gui_markers_set_label(void *obj, void *marker, int index, char *label) { fts_atom_t k; *************** *** 2518,2522 **** static void ! sequence_gui_markers_set_cue(void *obj, void *marker, int cue) { fts_atom_t k; --- 2518,2522 ---- static void ! sequence_gui_markers_set_cue(void *obj, void *marker, int index, int cue) { fts_atom_t k; |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:59:45
|
Update of /cvsroot/ftm/ftm/gui/Juce/cpp_gui In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15040/gui/Juce/cpp_gui Modified Files: guiinterfaces.h Log Message: ftm.editor: changing markers interface Index: guiinterfaces.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/cpp_gui/guiinterfaces.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** guiinterfaces.h 19 Jun 2008 10:22:15 -0000 1.3 --- guiinterfaces.h 19 Jun 2008 10:59:18 -0000 1.4 *************** *** 114,118 **** virtual void *getFirst(void *obj, double *time, int *cue, char **label) = 0; virtual void *getNext(void *obj, void *marker, double *time, int *cue, char **label) = 0; - virtual void getSegment(void *obj, double start_time, double end_time, void **evt, void **evt_after, double *evt_time, double *evt_after_time) = 0; virtual double getTime(void *obj, void *marker) = 0; --- 114,117 ---- |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:59:44
|
Update of /cvsroot/ftm/ftm/gui/Juce/common In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15040/gui/Juce/common Modified Files: MarkersEditor.cpp Log Message: ftm.editor: changing markers interface Index: MarkersEditor.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/MarkersEditor.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MarkersEditor.cpp 19 Jun 2008 10:22:15 -0000 1.3 --- MarkersEditor.cpp 19 Jun 2008 10:59:17 -0000 1.4 *************** *** 487,492 **** } - markersGui->getSegment(obj, start_time, end_time, &evt, &evt_after, &evt_time, &evt_after_time); while (evt != NULL && evt != evt_after) { --- 487,494 ---- } + evt = getFirstVisibleEvent(&evt_time, &cue, &evt_label); + evt_after = getNextAfterLastVisibleEvent(); + while (evt != NULL && evt != evt_after) { *************** *** 495,498 **** --- 497,509 ---- evt = markersGui->getNext(obj, evt, &evt_time, &cue, &evt_label); } + + /*markersGui->getSegment(obj, start_time, end_time, &evt, &evt_after, &evt_time, &evt_after_time); + + while (evt != NULL && evt != evt_after) + { + if(evt_time >= start_time && evt_time <= end_time) + markersSelect(evt); + evt = markersGui->getNext(obj, evt, &evt_time, &cue, &evt_label); + }*/ } } |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:59:42
|
Update of /cvsroot/ftm/ftm/gui/Juce/c_gui In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15040/gui/Juce/c_gui Modified Files: guiinterfaces.h Log Message: ftm.editor: changing markers interface Index: guiinterfaces.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/c_gui/guiinterfaces.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** guiinterfaces.h 19 Jun 2008 10:22:15 -0000 1.3 --- guiinterfaces.h 19 Jun 2008 10:59:16 -0000 1.4 *************** *** 410,425 **** typedef void (*imtr_gui_interface_markers_remove_t)(void *obj, void *marker, int index); /** - * @brief returns a segment by begin/end time - * @param obj the markers track object - * @param start_time begin time of segment - * @param end_time end time of segment - * @param evt first marker ins segment (void*) - * @param evt_after first marker after the segment (void *) - * @param evt_time time of first marker in segment - * @param evt_after_time time of first marker after the segment - * @ingroup guiinterfaces - */ - typedef void (*imtr_gui_interface_markers_get_segment_t)(void *obj, double start_time, double end_time, void **evt, void **evt_after, double *evt_time, double *evt_after_time); - /** * @brief returns next marker of given marker * @param obj the markers track object --- 410,413 ---- *************** *** 471,475 **** imtr_gui_interface_markers_get_first_t getFirst; imtr_gui_interface_markers_get_next_t getNext; - imtr_gui_interface_markers_get_segment_t getSegment; imtr_gui_interface_markers_get_time_t getTime; --- 459,462 ---- |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:59:40
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15040/ftmlib/classes Modified Files: sequence.c Log Message: ftm.editor: changing markers interface Index: sequence.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/sequence.c,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** sequence.c 19 Jun 2008 10:22:14 -0000 1.56 --- sequence.c 19 Jun 2008 10:59:07 -0000 1.57 *************** *** 2509,2526 **** sequence_remove_event((sequence_t *)obj, (event_t *)marker); } - static void - sequence_gui_markers_get_segment(void *obj, double start_time, double end_time, void **evt, void **evt_after, double *evt_time, double *evt_after_time) - { - sequence_segment_get((sequence_t *)obj, start_time, end_time, (event_t **)evt, (event_t **)evt_after); - if(*evt != NULL) - *evt_time = event_get_time((event_t *)*evt); - else - *evt_time = -1.0; - if(*evt_after != NULL) - *evt_after_time = event_get_time((event_t *)*evt_after); - else - *evt_after_time = -1.0; - } - static void sequence_gui_markers_set_label(void *obj, void *marker, char *label) --- 2509,2512 ---- *************** *** 2647,2651 **** sequence_gui_interface_markers->move = sequence_gui_markers_move; sequence_gui_interface_markers->remove = sequence_gui_markers_remove; - sequence_gui_interface_markers->getSegment = sequence_gui_markers_get_segment; sequence_gui_interface_markers->setLabel = sequence_gui_markers_set_label; sequence_gui_interface_markers->setCue = sequence_gui_markers_set_cue; --- 2633,2636 ---- |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:22:37
|
Update of /cvsroot/ftm/ftm/build/max/osx-macho/ftmexternals.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27438/build/max/osx-macho/ftmexternals.xcodeproj Modified Files: project.pbxproj Log Message: - fixed ftmexternals Xcode project - fixed typo "safelogasf" (coucou Diemo!) - extension of markers editor in progress Index: project.pbxproj =================================================================== RCS file: /cvsroot/ftm/ftm/build/max/osx-macho/ftmexternals.xcodeproj/project.pbxproj,v retrieving revision 1.102 retrieving revision 1.103 diff -C2 -d -r1.102 -r1.103 *** project.pbxproj 19 Jun 2008 09:58:23 -0000 1.102 --- project.pbxproj 19 Jun 2008 10:22:11 -0000 1.103 *************** *** 428,432 **** containerPortal = 3B1B81BB06D4A550009827F3 /* Project object */; proxyType = 1; ! remoteGlobalIDString = 3B1CA7CA0C467B12005F0280 /* ftm.editor */; remoteInfo = ftm.editor; }; --- 428,432 ---- containerPortal = 3B1B81BB06D4A550009827F3 /* Project object */; proxyType = 1; ! remoteGlobalIDString = 3B1CA7CA0C467B12005F0280; remoteInfo = ftm.editor; }; *************** *** 3467,3470 **** --- 3467,3471 ---- ); OTHER_LDFLAGS = ( + "${inherited}", "-framework", Carbon, *************** *** 3491,3494 **** --- 3492,3496 ---- ); OTHER_LDFLAGS = ( + "${inherited}", "-framework", Carbon, *************** *** 3844,3847 **** --- 3846,3850 ---- ); INFOPLIST_FILE = ftmexternal.plist; + OTHER_LDFLAGS = "-lmx"; REZ_EXECUTABLE = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; *************** *** 3891,3894 **** --- 3894,3898 ---- ); INFOPLIST_FILE = ftmexternal.plist; + OTHER_LDFLAGS = "-lmx"; REZ_EXECUTABLE = NO; SECTORDER_FLAGS = ""; |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:22:10
|
Update of /cvsroot/ftm/ftm/gui/Juce/common In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27438/gui/Juce/common Modified Files: MarkersEditor.cpp MarkersTableView.cpp Log Message: - fixed ftmexternals Xcode project - fixed typo "safelogasf" (coucou Diemo!) - extension of markers editor in progress Index: MarkersEditor.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/MarkersEditor.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarkersEditor.cpp 18 Jun 2008 14:58:29 -0000 1.2 --- MarkersEditor.cpp 19 Jun 2008 10:22:15 -0000 1.3 *************** *** 61,64 **** --- 61,65 ---- int view_mode; JUCE_EDITOR_NAMESPACE::Array <void *> selection; + JUCE_EDITOR_NAMESPACE::Array <int> indexSelection; /*---selection-----*/ bool selecting, movingSelection, regionSelection; *************** *** 155,158 **** --- 156,198 ---- } + int getFirstVisibleIndex(double *time, int *cue, char **lbl) + { + double i_time, next_time; + int i_cue, next_cue; + char *i_label; + char *next_label; + + int size = markersGui->getSize(obj); + float startTime = (container->isVertical()) ? editorGetInvY(0) : editorGetInvX(0); + int i; + int first = 0; + for(i = 0; i < size-1; i++) + { + markersGui->getByIndex(obj, i, &next_time, &next_cue, &next_label); + if(i_time >= startTime) + { + first = i; + break; + } + i_time = next_time; + i_cue = next_cue; + i_label = next_label; + } + if(first > 0) + { + first--; + *time = i_time; + *cue = i_cue; + *lbl = i_label; + } + else + { + *time = next_time; + *cue = next_cue; + *lbl = next_label; + } + return first; + } + void *getNextAfterLastVisibleEvent() { *************** *** 173,176 **** --- 213,251 ---- } + + int getLastVisibleIndex(double *time) + { + double i_time, next_time; + int i_cue, next_cue; + char *i_label; + char *next_label; + + int size = markersGui->getSize(obj); + float endTime = (container->isVertical()) ? editorGetInvY(getHeight()) : editorGetInvX(getWidth()); + int i; + int last = size-1; + for(i = 0; i<size-1; i++) + { + markersGui->getByIndex(obj, i, &next_time, &next_cue, &next_label); + if(next_time > endTime) + { + last = i; + break; + } + i_time = next_time; + i_cue = next_cue; + i_label = next_label; + } + if(last < size-1) + { + last++; + *time = next_time; + } + else + *time = i_time; + + return last; + } + void *markersGetEventAt(int pix) { *************** *** 208,211 **** --- 283,323 ---- } + int markersGetIndexAt(int pix) + { + double time, t_delta, evt_time, next_time; + int cue; + char *evt_label; + + int size = markersGui->getSize(obj); + + if(pix > 0) pix--; + if(!container->isVertical()) + { + time = editorGetInvX(pix); + t_delta = editorGetInvX(2)-editorGetInvX(0); + } + else + { + time = editorGetInvY(pix); + t_delta = editorGetInvY(2)-editorGetInvY(0); + } + + int i; + for(i = 0; i < size; i++) + { + markersGui->getByIndex(obj, i, &next_time, &cue, &evt_label); + if(next_time > time) break; + evt_time = next_time; + } + + if(next_time < time + t_delta) + return i; + else + if(evt_time <= time + t_delta && evt_time >= time - t_delta) + return i-1; + else + -1; + } + /********************** selection *************** *** 216,234 **** selection.add(evt); } void markersDeselect(void *evt) { selection.removeValue(evt); } bool markersIsSelected(void *evt) { return selection.contains(evt); } bool markersIsSelectionEmpty() { ! return (selection.size() == 0); } void markersDeselectAll() { ! selection.clear(); } void markersSetMovingSelection(bool move) --- 328,365 ---- selection.add(evt); } + void markerIndexSelect(int i) + { + if(!indexSelection.contains(i)) + indexSelection.add(i); + } void markersDeselect(void *evt) { selection.removeValue(evt); } + void markerIndexDeselect(int i) + { + indexSelection.removeValue(i); + } bool markersIsSelected(void *evt) { return selection.contains(evt); } + bool markerIndexIsSelected(int i) + { + return indexSelection.contains(i); + } bool markersIsSelectionEmpty() { ! if(markersGui->isVector()) ! return (indexSelection.size() == 0); ! else ! return (selection.size() == 0); } void markersDeselectAll() { ! if(markersGui->isVector()) ! indexSelection.clear(); ! else ! selection.clear(); } void markersSetMovingSelection(bool move) *************** *** 239,259 **** void markersMoveSelection(int dpix) { ! float pix; ! int i; ! if(!container->isVertical()) { ! for(i = 0; i< selection.size(); i++) { ! pix = editorGetX(markersGui->getTime(obj, selection[i])) + dpix; ! markersGui->move(obj, selection[i], editorGetInvX(pix)); } } else { ! for(i = 0; i< selection.size(); i++) { ! pix = editorGetY(markersGui->getTime(obj, selection[i])) + dpix; ! markersGui->move(obj, selection[i], editorGetInvY(pix)); } } --- 370,421 ---- void markersMoveSelection(int dpix) { ! double time; ! int cue; ! char *label; ! if(markersGui->isVector()) { ! float pix; ! int i; ! ! if(!container->isVertical()) { ! for(i = 0; i< indexSelection.size(); i++) ! { ! markersGui->getByIndex(obj, indexSelection[i], &time, &cue, &label); ! pix = editorGetX(time) + dpix; ! markersGui->move(obj, NULL, indexSelection[i], editorGetInvX(pix)); ! } } + else + { + for(i = 0; i< indexSelection.size(); i++) + { + markersGui->getByIndex(obj, indexSelection[i], &time, &cue, &label); + pix = editorGetY(time) + dpix; + markersGui->move(obj, NULL, indexSelection[i], editorGetInvY(pix)); + } + } } else { ! float pix; ! int i; ! ! if(!container->isVertical()) { ! for(i = 0; i< selection.size(); i++) ! { ! pix = editorGetX(markersGui->getTime(obj, selection[i])) + dpix; ! markersGui->move(obj, selection[i], -1, editorGetInvX(pix)); ! } ! } ! else ! { ! for(i = 0; i< selection.size(); i++) ! { ! pix = editorGetY(markersGui->getTime(obj, selection[i])) + dpix; ! markersGui->move(obj, selection[i], -1, editorGetInvY(pix)); ! } } } *************** *** 262,297 **** void markersDeleteSelection() { ! int i; ! for(i = 0; i< selection.size(); i++) ! markersGui->remove(obj, selection[i]); ! selection.clear(); ! repaint(); } void markersSelectInRect(JUCE_EDITOR_NAMESPACE::Rectangle r) { ! void *evt = NULL; ! void *evt_after = NULL; ! double start_time, end_time, evt_time, evt_after_time; ! int cue; ! char *evt_label; ! if(!container->isVertical()) ! { ! start_time = editorGetInvX(r.getX()); ! end_time = editorGetInvX( r.getX() + r.getWidth()); } else ! { ! start_time = editorGetInvY(r.getY()); ! end_time = editorGetInvY( r.getY() + r.getHeight()); ! } ! ! markersGui->getSegment(obj, start_time, end_time, &evt, &evt_after, &evt_time, &evt_after_time); ! ! while (evt != NULL && evt != evt_after) ! { ! if(evt_time >= start_time && evt_time <= end_time) ! markersSelect(evt); ! evt = markersGui->getNext(obj, evt, &evt_time, &cue, &evt_label); } } --- 424,498 ---- void markersDeleteSelection() { ! if(markersGui->isVector()) ! { ! int i; ! for(i = 0; i< indexSelection.size(); i++) ! markersGui->remove(obj, NULL, indexSelection[i]); ! indexSelection.clear(); ! repaint(); ! } ! else ! { ! int i; ! for(i = 0; i< selection.size(); i++) ! markersGui->remove(obj, selection[i], -1); ! selection.clear(); ! repaint(); ! } } void markersSelectInRect(JUCE_EDITOR_NAMESPACE::Rectangle r) { ! if(markersGui->isVector()) ! { ! double start_time, end_time, evt_time; ! int cue; ! char *evt_label; ! int i; ! ! if(!container->isVertical()) ! { ! start_time = editorGetInvX(r.getX()); ! end_time = editorGetInvX( r.getX() + r.getWidth()); ! } ! else ! { ! start_time = editorGetInvY(r.getY()); ! end_time = editorGetInvY( r.getY() + r.getHeight()); ! } ! ! for(i = 0; i < markersGui->getSize(obj); i++) ! { ! markersGui->getByIndex(obj, i, &evt_time, &cue, &evt_label); ! if(evt_time >= start_time && evt_time <= end_time) ! markerIndexSelect(i); ! } } else ! { ! void *evt = NULL; ! void *evt_after = NULL; ! double start_time, end_time, evt_time, evt_after_time; ! int cue; ! char *evt_label; ! if(!container->isVertical()) ! { ! start_time = editorGetInvX(r.getX()); ! end_time = editorGetInvX( r.getX() + r.getWidth()); ! } ! else ! { ! start_time = editorGetInvY(r.getY()); ! end_time = editorGetInvY( r.getY() + r.getHeight()); ! } ! ! markersGui->getSegment(obj, start_time, end_time, &evt, &evt_after, &evt_time, &evt_after_time); ! ! while (evt != NULL && evt != evt_after) ! { ! if(evt_time >= start_time && evt_time <= end_time) ! markersSelect(evt); ! evt = markersGui->getNext(obj, evt, &evt_time, &cue, &evt_label); ! } } } *************** *** 418,422 **** --- 619,733 ---- void drawMarkersAsVector(JUCE_EDITOR_NAMESPACE::Graphics& g) { + double evt_time, last_time; + int cue; + char *evt_label; + int size = markersGui->getSize(obj); + int first_idx = getFirstVisibleIndex(&evt_time, &cue, &evt_label); + int last_idx = getLastVisibleIndex(&last_time); + + g.setColour(forecolor); + if(!container->isVertical()) + { + int i, x; + int height = getHeight(); + for(i = first_idx; i < size && i<=last_idx; i++) + { + x = editorGetX(evt_time); + g.drawLine(x, 0, x, height); + if(markerIndexIsSelected(i)) + { + g.setColour(selectColor); + g.fillRoundedRectangle(x-1, 0, 3, height, 2); + g.setColour(forecolor); + } + + /* draw event properties */ + JUCE_EDITOR_NAMESPACE::String text; + int ytext = 1; + int wtext = 0; + + if(cue >= 0) + { + text = JUCE_EDITOR_NAMESPACE::String(cue); + int text_width = markerFont->getStringWidth(text)+2; + g.setFont(*markerFont); + g.drawText(text, x+2, ytext, text_width, (int)(markerFont->getHeight()), JUCE_EDITOR_NAMESPACE::Justification::centredLeft, true); + ytext+=(int)(markerFont->getHeight()); + wtext = text_width; + } + + if(evt_label != 0) + { + text = JUCE_EDITOR_NAMESPACE::String(evt_label); + int text_width = markerFont->getStringWidth(text)+2; + + g.setFont(*markerFont); + g.drawText(text, x+2, ytext, markerFont->getStringWidth(text)+2, (int)(markerFont->getHeight()), JUCE_EDITOR_NAMESPACE::Justification::centredLeft, true); + if(text_width > wtext) wtext = text_width; + ytext+=(int)(markerFont->getHeight()); + } + if(wtext > 0 && markerIndexIsSelected(i))//draw rect around props + { + g.setColour(labelColor); + g.fillRect(x+1, 1, wtext+2, ytext-1); + g.setColour(forecolor); + } + markersGui->getByIndex(obj, i, &evt_time, &cue, &evt_label); + } + } + else + { + int i, y; + int width = getWidth(); + for(i = first_idx; i < size && i<=last_idx; i++) + { + y = editorGetY(evt_time); + g.drawLine(0, y, width, y); + + if(markerIndexIsSelected(i)) + { + g.setColour(selectColor); + g.fillRoundedRectangle(0, y-1, width, 3, 2); + g.setColour(forecolor); + } + + /* draw event properties */ + JUCE_EDITOR_NAMESPACE::String text; + int fontH = (int)(markerFont->getHeight()); + int xtext = getWidth()-fontH-1; + int htext = 0; + + if(cue >= 0) + { + text = JUCE_EDITOR_NAMESPACE::String(cue); + int text_width = markerFont->getStringWidth(text)+2; + g.setFont(*markerFont); + g.drawTextAsPath(text, JUCE_EDITOR_NAMESPACE::AffineTransform::rotation(float_Pi/2).followedBy(JUCE_EDITOR_NAMESPACE::AffineTransform::translation(xtext, y+1))); + xtext-=(int)(markerFont->getHeight()); + htext = text_width; + } + + if(evt_label != 0) + { + text = JUCE_EDITOR_NAMESPACE::String(evt_label); + int text_width = markerFont->getStringWidth(text)+2; + + g.setFont(*markerFont); + g.drawTextAsPath(text, JUCE_EDITOR_NAMESPACE::AffineTransform::rotation(float_Pi/2).followedBy(JUCE_EDITOR_NAMESPACE::AffineTransform::translation(xtext, y+1))); + + if(text_width > htext) htext = text_width; + xtext-=(int)(markerFont->getHeight()); + } + if(htext > 0 && markerIndexIsSelected(i))//draw rect around props + { + g.setColour(labelColor); + g.fillRect(xtext+fontH, y+1, fontH*2+2, htext+2); + g.setColour(forecolor); + } + + markersGui->getByIndex(obj, i, &evt_time, &cue, &evt_label); + } + } } *************** *** 471,493 **** void markersDrawSelection(JUCE_EDITOR_NAMESPACE::Graphics& g) { ! int i; ! if(!container->isVertical()) { ! int x; ! int height = getHeight(); ! for(i = 0; i< selection.size(); i++) { ! x = editorGetX( markersGui->getTime(obj, selection[i])) + moving_dx; ! g.fillRoundedRectangle(x-1, 0, 3, height, 2); } } else { ! int y; ! int width = getWidth(); ! for(i = 0; i< selection.size(); i++) { ! y = editorGetY( markersGui->getTime(obj, selection[i])) + moving_dy; ! g.fillRoundedRectangle(0, y-1, width, 3, 2); } } --- 782,838 ---- void markersDrawSelection(JUCE_EDITOR_NAMESPACE::Graphics& g) { ! if(markersGui->isVector()) { ! int i; ! double time; ! int cue; ! char *label; ! ! if(!container->isVertical()) { ! int x; ! int height = getHeight(); ! ! for(i = 0; i< selection.size(); i++) ! { ! markersGui->getByIndex(obj, indexSelection[i], &time, &cue, &label); ! x = editorGetX(time) + moving_dx; ! g.fillRoundedRectangle(x-1, 0, 3, height, 2); ! } ! } ! else ! { ! int y; ! int width = getWidth(); ! for(i = 0; i< selection.size(); i++) ! { ! markersGui->getByIndex(obj, indexSelection[i], &time, &cue, &label); ! y = editorGetY(time) + moving_dy; ! g.fillRoundedRectangle(0, y-1, width, 3, 2); ! } } } else { ! int i; ! if(!container->isVertical()) { ! int x; ! int height = getHeight(); ! for(i = 0; i< selection.size(); i++) ! { ! x = editorGetX( markersGui->getTime(obj, selection[i])) + moving_dx; ! g.fillRoundedRectangle(x-1, 0, 3, height, 2); ! } ! } ! else ! { ! int y; ! int width = getWidth(); ! for(i = 0; i< selection.size(); i++) ! { ! y = editorGetY( markersGui->getTime(obj, selection[i])) + moving_dy; ! g.fillRoundedRectangle(0, y-1, width, 3, 2); ! } } } *************** *** 674,706 **** void startDragging(int x, int y, int w, int h, bool isShiftDown) { ! void *evt = markersGetEventAt((container->isVertical()) ? y : x); ! if(evt != 0) { ! if(isShiftDown) { ! if(markersIsSelected(evt)) ! markersDeselect(evt); ! else { ! markersSelect(evt); ! movingSelection = true; } } else { ! if( !markersIsSelected(evt)) markersDeselectAll(); - markersSelect(evt); ! markersSetMovingSelection(true); ! } } else { ! if(!isShiftDown) ! markersDeselectAll(); ! selecting = true; ! setSelectionRect(x, y, w, h); } objectRefresh(); --- 1019,1087 ---- void startDragging(int x, int y, int w, int h, bool isShiftDown) { ! if(markersGui->isVector()) { ! int index = markersGetIndexAt((container->isVertical()) ? y : x); ! if(index >= 0) { ! if(isShiftDown) { ! if(markerIndexIsSelected(index)) ! markerIndexDeselect(index); ! else ! { ! markerIndexSelect(index); ! movingSelection = true; ! } } + else + { + if( !markerIndexIsSelected(index)) + markersDeselectAll(); + markerIndexSelect(index); + + markersSetMovingSelection(true); + } } else { ! if(!isShiftDown) markersDeselectAll(); ! selecting = true; ! setSelectionRect(x, y, w, h); ! } } else { ! void *evt = markersGetEventAt((container->isVertical()) ? y : x); ! if(evt != 0) ! { ! if(isShiftDown) ! { ! if(markersIsSelected(evt)) ! markersDeselect(evt); ! else ! { ! markersSelect(evt); ! movingSelection = true; ! } ! } ! else ! { ! if( !markersIsSelected(evt)) ! markersDeselectAll(); ! markersSelect(evt); ! ! markersSetMovingSelection(true); ! } ! } ! else ! { ! if(!isShiftDown) ! markersDeselectAll(); ! selecting = true; ! setSelectionRect(x, y, w, h); ! } } objectRefresh(); Index: MarkersTableView.cpp =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/common/MarkersTableView.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MarkersTableView.cpp 18 Jun 2008 14:58:29 -0000 1.2 --- MarkersTableView.cpp 19 Jun 2008 10:22:15 -0000 1.3 *************** *** 248,252 **** { case 1: ! owner.markersGui->move(owner.obj, evt, text.getFloatValue()); break; case 2: --- 248,252 ---- { case 1: ! owner.markersGui->move(owner.obj, evt, -1, text.getFloatValue()); break; case 2: |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:22:09
|
Update of /cvsroot/ftm/ftm/gui/Juce/cpp_gui In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27438/gui/Juce/cpp_gui Modified Files: guiinterfaces.h Log Message: - fixed ftmexternals Xcode project - fixed typo "safelogasf" (coucou Diemo!) - extension of markers editor in progress Index: guiinterfaces.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/cpp_gui/guiinterfaces.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** guiinterfaces.h 18 Jun 2008 14:58:29 -0000 1.2 --- guiinterfaces.h 19 Jun 2008 10:22:15 -0000 1.3 *************** *** 109,114 **** virtual void *add(void *obj, double the_time) = 0; ! virtual void *move(void *obj, void *marker, double the_time) = 0; ! virtual void remove(void *obj, void *marker) = 0; virtual void *getFirst(void *obj, double *time, int *cue, char **label) = 0; --- 109,114 ---- virtual void *add(void *obj, double the_time) = 0; ! virtual void *move(void *obj, void *marker, int index, double the_time) = 0; ! virtual void remove(void *obj, void *marker, int index) = 0; virtual void *getFirst(void *obj, double *time, int *cue, char **label) = 0; |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:22:09
|
Update of /cvsroot/ftm/ftm/gui/Juce/c_gui In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27438/gui/Juce/c_gui Modified Files: guiinterfaces.h Log Message: - fixed ftmexternals Xcode project - fixed typo "safelogasf" (coucou Diemo!) - extension of markers editor in progress Index: guiinterfaces.h =================================================================== RCS file: /cvsroot/ftm/ftm/gui/Juce/c_gui/guiinterfaces.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** guiinterfaces.h 18 Jun 2008 14:58:29 -0000 1.2 --- guiinterfaces.h 19 Jun 2008 10:22:15 -0000 1.3 *************** *** 396,410 **** * @param obj the markers track object * @param marker the marker * @param the_time time * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_move_t)(void *obj, void *marker, double the_time); /** * @brief remove a marker * @param obj the markers track object * @param marker the marker to be removed * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_remove_t)(void *obj, void *marker); /** * @brief returns a segment by begin/end time --- 396,412 ---- * @param obj the markers track object * @param marker the marker + * @param index the index of the marker * @param the_time time * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_move_t)(void *obj, void *marker, int index, double the_time); /** * @brief remove a marker * @param obj the markers track object * @param marker the marker to be removed + * @param index the index of the marker to be removed * @ingroup guiinterfaces */ ! typedef void (*imtr_gui_interface_markers_remove_t)(void *obj, void *marker, int index); /** * @brief returns a segment by begin/end time *************** *** 464,475 **** imtr_gui_interface_markers_get_size_t getSize; imtr_gui_interface_markers_get_duration_t getDuration; - imtr_gui_interface_markers_get_first_t getFirst; - imtr_gui_interface_markers_get_by_index_t getByIndex; - imtr_gui_interface_markers_add_t add; imtr_gui_interface_markers_move_t move; imtr_gui_interface_markers_remove_t remove; ! imtr_gui_interface_markers_get_segment_t getSegment; imtr_gui_interface_markers_get_next_t getNext; imtr_gui_interface_markers_get_time_t getTime; imtr_gui_interface_markers_set_label_t setLabel; imtr_gui_interface_markers_set_cue_t setCue; --- 466,480 ---- imtr_gui_interface_markers_get_size_t getSize; imtr_gui_interface_markers_get_duration_t getDuration; imtr_gui_interface_markers_move_t move; imtr_gui_interface_markers_remove_t remove; ! ! imtr_gui_interface_markers_get_first_t getFirst; imtr_gui_interface_markers_get_next_t getNext; + imtr_gui_interface_markers_get_segment_t getSegment; imtr_gui_interface_markers_get_time_t getTime; + + imtr_gui_interface_markers_get_by_index_t getByIndex; + imtr_gui_interface_markers_add_t add; + imtr_gui_interface_markers_set_label_t setLabel; imtr_gui_interface_markers_set_cue_t setCue; |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:22:09
|
Update of /cvsroot/ftm/ftm/ftmlib/classes In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27438/ftmlib/classes Modified Files: mathfuns.h sequence.c Log Message: - fixed ftmexternals Xcode project - fixed typo "safelogasf" (coucou Diemo!) - extension of markers editor in progress Index: sequence.c =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/sequence.c,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** sequence.c 18 Jun 2008 14:58:29 -0000 1.55 --- sequence.c 19 Jun 2008 10:22:14 -0000 1.56 *************** *** 2500,2509 **** } static void ! sequence_gui_markers_move(void *obj, void *evt, double time) { sequence_move_event((sequence_t *)obj, (event_t *)evt, time); } static void ! sequence_gui_markers_remove(void *obj, void *marker) { sequence_remove_event((sequence_t *)obj, (event_t *)marker); --- 2500,2509 ---- } static void ! sequence_gui_markers_move(void *obj, void *evt, int index, double time) { sequence_move_event((sequence_t *)obj, (event_t *)evt, time); } static void ! sequence_gui_markers_remove(void *obj, void *marker, int index) { sequence_remove_event((sequence_t *)obj, (event_t *)marker); Index: mathfuns.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/classes/mathfuns.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mathfuns.h 18 Jun 2008 15:31:00 -0000 1.2 --- mathfuns.h 19 Jun 2008 10:22:14 -0000 1.3 *************** *** 52,56 **** FUN(abs, fabsf, " - get absolute value") FUN(log, safelogf, "") ! FUN(logabs, safelogasf, " - logarithm of absolute value") FUN(log10, log10f, "") FUN(exp, expf, "") --- 52,56 ---- FUN(abs, fabsf, " - get absolute value") FUN(log, safelogf, "") ! FUN(logabs, safelogabsf, " - logarithm of absolute value") FUN(log10, log10f, "") FUN(exp, expf, "") |
From: Riccardo B. <bor...@us...> - 2008-06-19 10:22:08
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27438/ftmlib Modified Files: parser.h Log Message: - fixed ftmexternals Xcode project - fixed typo "safelogasf" (coucou Diemo!) - extension of markers editor in progress Index: parser.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/parser.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** parser.h 19 Jun 2008 00:20:50 -0000 1.30 --- parser.h 19 Jun 2008 10:22:13 -0000 1.31 *************** *** 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; --- 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; |
From: Riccardo B. <bor...@us...> - 2008-06-19 09:58:17
|
Update of /cvsroot/ftm/ftm/build/max/osx-macho/ftmexternals.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19223/ftmexternals.xcodeproj Modified Files: project.pbxproj Log Message: fixed link options in ftm.editor/ftm.sqlite projects Index: project.pbxproj =================================================================== RCS file: /cvsroot/ftm/ftm/build/max/osx-macho/ftmexternals.xcodeproj/project.pbxproj,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** project.pbxproj 19 Jun 2008 00:20:49 -0000 1.101 --- project.pbxproj 19 Jun 2008 09:58:23 -0000 1.102 *************** *** 17,20 **** --- 17,21 ---- 3B1B84D706D4EE9A009827F3 /* PBXTargetDependency */, 3B1B82FE06D4B5AF009827F3 /* PBXTargetDependency */, + 3BA3699B0E0A64100011055C /* PBXTargetDependency */, 5CCF9D310AAB85C200DD7255 /* PBXTargetDependency */, 5C23152D07A2BE3600CC6F2E /* PBXTargetDependency */, *************** *** 107,111 **** 3B145DBA0CBA86FF0013392A /* EditorContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B145DB80CBA86FE0013392A /* EditorContainer.cpp */; }; 3B145DBB0CBA86FF0013392A /* EditorContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3B145DB90CBA86FF0013392A /* EditorContainer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 3B18A2070D8A83920078C117 /* libjuce.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BDB04330D197490006AEB4A /* libjuce.a */; }; 3B1982C40A55805600B2841E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B1B822E06D4A70F009827F3 /* Carbon.framework */; }; 3B1982C50A55805600B2841E /* MaxAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B1B82C306D4A725009827F3 /* MaxAPI.framework */; }; --- 108,111 ---- *************** *** 184,187 **** --- 184,188 ---- 3B7073BE0713F12300764C51 /* ftm.list.c in Sources */ = {isa = PBXBuildFile; fileRef = 3B7073BD0713F04500764C51 /* ftm.list.c */; }; 3B9C563A0D5DF07000051CD5 /* TrackScoobEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3B9C56390D5DF07000051CD5 /* TrackScoobEditor.cpp */; }; + 3BA368CD0E0A60050011055C /* libjuce.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BDB04330D197490006AEB4A /* libjuce.a */; }; 3BCAC5EC0CBE5E7E00020156 /* FvecEditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3BCAC5EB0CBE5E7E00020156 /* FvecEditor.cpp */; }; 3BDB03F40D197463006AEB4A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BDB03F30D197463006AEB4A /* IOKit.framework */; }; *************** *** 423,426 **** --- 424,434 ---- remoteInfo = ftm.guilistener; }; + 3BA3699A0E0A64100011055C /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 3B1B81BB06D4A550009827F3 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 3B1CA7CA0C467B12005F0280 /* ftm.editor */; + remoteInfo = ftm.editor; + }; 3BFEBB410AB172240026E8D4 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; *************** *** 537,545 **** /* Begin PBXFileReference section */ 211ADFE20A7902A2007B20AA /* ftm.sqlite.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.sqlite.mxo; sourceTree = BUILT_PRODUCTS_DIR; }; ! 211ADFE60A79030D007B20AA /* ftm.sqlite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ftm.sqlite.h; path = ../../../externals/ftm.sqlite.h; sourceTree = SOURCE_ROOT; }; ! 211ADFE70A79030D007B20AA /* ftm.sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ftm.sqlite3.c; path = ../../../externals/ftm.sqlite3.c; sourceTree = SOURCE_ROOT; }; 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; }; ! 3B01D3080A790E2A00950F15 /* ftm.sqlite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ftm.sqlite.c; path = ../../../externals/ftm.sqlite.c; sourceTree = SOURCE_ROOT; }; 3B02948C0C1FEBD500E7AB82 /* EditorScrollBar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = EditorScrollBar.cpp; sourceTree = "<group>"; }; 3B03F9840CAA96E7001C491B /* libjucedebug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjucedebug.a; path = ../../../components/juce/bin/libjucedebug.a; sourceTree = "<group>"; }; --- 545,553 ---- /* Begin PBXFileReference section */ 211ADFE20A7902A2007B20AA /* ftm.sqlite.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ftm.sqlite.mxo; sourceTree = BUILT_PRODUCTS_DIR; }; ! 211ADFE60A79030D007B20AA /* ftm.sqlite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ftm.sqlite.h; sourceTree = "<group>"; }; ! 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; }; ! 3B01D3080A790E2A00950F15 /* ftm.sqlite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = ftm.sqlite.c; sourceTree = "<group>"; }; 3B02948C0C1FEBD500E7AB82 /* EditorScrollBar.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = EditorScrollBar.cpp; sourceTree = "<group>"; }; 3B03F9840CAA96E7001C491B /* libjucedebug.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjucedebug.a; path = ../../../components/juce/bin/libjucedebug.a; sourceTree = "<group>"; }; *************** *** 835,839 **** buildActionMask = 2147483647; files = ( ! 3B18A2070D8A83920078C117 /* libjuce.a in Frameworks */, 3B1CA8000C467C4C005F0280 /* CoreAudio.framework in Frameworks */, 3B1CA7FA0C467C39005F0280 /* AGL.framework in Frameworks */, --- 843,847 ---- buildActionMask = 2147483647; files = ( ! 3BA368CD0E0A60050011055C /* libjuce.a in Frameworks */, 3B1CA8000C467C4C005F0280 /* CoreAudio.framework in Frameworks */, 3B1CA7FA0C467C39005F0280 /* AGL.framework in Frameworks */, *************** *** 999,1013 **** /* Begin PBXGroup section */ - 211ADFEB0A79031C007B20AA /* ftm-sql */ = { - isa = PBXGroup; - children = ( - 3B01D3080A790E2A00950F15 /* ftm.sqlite.c */, - 211ADFE60A79030D007B20AA /* ftm.sqlite.h */, - 211ADFE70A79030D007B20AA /* ftm.sqlite3.c */, - ); - name = "ftm-sql"; - path = "../../../components/ftm-sql"; - sourceTree = SOURCE_ROOT; - }; 3B1B81B706D4A550009827F3 = { isa = PBXGroup; --- 1007,1010 ---- *************** *** 1083,1087 **** 2195DDA709A24A4A007DEFAF /* ftm.sdif.write.c */, 5CC7B89F0CB0404B006F02A5 /* ftm.disthread.c */, ! 211ADFEB0A79031C007B20AA /* ftm-sql */, ); name = externals; --- 1080,1086 ---- 2195DDA709A24A4A007DEFAF /* ftm.sdif.write.c */, 5CC7B89F0CB0404B006F02A5 /* ftm.disthread.c */, ! 3B01D3080A790E2A00950F15 /* ftm.sqlite.c */, ! 211ADFE60A79030D007B20AA /* ftm.sqlite.h */, ! 211ADFE70A79030D007B20AA /* ftm.sqlite3.c */, ); name = externals; *************** *** 3318,3321 **** --- 3317,3325 ---- targetProxy = 3B3C4C570ABAFC790045664B /* PBXContainerItemProxy */; }; + 3BA3699B0E0A64100011055C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 3B1CA7CA0C467B12005F0280 /* ftm.editor */; + targetProxy = 3BA3699A0E0A64100011055C /* PBXContainerItemProxy */; + }; 3BFEBB420AB172240026E8D4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; *************** *** 3394,3397 **** --- 3398,3402 ---- isa = XCBuildConfiguration; buildSettings = { + OTHER_LDFLAGS = "-lsqlite3"; PRODUCT_NAME = ftm.sqlite; }; *************** *** 3447,3450 **** --- 3452,3456 ---- isa = XCBuildConfiguration; buildSettings = { + GCC_INPUT_FILETYPE = sourcecode.cpp.cpp; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", *************** *** 3458,3462 **** LIBRARY_SEARCH_PATHS = ( "${inherited}", ! "${SRCROOT}/../../../components/juce/bin", ); PRODUCT_NAME = ftm.editor; --- 3464,3472 ---- LIBRARY_SEARCH_PATHS = ( "${inherited}", ! "${SRCROOT}/../../../components/juce/bin/UninstalledProducts", ! ); ! OTHER_LDFLAGS = ( ! "-framework", ! Carbon, ); PRODUCT_NAME = ftm.editor; *************** *** 3467,3470 **** --- 3477,3481 ---- isa = XCBuildConfiguration; buildSettings = { + GCC_INPUT_FILETYPE = sourcecode.cpp.cpp; GCC_PREPROCESSOR_DEFINITIONS = ( "C_GUI_INTERFACE=1", *************** *** 3477,3481 **** LIBRARY_SEARCH_PATHS = ( "${inherited}", ! "${SRCROOT}/../../../components/juce/bin", ); PRODUCT_NAME = ftm.editor; --- 3488,3496 ---- LIBRARY_SEARCH_PATHS = ( "${inherited}", ! "${SRCROOT}/../../../components/juce/bin/UninstalledProducts", ! ); ! OTHER_LDFLAGS = ( ! "-framework", ! Carbon, ); PRODUCT_NAME = ftm.editor; |
From: Norbert S. <nsc...@us...> - 2008-06-19 00:20:43
|
Update of /cvsroot/ftm/ftm/build/max/osx-macho/ftmlib.xcodeproj In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13200/build/max/osx-macho/ftmlib.xcodeproj Modified Files: project.pbxproj Log Message: Index: project.pbxproj =================================================================== RCS file: /cvsroot/ftm/ftm/build/max/osx-macho/ftmlib.xcodeproj/project.pbxproj,v retrieving revision 1.101 retrieving revision 1.102 diff -C2 -d -r1.101 -r1.102 *** project.pbxproj 18 Jun 2008 14:58:29 -0000 1.101 --- project.pbxproj 19 Jun 2008 00:20:49 -0000 1.102 *************** *** 1279,1284 **** GCC_ENABLE_TRIGRAPHS = NO; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", --- 1279,1282 ---- *************** *** 1355,1360 **** GCC_ENABLE_TRIGRAPHS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_PREPROCESSOR_DEFINITIONS = ( "FTM_VERSION_MAJOR=$(VERSION_MAJOR)", --- 1353,1356 ---- *************** *** 1423,1426 **** --- 1419,1424 ---- EXTERNALS_DIR = "../../../../build-macho"; GCC_OPTIMIZATION_LEVEL = 0; + 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; *************** *** 1441,1444 **** --- 1439,1444 ---- GCC_AUTO_VECTORIZATION = YES; GCC_OPTIMIZATION_LEVEL = 3; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_UNROLL_LOOPS = YES; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; *************** *** 1458,1463 **** GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_PREPROCESSOR_DEFINITIONS = ( "FTS_NODEPS=1", --- 1458,1461 ---- *************** *** 1488,1493 **** GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_PREPROCESSOR_DEFINITIONS = ( "FTS_NODEPS=1", --- 1486,1489 ---- *************** *** 1520,1525 **** GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_PREPROCESSOR_DEFINITIONS = ( "FTS_NODEPS=1", --- 1516,1519 ---- *************** *** 1550,1555 **** GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "/Library/Frameworks/MaxAPI.framework/Headers/macho-prefix.h"; GCC_PREPROCESSOR_DEFINITIONS = ( "FTS_NODEPS=1", --- 1544,1547 ---- |
From: Norbert S. <nsc...@us...> - 2008-06-19 00:20:43
|
Update of /cvsroot/ftm/ftm/ftmlib In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv13200/ftmlib Modified Files: parser.h Log Message: Index: parser.h =================================================================== RCS file: /cvsroot/ftm/ftm/ftmlib/parser.h,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** parser.h 12 Jun 2008 14:27:06 -0000 1.29 --- parser.h 19 Jun 2008 00:20:50 -0000 1.30 *************** *** 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; |