Apple-2-Tools/Steve2
1
0
Fork 0
mirror of https://github.com/trudnai/Steve2.git synced 2024-06-13 09:29:36 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
tudnai 2022-07-03 19:25:06 -07:00
parent 36684487f4
commit f4cd241f59
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
A2Mac/ViewController.swift
View File

@ -473,14 +473,14 @@ class ViewController: NSViewController {
}
func convertPoint(toCG : NSPoint) -> CGPoint {
func convertPoint(toCG point : NSPoint) -> CGPoint {
/// Cocoa and Core Graphics (a.k.a. Quartz) use different coordinate systems. In Cocoa, the origin is at the lower left of the primary screen and y increases as you go up. In Core Graphics, the origin is at the top left of the primary screen and y increases as you go down.
/// Need to convert coordinates from Cocoa to Core Graphics
var CGPoint = view.window!.convertPoint(toScreen: toCG)
var cgpoint = view.window!.convertPoint(toScreen: point)
if let screen = getScreenWithMouse() {
CGPoint.y = NSHeight(screen.frame) - CGPoint.y;
cgpoint.y = NSHeight(screen.frame) - cgpoint.y;
}
return CGPoint
return cgpoint
}
@ -496,7 +496,7 @@ class ViewController: NSViewController {
mouseCursorNeedsReplace = true
location.x = 8
}
if location.x >= textDisplay.frame.width - 7 {
if location.x > textDisplay.frame.width - 8 {
mouseCursorNeedsReplace = true
location.x = textDisplay.frame.width - 8
}
@ -504,7 +504,7 @@ class ViewController: NSViewController {
mouseCursorNeedsReplace = true
location.y = 8
}
if location.y >= textDisplay.frame.height - 7 {
if location.y > textDisplay.frame.height - 8 {
mouseCursorNeedsReplace = true
location.y = textDisplay.frame.height - 8
}

25
src/dev/audio/speaker.c
View File

@ -33,7 +33,7 @@
#include "disk.h" // to be able to disable disk acceleration
#define SPKR_OVERSAMPLING 32 // 8 sounds like optimal, 16 is better, 32 is really good but have a weird effect
#define SPKR_OVERSAMPLING 32 // 8 and 10 sounds ok, 16 is better, 32 is really good, 64 is not better than 32
#define min(x,y) (x) < (y) ? (x) : (y)
@ -94,7 +94,9 @@ int spkr_last_level = SPKR_LEVEL_ZERO;
//static const int ema_len_soft = 20;
//static const int ema_len_supersoft = 40;
#if (SPKR_OVERSAMPLING >= 32)
#if (SPKR_OVERSAMPLING >= 64)
int spkr_ema_len = 128;
#elif (SPKR_OVERSAMPLING >= 32)
int spkr_ema_len = 64;
#elif (SPKR_OVERSAMPLING >= 16)
int spkr_ema_len = 32;
@ -691,17 +693,24 @@ INLINE static void spkr_filter_sma(int buf_len) {
#ifdef SPKR_OVERSAMPLING
INLINE static spkr_sample_t spkr_avg(const spkr_sample_t * buf, const int len) {
long sum = 0;
// get the sum for that section
for (int i = 0; i < len; i++) {
sum += buf[ i * SPKR_CHANNELS ];
}
// get the average for that section
return sum / len;
}
INLINE static void spkr_downsample() {
for (int i = 0; i < SPKR_STRM_SLOT_SIZE(1); ) {
int level = 0;
int buf_idx = i * SPKR_OVERSAMPLING;
// get the sum for that section
for (int j = 0; j < SPKR_OVERSAMPLING; j++) {
level += spkr_samples[ buf_idx + j * SPKR_CHANNELS ];
}
// get the average for that section
level /= SPKR_OVERSAMPLING;
spkr_sample_t level = spkr_avg(spkr_samples + buf_idx, SPKR_OVERSAMPLING);
// fill the downsampled version
spkr_stream[i++] = level;

4
src/dev/audio/speaker.h
View File

@ -111,8 +111,8 @@ extern void spkr_play_disk_motor(void);
extern void spkr_stop_disk_motor( int time );
extern void spkr_update_disk_sfx(void);
extern void spkr_stop_sfx( ALuint src );
extern void spkr_stop_game_sfx();
extern void spkr_stop_disk_sfx();
extern void spkr_stop_game_sfx(void);
extern void spkr_stop_disk_sfx(void);
extern void spkr_stopAll(void);
extern void spkr_play_disk_arm(void);