$ git clone http://tcclient.ion.nu/tc_client.git
commit 4acbc77342d3e363c026014c209910323302b725
Author: Alicia <...>
Date: Wed Dec 16 22:29:00 2015 +0100
libcamera: fixed compiler warnings.
diff --git a/ChangeLog b/ChangeLog
index 779e065..3039054 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ Reimplemented announcement of moderators.
Reimplemented announcement of people cammed up when joining.
libcamera: added support for a virtual "Image" camera.
tc_client-gtk: added workarounds for the camera code (with the platform-agnostic "Image" camera) to work on windows.
+libcamera: fixed compiler warnings.
0.36:
Implemented /whois <nick/ID> to check someone's username.
Changed the /whois output to be more human-readable in cases where the user isn't logged in.
diff --git a/utilities/libcamera/camera.c b/utilities/libcamera/camera.c
index b005693..b89c3b6 100644
--- a/utilities/libcamera/camera.c
+++ b/utilities/libcamera/camera.c
@@ -14,7 +14,10 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <string.h>
#include "camera.h"
+#include "camera_v4l2.h"
+#include "camera_img.h"
struct CAM_t
{
@@ -38,6 +41,7 @@ CAM* cam_open(const char* name)
if(!strncmp(name, "v4l2:", 5)){return cam_open_v4l2(name);}
#endif
if(!strcmp(name, "Image")){return cam_open_img();}
+ return 0;
}
void cam_resolution(CAM* cam, unsigned int* width, unsigned int* height)
diff --git a/utilities/libcamera/camera_img.h b/utilities/libcamera/camera_img.h
new file mode 100644
index 0000000..d6d4a8e
--- /dev/null
+++ b/utilities/libcamera/camera_img.h
@@ -0,0 +1,22 @@
+/*
+ libcamera, a camera access abstraction library
+ Copyright (C) 2015 alicia@ion.nu
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+extern const char*(*cam_img_filepicker)(void);
+extern char** cam_list_img(char** list, unsigned int* count);
+extern CAM* cam_open_img(void);
+extern void cam_resolution_img(CAM* cam, unsigned int* width, unsigned int* height);
+extern void cam_getframe_img(CAM* cam, void* pixmap);
+extern void cam_close_img(CAM* cam);
diff --git a/utilities/libcamera/camera_v4l2.h b/utilities/libcamera/camera_v4l2.h
new file mode 100644
index 0000000..eb1dd46
--- /dev/null
+++ b/utilities/libcamera/camera_v4l2.h
@@ -0,0 +1,21 @@
+/*
+ libcamera, a camera access abstraction library
+ Copyright (C) 2015 alicia@ion.nu
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, version 3 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+extern char** cam_list_v4l2(char** list, unsigned int* count);
+extern CAM* cam_open_v4l2(const char* name);
+extern void cam_resolution_v4l2(CAM* cam, unsigned int* width, unsigned int* height);
+extern void cam_getframe_v4l2(CAM* cam, void* pixmap);
+extern void cam_close_v4l2(CAM* cam);