Skip to content

Commit

Permalink
(build) unbreak master from 277a229
Browse files Browse the repository at this point in the history
Accidentally included partial changes from another branch poking
at the possible interface for arcan-net <-> arcan <-> lua netapi
  • Loading branch information
letoram committed Oct 13, 2023
1 parent 277a229 commit 59faadc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/engine/arcan_frameserver.h
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ struct arcan_frameserver {
bool external : 1;
bool networked : 1;
bool sandboxed : 1;
bool wrapped : 1;

/* tristate: 0 (default) empty, 1 (preroll-ok), 2 (preroll-lock) */
int activated;
Expand Down
5 changes: 5 additions & 0 deletions src/engine/arcan_monitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,3 +259,8 @@ void arcan_monitor_tick()
m_ctr = m_srate;
arcan_lua_statesnap(m_out, buf, true);
}

arcan_vobj_id arcan_monitor_fsrvvid(intptr_t ref)
{
return ARCAN_EID;
}
6 changes: 6 additions & 0 deletions src/engine/arcan_monitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,10 @@ void arcan_monitor_tick();
*/
void arcan_monitor_finish(bool ok);

/*
* get a vobj id bound to ref handler for mapping the monitor connection
* to the net api
*/
arcan_vobj_id arcan_monitor_fsrvvid(intptr_t ref);

#endif

0 comments on commit 59faadc

Please sign in to comment.