[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[sc-dev] SF.net SVN: supercollider:[9604] trunk
Revision: 9604
http://supercollider.svn.sourceforge.net/supercollider/?rev=9604&view=rev
Author: timblech
Date: 2009-12-15 15:18:56 +0000 (Tue, 15 Dec 2009)
Log Message:
-----------
fixes for osx (patch by Josh Parmenter)
Signed-off-by: Tim Blechmann <tim@xxxxxxxxxx>
Modified Paths:
--------------
trunk/Language.xcodeproj/project.pbxproj
trunk/Source/app/CocoaBridgePrimitives.M
trunk/Source/app/SCImage.M
trunk/Source/app/SCView.M
trunk/Synth.xcodeproj/project.pbxproj
Modified: trunk/Language.xcodeproj/project.pbxproj
===================================================================
--- trunk/Language.xcodeproj/project.pbxproj 2009-12-15 15:18:31 UTC (rev 9603)
+++ trunk/Language.xcodeproj/project.pbxproj 2009-12-15 15:18:56 UTC (rev 9604)
@@ -209,8 +209,6 @@
9493115D0C1921F90018AB50 /* TabletEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 949310BB0C1921F90018AB50 /* TabletEvents.m */; };
9493115E0C1921F90018AB50 /* TextFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = 949310BC0C1921F90018AB50 /* TextFinder.m */; };
9493115F0C1921F90018AB50 /* UserPanel.M in Sources */ = {isa = PBXBuildFile; fileRef = 949310BD0C1921F90018AB50 /* UserPanel.M */; };
- 949311610C1921F90018AB50 /* dtoa.c in Sources */ = {isa = PBXBuildFile; fileRef = 949310C00C1921F90018AB50 /* dtoa.c */; };
- 949311620C1921F90018AB50 /* g_fmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 949310C10C1921F90018AB50 /* g_fmt.c */; };
949311630C1921F90018AB50 /* SC_AllocPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949310C20C1921F90018AB50 /* SC_AllocPool.cpp */; };
949311640C1921F90018AB50 /* SC_DirUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949310C30C1921F90018AB50 /* SC_DirUtils.cpp */; };
949311650C1921F90018AB50 /* SC_Sem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949310C40C1921F90018AB50 /* SC_Sem.cpp */; };
@@ -264,8 +262,6 @@
949311A30C1921F90018AB50 /* VMGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949311100C1921F90018AB50 /* VMGlobals.cpp */; };
949313CC0C19234D0018AB50 /* IOBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 949313CB0C19234D0018AB50 /* IOBluetooth.framework */; };
9493143A0C1925B90018AB50 /* fftlib.c in Sources */ = {isa = PBXBuildFile; fileRef = 949314390C1925B90018AB50 /* fftlib.c */; };
- 949315020C192A6E0018AB50 /* dtoa.c in Sources */ = {isa = PBXBuildFile; fileRef = 949310C00C1921F90018AB50 /* dtoa.c */; };
- 949315030C192A6E0018AB50 /* g_fmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 949310C10C1921F90018AB50 /* g_fmt.c */; };
949315040C192A6E0018AB50 /* SC_AllocPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949310C20C1921F90018AB50 /* SC_AllocPool.cpp */; };
949315050C192A6E0018AB50 /* SC_DirUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949310C30C1921F90018AB50 /* SC_DirUtils.cpp */; };
949315060C192A6E0018AB50 /* SC_Sem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949310C40C1921F90018AB50 /* SC_Sem.cpp */; };
@@ -697,7 +693,7 @@
9493180C0C192C120018AB50 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MyDocument.nib; sourceTree = "<group>"; };
9493180E0C192C120018AB50 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/SCGraphView.nib; sourceTree = "<group>"; };
9493180F0C192C120018AB50 /* GoToLinePanel.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = GoToLinePanel.nib; sourceTree = "<group>"; };
- 949318100C192C120018AB50 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+ 949318100C192C120018AB50 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
949318110C192C120018AB50 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/FindPanel.nib; sourceTree = "<group>"; };
949318120C192C120018AB50 /* Japanese */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = Japanese; path = Japanese.lproj/FindPanel.strings; sourceTree = "<group>"; };
949318130C192C120018AB50 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = Japanese.lproj/GetStringDlg.nib; sourceTree = "<group>"; };
@@ -1590,8 +1586,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 949315020C192A6E0018AB50 /* dtoa.c in Sources */,
- 949315030C192A6E0018AB50 /* g_fmt.c in Sources */,
949315040C192A6E0018AB50 /* SC_AllocPool.cpp in Sources */,
3799DA840E3502D900AE51A3 /* SC_CoreAudioPrim.cpp in Sources */,
949315050C192A6E0018AB50 /* SC_DirUtils.cpp in Sources */,
@@ -1686,8 +1680,6 @@
9493115D0C1921F90018AB50 /* TabletEvents.m in Sources */,
9493115E0C1921F90018AB50 /* TextFinder.m in Sources */,
9493115F0C1921F90018AB50 /* UserPanel.M in Sources */,
- 949311610C1921F90018AB50 /* dtoa.c in Sources */,
- 949311620C1921F90018AB50 /* g_fmt.c in Sources */,
949311630C1921F90018AB50 /* SC_AllocPool.cpp in Sources */,
949311640C1921F90018AB50 /* SC_DirUtils.cpp in Sources */,
949311650C1921F90018AB50 /* SC_Sem.cpp in Sources */,
Modified: trunk/Source/app/CocoaBridgePrimitives.M
===================================================================
--- trunk/Source/app/CocoaBridgePrimitives.M 2009-12-15 15:18:31 UTC (rev 9603)
+++ trunk/Source/app/CocoaBridgePrimitives.M 2009-12-15 15:18:56 UTC (rev 9604)
@@ -1331,12 +1331,12 @@
}
time = QTMakeTime(
- (long long) (IsInt(slots+0) ? (slotRawInt(&slots[0]) : (IsFloat(slots+0) ? slotRawFloat(slots) : 0)),
- (long) (IsInt(slots+1) ? (slotRawInt(&slots[1]) : (IsFloat(slots+1) ? slotRawFloat(&slots[1]) : 0))
+ (long long)(IsInt(slots+0) ? slotRawInt(&slots[0]) : (IsFloat(slots+0) ? slotRawFloat(slots) : 0)),
+ (long)(IsInt(slots+1) ? slotRawInt(&slots[1]) : (IsFloat(slots+1) ? slotRawFloat(&slots[1]) : 0))
);
if( slotRawObject(slot)->size > 2 )
- time.flags = (long) (IsInt(slots+2) ? (slotRawInt(&slots[2]) : (IsFloat(slots+2) ? slotRawFloat(&slots[2]) : 0));
+ time.flags = (long) (IsInt(slots+2) ? slotRawInt(&slots[2]) : (IsFloat(slots+2) ? slotRawFloat(&slots[2]) : 0));
[anInvocation setArgument: (void*)&time atIndex: i+2];
}
@@ -1880,7 +1880,7 @@
id nsobj = (id)slotRawInt(slotRawObject(receiver)->slots);
if(nsobj) {
COCOABRIDGE_OBJ_RELEASE(nsobj);
- SetInt(&slotRawObject(receiver)->slots, nil);
+ SetInt(slotRawObject(receiver)->slots, nil);
}else
post("SCNSObject object pointer is nil\n");
Modified: trunk/Source/app/SCImage.M
===================================================================
--- trunk/Source/app/SCImage.M 2009-12-15 15:18:31 UTC (rev 9603)
+++ trunk/Source/app/SCImage.M 2009-12-15 15:18:56 UTC (rev 9604)
@@ -1238,7 +1238,7 @@
if (!g->canCallOS) return errCantCallOS;
PyrSlot *receiver = g->sp; // instance of SCImage
- SCImage *image = (SCImage *)slotRawPtr(slotRawObject(receiver)->slots[0]);
+ SCImage *image = (SCImage *)slotRawPtr(&slotRawObject(receiver)->slots[0]);
if(!image)
return errNone;
Modified: trunk/Source/app/SCView.M
===================================================================
--- trunk/Source/app/SCView.M 2009-12-15 15:18:31 UTC (rev 9603)
+++ trunk/Source/app/SCView.M 2009-12-15 15:18:56 UTC (rev 9604)
@@ -6734,7 +6734,7 @@
if (!IsSym(args+1)) return errWrongType;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(&args[0])->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(&args[0])->slots);
if (!view) return errFailed;
int err = view->setProperty(slotRawSymbol(&args[1]), args+2);
@@ -6754,7 +6754,7 @@
if (!IsSym(args+1)) return errWrongType;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(&args[0])->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(&args[0])->slots);
if (!view) return errFailed;
int err = view->getProperty(slotRawSymbol(&args[1]), args+2);
@@ -6773,7 +6773,7 @@
PyrSlot *a = g->sp - 1;
PyrSlot *b = g->sp;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(a)->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(a)->slots);
if (!view) return errFailed;
int32 tag;
@@ -6796,7 +6796,7 @@
if (!g->canCallOS) return errCantCallOS;
PyrSlot *viewObjSlot = g->sp - 1;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(&viewObjSlot[0])->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(&viewObjSlot[0])->slots);
PyrSlot *boo = g->sp;
if (!view) return errFailed;
@@ -6810,7 +6810,7 @@
if (!g->canCallOS) return errCantCallOS;
PyrSlot *viewObjSlot = g->sp;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(&viewObjSlot[0])->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(&viewObjSlot[0])->slots);
if (!view) return errFailed;
SetBool(viewObjSlot, view->isFocus());
@@ -6825,7 +6825,7 @@
if(::IsNil( slotRawObject(g->sp)->slots+0 ))
return errFailed;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(g->sp)->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(g->sp)->slots);
if(!view) return errNone;
view->refresh();
return errNone;
@@ -6840,7 +6840,7 @@
return errFailed;
SCRect r;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(g->sp - 1)->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(g->sp - 1)->slots);
if(slotGetSCRect(g->sp, &r) != noErr)
return errFailed;
@@ -6855,7 +6855,7 @@
//if (!g->canCallOS) return errCantCallOS;
PyrSlot *viewObjSlot = g->sp;
- SCView *view = (SCGraphView*)slotRawPtr(slotRawObject(viewObjSlot)->slots);
+ SCView *view = (SCView*)slotRawPtr(slotRawObject(viewObjSlot)->slots);
if (!view) return errFailed;
// removes from parent, set mObj to nil
Modified: trunk/Synth.xcodeproj/project.pbxproj
===================================================================
--- trunk/Synth.xcodeproj/project.pbxproj 2009-12-15 15:18:31 UTC (rev 9603)
+++ trunk/Synth.xcodeproj/project.pbxproj 2009-12-15 15:18:56 UTC (rev 9604)
@@ -36,8 +36,6 @@
/* Begin PBXBuildFile section */
942F96F10B03380700E00399 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 94B6B0C30AF5390900E478BB /* CoreAudio.framework */; };
942F96F20B03380700E00399 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F53F78F503B2842D011C068F /* CoreServices.framework */; };
- 94930B040C190FB10018AB50 /* dtoa.c in Sources */ = {isa = PBXBuildFile; fileRef = 949309CB0C190FB10018AB50 /* dtoa.c */; };
- 94930B050C190FB10018AB50 /* g_fmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 949309CC0C190FB10018AB50 /* g_fmt.c */; };
94930B060C190FB10018AB50 /* SC_AllocPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CD0C190FB10018AB50 /* SC_AllocPool.cpp */; };
94930B070C190FB10018AB50 /* SC_DirUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CE0C190FB10018AB50 /* SC_DirUtils.cpp */; };
94930B080C190FB10018AB50 /* SC_Sem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CF0C190FB10018AB50 /* SC_Sem.cpp */; };
@@ -133,8 +131,6 @@
94F5FB330C1E6C07005CDF9F /* SC_UnitDef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94930A520C190FB10018AB50 /* SC_UnitDef.cpp */; };
94F5FB340C1E6C07005CDF9F /* SC_World.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94930A530C190FB10018AB50 /* SC_World.cpp */; };
94F5FB350C1E6C07005CDF9F /* scsynth_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94930A540C190FB10018AB50 /* scsynth_main.cpp */; };
- 94F5FB370C1E6C07005CDF9F /* dtoa.c in Sources */ = {isa = PBXBuildFile; fileRef = 949309CB0C190FB10018AB50 /* dtoa.c */; };
- 94F5FB380C1E6C07005CDF9F /* g_fmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 949309CC0C190FB10018AB50 /* g_fmt.c */; };
94F5FB390C1E6C07005CDF9F /* SC_AllocPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CD0C190FB10018AB50 /* SC_AllocPool.cpp */; };
94F5FB3A0C1E6C07005CDF9F /* SC_DirUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CE0C190FB10018AB50 /* SC_DirUtils.cpp */; };
94F5FB3B0C1E6C07005CDF9F /* SC_Sem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CF0C190FB10018AB50 /* SC_Sem.cpp */; };
@@ -287,8 +283,6 @@
D55DEE2E0EF3301F00968B95 /* SC_UnitDef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94930A520C190FB10018AB50 /* SC_UnitDef.cpp */; };
D55DEE2F0EF3301F00968B95 /* SC_World.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94930A530C190FB10018AB50 /* SC_World.cpp */; };
D55DEE300EF3301F00968B95 /* scsynth_main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94930A540C190FB10018AB50 /* scsynth_main.cpp */; };
- D55DEE310EF3302800968B95 /* dtoa.c in Sources */ = {isa = PBXBuildFile; fileRef = 949309CB0C190FB10018AB50 /* dtoa.c */; };
- D55DEE320EF3302800968B95 /* g_fmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 949309CC0C190FB10018AB50 /* g_fmt.c */; };
D55DEE330EF3302800968B95 /* SC_AllocPool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CD0C190FB10018AB50 /* SC_AllocPool.cpp */; };
D55DEE340EF3302800968B95 /* SC_DirUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CE0C190FB10018AB50 /* SC_DirUtils.cpp */; };
D55DEE350EF3302800968B95 /* SC_Sem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 949309CF0C190FB10018AB50 /* SC_Sem.cpp */; };
@@ -1094,8 +1088,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 94930B040C190FB10018AB50 /* dtoa.c in Sources */,
- 94930B050C190FB10018AB50 /* g_fmt.c in Sources */,
94930B060C190FB10018AB50 /* SC_AllocPool.cpp in Sources */,
94930B070C190FB10018AB50 /* SC_DirUtils.cpp in Sources */,
94930B080C190FB10018AB50 /* SC_Sem.cpp in Sources */,
@@ -1159,8 +1151,6 @@
94F5FB330C1E6C07005CDF9F /* SC_UnitDef.cpp in Sources */,
94F5FB340C1E6C07005CDF9F /* SC_World.cpp in Sources */,
94F5FB350C1E6C07005CDF9F /* scsynth_main.cpp in Sources */,
- 94F5FB370C1E6C07005CDF9F /* dtoa.c in Sources */,
- 94F5FB380C1E6C07005CDF9F /* g_fmt.c in Sources */,
94F5FB390C1E6C07005CDF9F /* SC_AllocPool.cpp in Sources */,
94F5FB3A0C1E6C07005CDF9F /* SC_DirUtils.cpp in Sources */,
94F5FB3B0C1E6C07005CDF9F /* SC_Sem.cpp in Sources */,
@@ -1201,8 +1191,6 @@
D55DEE2E0EF3301F00968B95 /* SC_UnitDef.cpp in Sources */,
D55DEE2F0EF3301F00968B95 /* SC_World.cpp in Sources */,
D55DEE300EF3301F00968B95 /* scsynth_main.cpp in Sources */,
- D55DEE310EF3302800968B95 /* dtoa.c in Sources */,
- D55DEE320EF3302800968B95 /* g_fmt.c in Sources */,
D55DEE330EF3302800968B95 /* SC_AllocPool.cpp in Sources */,
D55DEE340EF3302800968B95 /* SC_DirUtils.cpp in Sources */,
D55DEE350EF3302800968B95 /* SC_Sem.cpp in Sources */,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
_______________________________________________
sc-dev mailing list
info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: https://listarc.bham.ac.uk/marchives/sc-dev/
search: https://listarc.bham.ac.uk/lists/sc-dev/search/