RPJosh
/
wayvnc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to aml api change

pull/173/head
Andri Yngvason 2022-10-29 11:56:54 +00:00
parent 6c8ad1db1e
commit e9ee4e644c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -15,6 +15,7 @@ prefix = get_option('prefix')
c_args = [ c_args = [
'-DPROJECT_VERSION="@0@"'.format(meson.project_version()), '-DPROJECT_VERSION="@0@"'.format(meson.project_version()),
'-D_GNU_SOURCE', '-D_GNU_SOURCE',
'-DAML_UNSTABLE_API=1',
] ]
git = find_program('git', native: true, required: false) git = find_program('git', native: true, required: false)

5
src/main.c
View File

@ -1107,6 +1107,9 @@ int main(int argc, char* argv[])
} }
#endif #endif
if (aml_unstable_abi_version != AML_UNSTABLE_API)
nvnc_log(NVNC_LOG_PANIC, "libaml is incompatible with this build of wayvnc!");
struct aml* aml = aml_new(); struct aml* aml = aml_new();
if (!aml) if (!aml)
goto main_loop_failure; goto main_loop_failure;
@ -1134,7 +1137,7 @@ int main(int argc, char* argv[])
self.screencopy.overlay_cursor = overlay_cursor; self.screencopy.overlay_cursor = overlay_cursor;
if (show_performance) if (show_performance)
self.performance_ticker = aml_ticker_new(1000, on_perf_tick, self.performance_ticker = aml_ticker_new(1000000, on_perf_tick,
&self, NULL); &self, NULL);
wl_display_dispatch_pending(self.display); wl_display_dispatch_pending(self.display);

2
src/screencopy.c
View File

@ -255,7 +255,7 @@ static int screencopy__start(struct screencopy* self, bool is_immediate_copy)
uint64_t now = gettime_us(); uint64_t now = gettime_us();
double dt = (now - self->last_time) * 1.0e-6; double dt = (now - self->last_time) * 1.0e-6;
int32_t time_left = (1.0 / self->rate_limit - dt - self->delay) * 1.0e3; int32_t time_left = (1.0 / self->rate_limit - dt - self->delay) * 1.0e6;
self->status = SCREENCOPY_IN_PROGRESS; self->status = SCREENCOPY_IN_PROGRESS;