Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 14:03:27 +01:00
Code Issues Projects Releases Wiki Activity

Fixes to av.mk

Browse Source
This commit is contained in:
cnhenry 2015-07-11 04:06:12 -05:00
parent e0a35a6569
commit a33e5f4bec
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cfg/checks/av.mk
View File

@ -8,9 +8,9 @@ else
endif endif
# Variables for video call support # Variables for video call support
VIDEO_LIBS = libtoxav xlib VIDEO_LIBS = libtoxav Xlib
AUDIO_CFLAGS = -DVIDEO VIDEO_CFLAGS = -DVIDEO
ifneq (, $(findstring video_device.o $(OBJ))) ifneq (, $(findstring video_device.o, $(OBJ)))
VIDEO_OBJ = video_call.o VIDEO_OBJ = video_call.o
else else
VIDEO_OBJ = video_call.o video_device.o VIDEO_OBJ = video_call.o video_device.o
@ -40,3 +40,4 @@ else ifneq ($(MAKECMDGOALS), clean)
$(warning WARNING -- Toxic will be compiled without video support) $(warning WARNING -- Toxic will be compiled without video support)
$(warning WARNING -- You will need these libraries for video support) $(warning WARNING -- You will need these libraries for video support)
$(warning WARNING -- $(MISSING_VIDEO_LIBS)) $(warning WARNING -- $(MISSING_VIDEO_LIBS))
endif

3
src/video_device.c
View File

@ -96,7 +96,6 @@ VideoDeviceError init_video_devices(ToxAV* av_)
if (v4l_fd == -1) if (v4l_fd == -1)
break; break;
else { else {
int name_length = sizeof(cap.card);
device_names[input][i] = video_cap.card; device_names[input][i] = video_cap.card;
} }
@ -104,8 +103,10 @@ VideoDeviceError init_video_devices(ToxAV* av_)
size[input] = i; size[input] = i;
} }
#endif /* __linux__ */ #endif /* __linux__ */
/* TODO: Add OSX implementation for listing input video devices */
size[output] = 0; size[output] = 0;
/* TODO: List output video devices */
// Start poll thread // Start poll thread
if (pthread_mutex_init(&mutex, NULL) != 0) if (pthread_mutex_init(&mutex, NULL) != 0)