6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-06-30 22:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Added class prefix.

Browse Source
This commit is contained in:
Thomas Harte 2016-06-15 08:07:25 -04:00
parent 695dd2e9e3
commit e0baaf17f1
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
View File

@ -8,7 +8,7 @@
/* Begin PBXBuildFile section */
4B0CCC451C62D0B3001CAC5F /* CRT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B0CCC421C62D0B3001CAC5F /* CRT.cpp */; };
4B0EBFB81C487F2F00A11F35 /* AudioQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0EBFB71C487F2F00A11F35 /* AudioQueue.m */; };
4B0EBFB81C487F2F00A11F35 /* CSAudioQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B0EBFB71C487F2F00A11F35 /* CSAudioQueue.m */; };
4B14145B1B58879D00E04248 /* CPU6502.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414571B58879D00E04248 /* CPU6502.cpp */; };
4B14145D1B5887A600E04248 /* CPU6502.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414571B58879D00E04248 /* CPU6502.cpp */; };
4B14145E1B5887AA00E04248 /* CPU6502AllRAM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B1414591B58879D00E04248 /* CPU6502AllRAM.cpp */; };
@ -342,8 +342,8 @@
4B0B6E121C9DBD5D00FFB60D /* CRTConstants.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CRTConstants.hpp; sourceTree = "<group>"; };
4B0CCC421C62D0B3001CAC5F /* CRT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CRT.cpp; sourceTree = "<group>"; };
4B0CCC431C62D0B3001CAC5F /* CRT.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CRT.hpp; sourceTree = "<group>"; };
4B0EBFB61C487F2F00A11F35 /* AudioQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioQueue.h; sourceTree = "<group>"; };
4B0EBFB71C487F2F00A11F35 /* AudioQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AudioQueue.m; sourceTree = "<group>"; };
4B0EBFB61C487F2F00A11F35 /* CSAudioQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSAudioQueue.h; sourceTree = "<group>"; };
4B0EBFB71C487F2F00A11F35 /* CSAudioQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSAudioQueue.m; sourceTree = "<group>"; };
4B1414501B58848C00E04248 /* ClockSignal-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ClockSignal-Bridging-Header.h"; sourceTree = "<group>"; };
4B1414571B58879D00E04248 /* CPU6502.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPU6502.cpp; sourceTree = "<group>"; };
4B1414581B58879D00E04248 /* CPU6502.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CPU6502.hpp; sourceTree = "<group>"; };
@ -797,8 +797,8 @@
4B55CE481C3B3B0C0093A61B /* Wrappers */ = {
isa = PBXGroup;
children = (
4B0EBFB61C487F2F00A11F35 /* AudioQueue.h */,
4B0EBFB71C487F2F00A11F35 /* AudioQueue.m */,
4B0EBFB61C487F2F00A11F35 /* CSAudioQueue.h */,
4B0EBFB71C487F2F00A11F35 /* CSAudioQueue.m */,
4B55CE491C3B3B0C0093A61B /* CSAtari2600.h */,
4B55CE4A1C3B3B0C0093A61B /* CSAtari2600.mm */,
4B55CE521C3B7ABF0093A61B /* CSElectron.h */,
@ -1718,7 +1718,7 @@
4BC3B74F1CD194CC00F86E85 /* Shader.cpp in Sources */,
4B55CE4B1C3B3B0C0093A61B /* CSAtari2600.mm in Sources */,
4B55CE581C3B7D360093A61B /* Atari2600Document.swift in Sources */,
4B0EBFB81C487F2F00A11F35 /* AudioQueue.m in Sources */,
4B0EBFB81C487F2F00A11F35 /* CSAudioQueue.m in Sources */,
4BBB14311CD2CECE00BDB55C /* IntermediateShader.cpp in Sources */,
4B886FF51D03B61E004291C3 /* CSVic20.mm in Sources */,
4B73C71A1D036BD90074D992 /* Vic20Document.swift in Sources */,

2
OSBindings/Mac/Clock Signal/ClockSignal-Bridging-Header.h
View File

@ -10,4 +10,4 @@
#import "CSVic20.h"
#import "CSOpenGLView.h"
#import "AudioQueue.h"
#import "CSAudioQueue.h"

6
OSBindings/Mac/Clock Signal/Documents/MachineDocument.swift
View File

@ -33,7 +33,7 @@ class MachineDocument: NSDocument, CSOpenGLViewDelegate, CSOpenGLViewResponderDe
optionsPanel?.setIsVisible(true)
}
var audioQueue : AudioQueue! = nil
var audioQueue : CSAudioQueue! = nil
override func windowControllerDidLoadNib(aController: NSWindowController) {
super.windowControllerDidLoadNib(aController)
@ -46,10 +46,10 @@ class MachineDocument: NSDocument, CSOpenGLViewDelegate, CSOpenGLViewResponderDe
})
// establish and provide the audio queue, taking advice as to an appropriate sampling rate
let maximumSamplingRate = AudioQueue.preferredSamplingRate()
let maximumSamplingRate = CSAudioQueue.preferredSamplingRate()
let selectedSamplingRate = self.machine().idealSamplingRateFromRange(NSRange(location: 0, length: NSInteger(maximumSamplingRate)))
if selectedSamplingRate > 0 {
audioQueue = AudioQueue(samplingRate: Float64(selectedSamplingRate))
audioQueue = CSAudioQueue(samplingRate: Float64(selectedSamplingRate))
self.machine().audioQueue = self.audioQueue
self.machine().setAudioSamplingRate(selectedSamplingRate)
}

6
OSBindings/Mac/Clock Signal/Wrappers/AudioQueue.h → OSBindings/Mac/Clock Signal/Wrappers/CSAudioQueue.h
View File

@ -8,13 +8,13 @@
#import <Foundation/Foundation.h>
@class AudioQueue;
@class CSAudioQueue;
@protocol AudioQueueDelegate
- (void)audioQueueDidCompleteBuffer:(nonnull AudioQueue *)audioQueue;
- (void)audioQueueDidCompleteBuffer:(nonnull CSAudioQueue *)audioQueue;
@end
@interface AudioQueue : NSObject
@interface CSAudioQueue : NSObject
- (nonnull instancetype)initWithSamplingRate:(Float64)samplingRate;
- (void)enqueueAudioBuffer:(nonnull const int16_t *)buffer numberOfSamples:(size_t)lengthInSamples;

6
OSBindings/Mac/Clock Signal/Wrappers/AudioQueue.m → OSBindings/Mac/Clock Signal/Wrappers/CSAudioQueue.m
View File

@ -6,7 +6,7 @@
// Copyright © 2016 Thomas Harte. All rights reserved.
//
#import "AudioQueue.h"
#import "CSAudioQueue.h"
@import AudioToolbox;
#define AudioQueueNumAudioBuffers 4
@ -19,7 +19,7 @@ enum {
AudioQueueIsInvalidated
};
@implementation AudioQueue
@implementation CSAudioQueue
{
AudioQueueRef _audioQueue;
AudioQueueBufferRef _audioBuffers[AudioQueueNumAudioBuffers];
@ -84,7 +84,7 @@ static void audioOutputCallback(
AudioQueueRef inAQ,
AudioQueueBufferRef inBuffer)
{
[(__bridge AudioQueue *)inUserData audioQueue:inAQ didCallbackWithBuffer:inBuffer];
[(__bridge CSAudioQueue *)inUserData audioQueue:inAQ didCallbackWithBuffer:inBuffer];
}
- (instancetype)initWithSamplingRate:(Float64)samplingRate

4
OSBindings/Mac/Clock Signal/Wrappers/CSMachine.h
View File

@ -8,7 +8,7 @@
#import <Foundation/Foundation.h>
#import "CSOpenGLView.h"
#import "AudioQueue.h"
#import "CSAudioQueue.h"
@interface CSMachine : NSObject
@ -20,7 +20,7 @@
- (void)setView:(CSOpenGLView *)view aspectRatio:(float)aspectRatio;
- (void)drawViewForPixelSize:(CGSize)pixelSize onlyIfDirty:(BOOL)onlyIfDirty;
@property (nonatomic, weak) AudioQueue *audioQueue;
@property (nonatomic, weak) CSAudioQueue *audioQueue;
@property (nonatomic, readonly) CSOpenGLView *view;
@end