mirror of
https://github.com/TomHarte/CLK.git
synced 2024-12-25 03:32:01 +00:00
Switched to forcing all processing onto a common queue and piping the completed frame over into the Objective-C class.
This commit is contained in:
parent
d72287a776
commit
e7237c7bd5
@ -9,61 +9,74 @@
|
||||
#import "Atari2600.h"
|
||||
#import "Atari2600.hpp"
|
||||
|
||||
class Atari2600CRTDelegate: public Outputs::CRT::CRTDelegate {
|
||||
void crt_did_end_frame(Outputs::CRT *crt, Outputs::CRTFrame *frame)
|
||||
{
|
||||
printf("\n\n===\n\n");
|
||||
int c = 0;
|
||||
for(int run = 0; run < frame->number_of_runs; run++)
|
||||
{
|
||||
char character = ' ';
|
||||
switch(frame->runs[run].type)
|
||||
{
|
||||
case Outputs::CRTRun::Type::Sync: character = '<'; break;
|
||||
case Outputs::CRTRun::Type::Level: character = '_'; break;
|
||||
case Outputs::CRTRun::Type::Data: character = '-'; break;
|
||||
case Outputs::CRTRun::Type::Blank: character = ' '; break;
|
||||
}
|
||||
|
||||
if(frame->runs[run].start_point.dst_x < 1.0 / 224.0)
|
||||
{
|
||||
printf("\n[%0.2f]: ", frame->runs[run].start_point.dst_y);
|
||||
c++;
|
||||
}
|
||||
|
||||
printf("(%0.2f): ", frame->runs[run].start_point.dst_x);
|
||||
float length = fabsf(frame->runs[run].end_point.dst_x - frame->runs[run].start_point.dst_x);
|
||||
int iLength = (int)(length * 64.0);
|
||||
for(int c = 0; c < iLength; c++)
|
||||
{
|
||||
putc(character, stdout);
|
||||
}
|
||||
}
|
||||
|
||||
printf("\n\n[%d]\n\n", c);
|
||||
crt->return_frame();
|
||||
}
|
||||
@interface CSAtari2600 (Callbacks)
|
||||
- (void)crtDidEndFrame:(Outputs::CRTFrame *)frame;
|
||||
@end
|
||||
|
||||
struct Atari2600CRTDelegate: public Outputs::CRT::CRTDelegate {
|
||||
CSAtari2600 *atari;
|
||||
void crt_did_end_frame(Outputs::CRT *crt, Outputs::CRTFrame *frame) { [atari crtDidEndFrame:frame]; }
|
||||
};
|
||||
|
||||
@implementation CSAtari2600 {
|
||||
Atari2600::Machine _atari2600;
|
||||
Atari2600CRTDelegate _crtDelegate;
|
||||
|
||||
dispatch_queue_t _serialDispatchQueue;
|
||||
}
|
||||
|
||||
- (void)crtDidEndFrame:(Outputs::CRTFrame *)frame {
|
||||
printf("\n\n===\n\n");
|
||||
int c = 0;
|
||||
for(int run = 0; run < frame->number_of_runs; run++)
|
||||
{
|
||||
char character = ' ';
|
||||
switch(frame->runs[run].type)
|
||||
{
|
||||
case Outputs::CRTRun::Type::Sync: character = '<'; break;
|
||||
case Outputs::CRTRun::Type::Level: character = '_'; break;
|
||||
case Outputs::CRTRun::Type::Data: character = '-'; break;
|
||||
case Outputs::CRTRun::Type::Blank: character = ' '; break;
|
||||
}
|
||||
|
||||
if(frame->runs[run].start_point.dst_x < 1.0 / 224.0)
|
||||
{
|
||||
printf("\n[%0.2f]: ", frame->runs[run].start_point.dst_y);
|
||||
c++;
|
||||
}
|
||||
|
||||
printf("(%0.2f): ", frame->runs[run].start_point.dst_x);
|
||||
float length = fabsf(frame->runs[run].end_point.dst_x - frame->runs[run].start_point.dst_x);
|
||||
int iLength = (int)(length * 64.0);
|
||||
for(int c = 0; c < iLength; c++)
|
||||
{
|
||||
putc(character, stdout);
|
||||
}
|
||||
}
|
||||
|
||||
printf("\n\n[%d]\n\n", c);
|
||||
_atari2600.get_crt()->return_frame();
|
||||
}
|
||||
|
||||
- (void)runForNumberOfCycles:(int)cycles {
|
||||
_atari2600.run_for_cycles(cycles);
|
||||
dispatch_async(_serialDispatchQueue, ^{
|
||||
_atari2600.run_for_cycles(cycles);
|
||||
});
|
||||
}
|
||||
|
||||
- (void)setROM:(NSData *)rom {
|
||||
_atari2600.set_rom(rom.length, (const uint8_t *)rom.bytes);
|
||||
dispatch_async(_serialDispatchQueue, ^{
|
||||
_atari2600.set_rom(rom.length, (const uint8_t *)rom.bytes);
|
||||
});
|
||||
}
|
||||
|
||||
- (instancetype)init {
|
||||
self = [super init];
|
||||
|
||||
if (self) {
|
||||
_crtDelegate.atari = self;
|
||||
_atari2600.get_crt()->set_delegate(&_crtDelegate);
|
||||
_serialDispatchQueue = dispatch_queue_create("Atari 2600 quuue", DISPATCH_QUEUE_SERIAL);
|
||||
}
|
||||
|
||||
return self;
|
||||
|
Loading…
Reference in New Issue
Block a user