StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Moved event to toxav

Browse Source
This commit is contained in:
mannol 2014-02-15 22:36:15 +01:00
parent b47ae4f595
commit 272ed7e6db
14 changed files with 64 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -349,12 +349,16 @@ AC_C_BIGENDIAN
AC_FUNC_FORK
AC_CHECK_FUNCS([gettimeofday memset socket strchr malloc])
AX_PTHREAD(
[],
[
AC_MSG_ERROR([Error: required pthread library not found])
]
)
if test "x$BUILD_AV" = "xyes"; then
AX_PTHREAD(
[],
[
AC_MSG_WARN([disabling AV support: required pthread library not found])
BUILD_AV="no"
BUILD_PHONE="no"
]
)
fi
if test "x$BUILD_PHONE" = "xyes"; then
PKG_CHECK_MODULES([AVFORMAT], [libavformat],

13
toxav/Makefile.inc
View File

@ -4,7 +4,9 @@ lib_LTLIBRARIES += libtoxav.la
libtoxav_la_include_HEADERS = ../toxav/toxav.h
libtoxav_la_includedir = $(includedir)/tox
libtoxav_la_SOURCES = ../toxav/rtp.h \
libtoxav_la_SOURCES = ../toxav/event.h \
../toxav/event.c \
../toxav/rtp.h \
../toxav/rtp.c \
../toxav/msi.h \
../toxav/msi.c \
@ -18,7 +20,8 @@ libtoxav_la_CFLAGS = -I../toxcore \
-I../toxav \
$(NACL_CFLAGS) \
$(OPUS_CFLAGS) \
$(VPX_CFLAGS)
$(VPX_CFLAGS) \
$(PTHREAD_CFLAGS)
libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
$(NACL_LDFLAGS) \
@ -26,7 +29,8 @@ libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
libtoxav_la_LIBS = $(NACL_LIBS) \
$(OPUS_LIBS) \
$(VPX_LIBS)
$(VPX_LIBS) \
$(PTHREAD_LIBS)
endif
@ -63,7 +67,8 @@ phone_LDADD = libtoxav.la \
$(SDL_LIBS) \
$(OPENAL_LIBS) \
$(OPUS_LIBS) \
$(VPX_LIBS)
$(VPX_LIBS)\
$(PTHREAD_LIBS)
endif

7
toxcore/event.c → toxav/event.c
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/
@ -30,8 +29,8 @@
#include <stdlib.h>
#include "event.h"
#include "util.h"
#include "network.h"
#include "../toxcore/util.h"
#include "../toxcore/network.h"
#define _GNU_SOURCE

3
toxcore/event.h → toxav/event.h
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/

31
toxav/media.c
View File

@ -1,27 +1,26 @@
/* AV_codec.c
// *
* Audio and video codec intitialisation, encoding/decoding and playback
/** media.c
*
* Audio and video codec intitialization, encoding/decoding and playback
*
* Copyright (C) 2013 Tox project All Rights Reserved.
* Copyright (C) 2013 Tox project All Rights Reserved.
*
* This file is part of Tox.
* This file is part of Tox.
*
* Tox is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* Tox is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tox 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 General Public License for more details.
* Tox 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*/
/*----------------------------------------------------------------------------------*/
#ifdef HAVE_CONFIG_H
#include "config.h"

31
toxav/media.h
View File

@ -1,27 +1,26 @@
/* AV_codec.h
/** media.h
*
* Audio and video codec intitialization, encoding/decoding and playback
*
* Audio and video codec intitialisation, encoding/decoding and playback
* Copyright (C) 2013 Tox project All Rights Reserved.
*
* Copyright (C) 2013 Tox project All Rights Reserved.
* This file is part of Tox.
*
* This file is part of Tox.
* Tox is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Tox is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* Tox 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 General Public License for more details.
*
* Tox 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
* You should have received a copy of the GNU General Public License
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*/
/*----------------------------------------------------------------------------------*/
#ifndef _AVCODEC_H_
#define _AVCODEC_H_

5
toxav/msi.c
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/
@ -30,9 +29,9 @@
#define _BSD_SOURCE
#include "msi.h"
#include "event.h"
#include "../toxcore/util.h"
#include "../toxcore/network.h"
#include "../toxcore/event.h"
#include "../toxcore/Messenger.h"
#include <assert.h>

3
toxav/msi.h
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/
#ifndef __TOXMSI

3
toxav/phone.c
View File

@ -47,7 +47,7 @@
//#include "media.h"
#include "toxav.h"
#include "../toxcore/event.h"
#include "event.h"
#include "../toxcore/tox.h"
#ifdef TOX_FFMPEG
@ -904,6 +904,7 @@ av_session_t* av_init_session()
char dev[2]; char* left;
char* warned_ = fgets(dev, 2, stdin);
(void)warned_;
long selection = strtol(dev, &left, 10);
if ( *left ) {

3
toxav/rtp.c
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/
#ifdef HAVE_CONFIG_H

3
toxav/rtp.h
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/
#ifndef __TOXRTP

3
toxav/toxav.c
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/
#ifdef HAVE_CONFIG_H

3
toxav/toxav.h
View File

@ -18,8 +18,7 @@
* along with Tox. If not, see <http://www.gnu.org/licenses/>.
*
*
* Report bugs/suggestions to me ( mannol ) at either #tox-dev @ freenode.net:6667 or
* my email: eniz_vukovic@hotmail.com
* Report bugs/suggestions at #tox-dev @ freenode.net:6667
*/

8
toxcore/Makefile.inc
View File

@ -29,8 +29,6 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \
../toxcore/group_chats.c \
../toxcore/assoc.h \
../toxcore/assoc.c \
../toxcore/event.h \
../toxcore/event.c \
../toxcore/onion.h \
../toxcore/onion.c \
../toxcore/onion_announce.h \
@ -42,8 +40,7 @@ libtoxcore_la_SOURCES = ../toxcore/DHT.h \
libtoxcore_la_CFLAGS = -I$(top_srcdir) \
-I$(top_srcdir)/toxcore \
$(LIBSODIUM_CFLAGS) \
$(NACL_CFLAGS) \
$(PTHREAD_CFLAGS)
$(NACL_CFLAGS)
libtoxcore_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \
$(EXTRA_LT_LDFLAGS) \
@ -52,5 +49,4 @@ libtoxcore_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \
$(WINSOCK2_LIBS)
libtoxcore_la_LIBS = $(LIBSODIUM_LIBS) \
$(NAC_LIBS) \
$(PTHREAD_LIBS)
$(NAC_LIBS)