cleanup: namespace Montauk (capital M) => montauk::abi
This commit is contained in:
@@ -76,16 +76,16 @@ static int g_mouse_y = -1;
|
||||
static int g_hover_row = -1;
|
||||
|
||||
// Adapter info
|
||||
static Montauk::BtAdapterInfo g_adapter;
|
||||
static montauk::abi::BtAdapterInfo g_adapter;
|
||||
static bool g_adapter_ok = false;
|
||||
|
||||
// Connected/paired devices
|
||||
static Montauk::BtDevInfo g_devices[MAX_CONNECTED];
|
||||
static montauk::abi::BtDevInfo g_devices[MAX_CONNECTED];
|
||||
static char g_device_names[MAX_CONNECTED][64];
|
||||
static int g_device_count = 0;
|
||||
|
||||
// Scan results
|
||||
static Montauk::BtScanResult g_scan[MAX_SCAN];
|
||||
static montauk::abi::BtScanResult g_scan[MAX_SCAN];
|
||||
static int g_scan_count = 0;
|
||||
static bool g_scanning = false;
|
||||
|
||||
@@ -268,7 +268,7 @@ static void refresh_devices() {
|
||||
|
||||
// Append bonded (paired) devices that aren't currently connected, so the
|
||||
// Devices tab remembers them across sessions/reboots.
|
||||
Montauk::BtBondInfo bonds[8];
|
||||
montauk::abi::BtBondInfo bonds[8];
|
||||
int nb = montauk::bt_bonds(bonds, 8);
|
||||
for (int i = 0; i < nb && g_device_count < MAX_CONNECTED; i++) {
|
||||
bool already = false;
|
||||
@@ -277,7 +277,7 @@ static void refresh_devices() {
|
||||
}
|
||||
if (already) continue;
|
||||
|
||||
Montauk::BtDevInfo d = {};
|
||||
montauk::abi::BtDevInfo d = {};
|
||||
montauk::memcpy(d.bdAddr, bonds[i].bdAddr, 6);
|
||||
d.connected = 0; // paired but not connected
|
||||
d.encrypted = 0;
|
||||
@@ -642,7 +642,7 @@ static bool handle_adapter_mouse(int mx, int my, uint8_t buttons,
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool handle_adapter_key(const Montauk::KeyEvent& key) {
|
||||
static bool handle_adapter_key(const montauk::abi::KeyEvent& key) {
|
||||
if (key.ascii == '\n' || key.ascii == '\r') { apply_mac(); return true; }
|
||||
if (key.ascii == '\t') { g_mac_focus = !g_mac_focus; return true; }
|
||||
|
||||
@@ -883,7 +883,7 @@ extern "C" void _start() {
|
||||
uint64_t last_refresh = montauk::get_milliseconds();
|
||||
|
||||
while (true) {
|
||||
Montauk::WinEvent ev;
|
||||
montauk::abi::WinEvent ev;
|
||||
int r = win.poll(&ev);
|
||||
|
||||
if (r < 0) break;
|
||||
|
||||
Reference in New Issue
Block a user