[Vm-dev] [commit][3214]
Eliminate duplication and misplaced plugin files in the iOS subsystem.
commits at squeakvm.org
commits at squeakvm.org
Wed Jan 7 00:47:22 UTC 2015
Revision: 3214
Author: eliot
Date: 2015-01-06 16:47:22 -0800 (Tue, 06 Jan 2015)
Log Message:
-----------
Eliminate duplication and misplaced plugin files in the iOS subsystem.
Added Paths:
-----------
branches/Cog/platforms/iOS/plugins/HostWindowPlugin/
branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.h
branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m
Removed Paths:
-------------
branches/Cog/platforms/iOS/vm/OSX/plugins/HostWindowPlugin/
branches/Cog/platforms/iOS/vm/OSX/plugins/SoundPlugin/
branches/Cog/platforms/iOS/vm/iPhone/plugins/HostWindowPlugin/
Copied: branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.h (from rev 3209, branches/Cog/platforms/iOS/vm/OSX/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.h)
===================================================================
--- branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.h (rev 0)
+++ branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.h 2015-01-07 00:47:22 UTC (rev 3214)
@@ -0,0 +1,45 @@
+//
+// sqSqueakOSXSoundCoreAudio.h
+// SqueakPureObjc
+//
+// Created by John M McIntosh on 09-11-27.
+/* Some of this code was funded via a grant from the European Smalltalk User Group (ESUG)
+ // Copyright 2009 Corporate Smalltalk Consulting Ltd. All rights reserved.
+ MIT License
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ The end-user documentation included with the redistribution, if any, must include the following acknowledgment:
+ "This product includes software developed by Corporate Smalltalk Consulting Ltd (http://www.smalltalkconsulting.com)
+ and its contributors", in the same place and form as other third-party acknowledgments.
+ Alternately, this acknowledgment may appear in the software itself, in the same form and location as other
+ such third-party acknowledgments.
+ */
+//
+
+#import "sqSqueakSoundCoreAudio.h"
+
+ at interface sqSqueakOSXSoundCoreAudio : sqSqueakSoundCoreAudio {
+
+}
+- (sqInt) soundInitOverride;
+
+ at end
Copied: branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m (from rev 3209, branches/Cog/platforms/iOS/vm/OSX/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m)
===================================================================
--- branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m (rev 0)
+++ branches/Cog/platforms/iOS/plugins/SoundPlugin/sqSqueakOSXSoundCoreAudio.m 2015-01-07 00:47:22 UTC (rev 3214)
@@ -0,0 +1,60 @@
+//
+// sqSqueakOSXSoundCoreAudio.m
+// SqueakPureObjc
+//
+// Created by John M McIntosh on 09-11-27.
+/* Some of this code was funded via a grant from the European Smalltalk User Group (ESUG)
+ // Copyright 2009 Corporate Smalltalk Consulting Ltd. All rights reserved.
+ MIT License
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+ The end-user documentation included with the redistribution, if any, must include the following acknowledgment:
+ "This product includes software developed by Corporate Smalltalk Consulting Ltd (http://www.smalltalkconsulting.com)
+ and its contributors", in the same place and form as other third-party acknowledgments.
+ Alternately, this acknowledgment may appear in the software itself, in the same form and location as other
+ such third-party acknowledgments.
+ *///
+
+#import "sqSqueakOSXSoundCoreAudio.h"
+
+
+ at implementation sqSqueakOSXSoundCoreAudio
+- (sqInt) soundInit {
+ return 1;
+}
+
+- (sqInt) soundInitOverride {
+ //NSLog(@"%i sound init",ioMSecs());
+ self.outputAudioQueue = nil;
+ self.inputAudioQueue = nil;
+ self.semaIndexForOutput = 0;
+ self.semaIndexForInput = 0;
+ self.outputFormat = calloc(1,sizeof(AudioStreamBasicDescription));
+ self.inputFormat = calloc(1,sizeof(AudioStreamBasicDescription));
+ self.outputBuffers = calloc((unsigned)kNumberOfBuffers,sizeof(AudioQueueBufferRef));
+ self.inputBuffers = calloc((unsigned) kNumberOfBuffers,sizeof(AudioQueueBufferRef));
+ soundOutQueue = [Queue new];
+ soundInQueue = [Queue new];
+ return 1;
+}
+
+ at end
More information about the Vm-dev
mailing list