mirror of
https://github.com/Tha14/toxic.git
synced 2024-12-23 04:43:25 +01:00
Fixes to av.mk
This commit is contained in:
parent
e0a35a6569
commit
a33e5f4bec
@ -8,9 +8,9 @@ else
|
||||
endif
|
||||
|
||||
# Variables for video call support
|
||||
VIDEO_LIBS = libtoxav xlib
|
||||
AUDIO_CFLAGS = -DVIDEO
|
||||
ifneq (, $(findstring video_device.o $(OBJ)))
|
||||
VIDEO_LIBS = libtoxav Xlib
|
||||
VIDEO_CFLAGS = -DVIDEO
|
||||
ifneq (, $(findstring video_device.o, $(OBJ)))
|
||||
VIDEO_OBJ = video_call.o
|
||||
else
|
||||
VIDEO_OBJ = video_call.o video_device.o
|
||||
@ -39,4 +39,5 @@ else ifneq ($(MAKECMDGOALS), clean)
|
||||
MISSING_VIDEO_LIBS = $(shell for lib in $(VIDEO_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done)
|
||||
$(warning WARNING -- Toxic will be compiled without video support)
|
||||
$(warning WARNING -- You will need these libraries for video support)
|
||||
$(warning WARNING -- $(MISSING_VIDEO_LIBS))
|
||||
$(warning WARNING -- $(MISSING_VIDEO_LIBS))
|
||||
endif
|
@ -75,7 +75,7 @@ static ToxAV* av = NULL;
|
||||
pthread_mutext_t mutex;
|
||||
|
||||
bool thread_running = true,
|
||||
thread_paused = true; /* Thread control */
|
||||
thread_paused = true; /* Thread control */
|
||||
|
||||
void* thread_poll(void*);
|
||||
/* Meet devices */
|
||||
@ -84,52 +84,53 @@ VideoDeviceError init_video_devices(ToxAV* av_)
|
||||
#else
|
||||
#endif /* VIDEO */
|
||||
{
|
||||
size[input] = 0;
|
||||
|
||||
#ifdef __linux__
|
||||
for(int i = 0; <= MAX_DEVICES; ++i) {
|
||||
int v4l_fd;
|
||||
struct v4l2_capability cap;
|
||||
char *dev_name;
|
||||
size[input] = 0;
|
||||
|
||||
v4l_fd = open(dev_name, O_RDWR | O_NONBLOCK, 0);
|
||||
if (v4l_fd == -1)
|
||||
break;
|
||||
else {
|
||||
int name_length = sizeof(cap.card);
|
||||
device_names[input][i] = video_cap.card;
|
||||
}
|
||||
#ifdef __linux__
|
||||
for(int i = 0; <= MAX_DEVICES; ++i) {
|
||||
int v4l_fd;
|
||||
struct v4l2_capability cap;
|
||||
char *dev_name;
|
||||
|
||||
close(v4l_fd);
|
||||
size[input] = i;
|
||||
}
|
||||
#endif /* __linux__ */
|
||||
v4l_fd = open(dev_name, O_RDWR | O_NONBLOCK, 0);
|
||||
if (v4l_fd == -1)
|
||||
break;
|
||||
else {
|
||||
device_names[input][i] = video_cap.card;
|
||||
}
|
||||
|
||||
size[output] = 0;
|
||||
close(v4l_fd);
|
||||
size[input] = i;
|
||||
}
|
||||
#endif /* __linux__ */
|
||||
/* TODO: Add OSX implementation for listing input video devices */
|
||||
|
||||
// Start poll thread
|
||||
if (pthread_mutex_init(&mutex, NULL) != 0)
|
||||
return vde_InternalError;
|
||||
size[output] = 0;
|
||||
/* TODO: List output video devices */
|
||||
|
||||
pthread_t thread_id;
|
||||
if ( pthread_create(&thread_id, NULL, thread_poll, NULL) != 0 || pthread_detatch(thread_id) != 0)
|
||||
return vde_InternalError;
|
||||
// Start poll thread
|
||||
if (pthread_mutex_init(&mutex, NULL) != 0)
|
||||
return vde_InternalError;
|
||||
|
||||
pthread_t thread_id;
|
||||
if ( pthread_create(&thread_id, NULL, thread_poll, NULL) != 0 || pthread_detatch(thread_id) != 0)
|
||||
return vde_InternalError;
|
||||
|
||||
#ifdef VIDEO
|
||||
av = av_;
|
||||
av = av_;
|
||||
#endif /* VIDEO */
|
||||
|
||||
return (VideoDeviceError) vde_None;
|
||||
return (VideoDeviceError) vde_None;
|
||||
}
|
||||
|
||||
VideoDeviceError terminate_video_devices()
|
||||
{
|
||||
/* Cleanup if needed */
|
||||
thread_running = false;
|
||||
usleep(20000);
|
||||
/* Cleanup if needed */
|
||||
thread_running = false;
|
||||
usleep(20000);
|
||||
|
||||
if (pthread_mutex_destroy(&mutex) != 0)
|
||||
return (VideoDeviceError) vde_InternalError;
|
||||
if (pthread_mutex_destroy(&mutex) != 0)
|
||||
return (VideoDeviceError) vde_InternalError;
|
||||
|
||||
return (VideoDeviceError) vde_None;
|
||||
return (VideoDeviceError) vde_None;
|
||||
}
|
Loading…
Reference in New Issue
Block a user