Skip to content

Commit 9f02b0f

Browse files
committed
Migrate to tcp backend in libpict
1 parent d960e87 commit 9f02b0f

15 files changed

+25
-440
lines changed

lib/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ set(FUDGE_CORE
99
fuji.c
1010
tester.c
1111
data.c
12-
net.c
1312
discovery.c
1413
exif.c
1514
fuji_usb.c

lib/fuji_lua.c

100755100644
File mode changed.

lib/fuji_lua.h

100755100644
File mode changed.

lib/libpict

lib/lua_runtime.c

100755100644
File mode changed.

lib/net.c

-322
This file was deleted.

lib/object.h

100755100644
File mode changed.

ndk/android.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -401,4 +401,4 @@ char *stpcpy(char *dst, const char *src) {
401401
return (char *)memcpy (dst, src, len + 1) + len;
402402
}
403403

404-
#pragma GCC visibility pop
404+
#pragma GCC visibility pop

ndk/backend.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// JNI PTP/IP interface for camlib and fuji.c
1+
// JNI PTP/IP interface for libpict and fuji.c
22
// Copyright 2024 (C) Fudge
33
#include <stdio.h>
44
#include <stdlib.h>
55
#include <errno.h>
66
#include <string.h>
7-
#include <camlib.h>
7+
#include <libpict.h>
88
#include <dlfcn.h>
99
#include "app.h"
1010
#include "backend.h"
@@ -430,4 +430,4 @@ int app_bind_socket_to_network(int fd, struct NetworkHandle *h) {
430430
}
431431

432432
return 0;
433-
}
433+
}

ndk/camlib.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// Portable Java bindings to camlib
1+
// Portable Java bindings to libpict
22
#include <stdlib.h>
33
#include <jni.h>
44
#include <android/log.h>
5-
#include <camlib.h>
5+
#include <libpict.h>
66
#include <fuji.h>
77
#include "object.h"
88

ndk/liveview.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <stdlib.h>
55
#include <errno.h>
66
#include <string.h>
7-
#include <camlib.h>
7+
#include <libpict.h>
88
#include "app.h"
99
#include "backend.h"
1010
#include "android.h"

0 commit comments

Comments
 (0)