Commit 2130f067 authored by Adrien Béraud's avatar Adrien Béraud

sources: rename to jami

* rename namespace from ring to jami
* rename logs methods from RING_* to JAMI_*
* rename RING_VIDEO to ENABLE_VIDEO

Change-Id: Ic98498652d7059fafe58a96220d565bcdfa53658
parent 997147fc
...@@ -169,7 +169,7 @@ your system. */ ...@@ -169,7 +169,7 @@ your system. */
/* #undef PTHREAD_CREATE_JOINABLE */ /* #undef PTHREAD_CREATE_JOINABLE */
/* Video support enabled */ /* Video support enabled */
#define RING_VIDEO /**/ #define ENABLE_VIDEO /**/
/* Name directory service support enabled */ /* Name directory service support enabled */
#define HAVE_RINGNS 1 #define HAVE_RINGNS 1
......
...@@ -11,7 +11,7 @@ BUILT_SOURCES+=dbuspresencemanager.adaptor.h ...@@ -11,7 +11,7 @@ BUILT_SOURCES+=dbuspresencemanager.adaptor.h
dbuspresencemanager.adaptor.h: cx.ring.Ring.PresenceManager.xml Makefile.am dbuspresencemanager.adaptor.h: cx.ring.Ring.PresenceManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@ dbusxx-xml2cpp $< --adaptor=$@
if RING_VIDEO if ENABLE_VIDEO
BUILT_SOURCES+=dbusvideomanager.adaptor.h BUILT_SOURCES+=dbusvideomanager.adaptor.h
dbusvideomanager.adaptor.h: cx.ring.Ring.VideoManager.xml Makefile.am dbusvideomanager.adaptor.h: cx.ring.Ring.VideoManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@ dbusxx-xml2cpp $< --adaptor=$@
...@@ -43,7 +43,7 @@ libclient_dbus_la_SOURCES = \ ...@@ -43,7 +43,7 @@ libclient_dbus_la_SOURCES = \
dbuspresencemanager.h \ dbuspresencemanager.h \
$(BUILT_SOURCES) $(BUILT_SOURCES)
if RING_VIDEO if ENABLE_VIDEO
libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h libclient_dbus_la_SOURCES += dbusvideomanager.cpp dbusvideomanager.h
endif endif
...@@ -66,7 +66,7 @@ interface_DATA = cx.ring.Ring.CallManager.xml \ ...@@ -66,7 +66,7 @@ interface_DATA = cx.ring.Ring.CallManager.xml \
cx.ring.Ring.Instance.xml \ cx.ring.Ring.Instance.xml \
cx.ring.Ring.PresenceManager.xml cx.ring.Ring.PresenceManager.xml
if RING_VIDEO if ENABLE_VIDEO
interface_DATA += cx.ring.Ring.VideoManager.xml interface_DATA += cx.ring.Ring.VideoManager.xml
endif endif
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#include "datatransfer_interface.h" #include "datatransfer_interface.h"
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
#include "dbusvideomanager.h" #include "dbusvideomanager.h"
#include "videomanager_interface.h" #include "videomanager_interface.h"
#endif #endif
...@@ -85,7 +85,7 @@ DBusClient::DBusClient(int flags, bool persistent) ...@@ -85,7 +85,7 @@ DBusClient::DBusClient(int flags, bool persistent)
instanceManager_.reset(new DBusInstance {sessionConnection, onNoMoreClientFunc}); instanceManager_.reset(new DBusInstance {sessionConnection, onNoMoreClientFunc});
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
videoManager_.reset(new DBusVideoManager {sessionConnection}); videoManager_.reset(new DBusVideoManager {sessionConnection});
#endif #endif
} catch (const DBus::Error &err) { } catch (const DBus::Error &err) {
...@@ -103,7 +103,7 @@ DBusClient::~DBusClient() ...@@ -103,7 +103,7 @@ DBusClient::~DBusClient()
// instances destruction order is important // instances destruction order is important
// so we enforce it here // so we enforce it here
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
videoManager_.reset(); videoManager_.reset();
#endif #endif
instanceManager_.reset(); instanceManager_.reset();
...@@ -131,7 +131,7 @@ DBusClient::initLibrary(int flags) ...@@ -131,7 +131,7 @@ DBusClient::initLibrary(int flags)
auto confM = configurationManager_.get(); auto confM = configurationManager_.get();
auto presM = presenceManager_.get(); auto presM = presenceManager_.get();
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
using DRing::VideoSignal; using DRing::VideoSignal;
auto videoM = videoManager_.get(); auto videoM = videoManager_.get();
#endif #endif
...@@ -208,7 +208,7 @@ DBusClient::initLibrary(int flags) ...@@ -208,7 +208,7 @@ DBusClient::initLibrary(int flags)
exportable_callback<DataTransferSignal::DataTransferEvent>(bind(&DBusConfigurationManager::dataTransferEvent, confM, _1, _2)), exportable_callback<DataTransferSignal::DataTransferEvent>(bind(&DBusConfigurationManager::dataTransferEvent, confM, _1, _2)),
}; };
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
// Video event handlers // Video event handlers
const std::map<std::string, SharedCallback> videoEvHandlers = { const std::map<std::string, SharedCallback> videoEvHandlers = {
exportable_callback<VideoSignal::DeviceEvent>(bind(&DBusVideoManager::deviceEvent, videoM)), exportable_callback<VideoSignal::DeviceEvent>(bind(&DBusVideoManager::deviceEvent, videoM)),
...@@ -225,7 +225,7 @@ DBusClient::initLibrary(int flags) ...@@ -225,7 +225,7 @@ DBusClient::initLibrary(int flags)
registerSignalHandlers(presEvHandlers); registerSignalHandlers(presEvHandlers);
registerSignalHandlers(audioEvHandlers); registerSignalHandlers(audioEvHandlers);
registerSignalHandlers(dataXferEvHandlers); registerSignalHandlers(dataXferEvHandlers);
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
registerSignalHandlers(videoEvHandlers); registerSignalHandlers(videoEvHandlers);
#endif #endif
......
...@@ -35,7 +35,7 @@ class DBusNetworkManager; ...@@ -35,7 +35,7 @@ class DBusNetworkManager;
class DBusInstance; class DBusInstance;
class DBusPresenceManager; class DBusPresenceManager;
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
class DBusVideoManager; class DBusVideoManager;
#endif #endif
...@@ -64,7 +64,7 @@ class DRING_PUBLIC DBusClient { ...@@ -64,7 +64,7 @@ class DRING_PUBLIC DBusClient {
std::unique_ptr<DBusPresenceManager> presenceManager_; std::unique_ptr<DBusPresenceManager> presenceManager_;
std::unique_ptr<DBusInstance> instanceManager_; std::unique_ptr<DBusInstance> instanceManager_;
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
std::unique_ptr<DBusVideoManager> videoManager_; std::unique_ptr<DBusVideoManager> videoManager_;
#endif #endif
}; };
...@@ -27,11 +27,11 @@ JavaVM *gJavaVM; ...@@ -27,11 +27,11 @@ JavaVM *gJavaVM;
const char *kringservicePath = "cx/ring/daemon/RingserviceJNI"; const char *kringservicePath = "cx/ring/daemon/RingserviceJNI";
void deinitClassHelper(JNIEnv *env, jobject obj) { void deinitClassHelper(JNIEnv *env, jobject obj) {
RING_INFO("deinitClassHelper"); JAMI_INFO("deinitClassHelper");
/* delete cached object instances */ /* delete cached object instances */
env->DeleteGlobalRef(obj); env->DeleteGlobalRef(obj);
RING_INFO("deinitClassHelper: object %p deleted", obj); JAMI_INFO("deinitClassHelper: object %p deleted", obj);
} }
JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
...@@ -39,26 +39,26 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { ...@@ -39,26 +39,26 @@ JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) {
jclass clazz; jclass clazz;
jint r; jint r;
RING_INFO("JNI_OnLoad"); JAMI_INFO("JNI_OnLoad");
if (av_jni_set_java_vm(vm, reserved)) { if (av_jni_set_java_vm(vm, reserved)) {
RING_ERR("JNI_OnLoad: av_jni_set_java_vm failed"); JAMI_ERR("JNI_OnLoad: av_jni_set_java_vm failed");
} }
//Assume it is c++ //Assume it is c++
r = vm->GetEnv ((void **) &env, JNI_VERSION_1_6); r = vm->GetEnv ((void **) &env, JNI_VERSION_1_6);
if (r != JNI_OK) { if (r != JNI_OK) {
RING_ERR("JNI_OnLoad: failed to get the environment using GetEnv()"); JAMI_ERR("JNI_OnLoad: failed to get the environment using GetEnv()");
return -1; return -1;
} }
RING_INFO("JNI_Onload: GetEnv %p", env); JAMI_INFO("JNI_Onload: GetEnv %p", env);
clazz = env->FindClass (kringservicePath); clazz = env->FindClass (kringservicePath);
if (!clazz) { if (!clazz) {
RING_ERR("JNI_Onload: whoops, %s class not found!", kringservicePath); JAMI_ERR("JNI_Onload: whoops, %s class not found!", kringservicePath);
} }
gJavaVM = vm; gJavaVM = vm;
RING_INFO("JNI_Onload: JavaVM %p", gJavaVM); JAMI_INFO("JNI_Onload: JavaVM %p", gJavaVM);
/* put instances of class object we need into cache */ /* put instances of class object we need into cache */
//initClassHelper(env, kManagerPath, &gManagerObject); //initClassHelper(env, kManagerPath, &gManagerObject);
...@@ -77,24 +77,24 @@ void JNI_OnUnLoad(JavaVM* vm, void* reserved) { ...@@ -77,24 +77,24 @@ void JNI_OnUnLoad(JavaVM* vm, void* reserved) {
JNIEnv* env; JNIEnv* env;
jclass clazz; jclass clazz;
RING_INFO("JNI_OnUnLoad"); JAMI_INFO("JNI_OnUnLoad");
/* get env */ /* get env */
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) { if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
RING_ERR("JNI_OnUnLoad: failed to get the environment using GetEnv()"); JAMI_ERR("JNI_OnUnLoad: failed to get the environment using GetEnv()");
return; return;
} }
RING_INFO("JNI_OnUnLoad: GetEnv %p", env); JAMI_INFO("JNI_OnUnLoad: GetEnv %p", env);
/* Get jclass with env->FindClass */ /* Get jclass with env->FindClass */
clazz = env->FindClass(kringservicePath); clazz = env->FindClass(kringservicePath);
if (!clazz) { if (!clazz) {
RING_ERR("JNI_OnUnLoad: whoops, %s class not found!", kringservicePath); JAMI_ERR("JNI_OnUnLoad: whoops, %s class not found!", kringservicePath);
} }
/* remove instances of class object we need into cache */ /* remove instances of class object we need into cache */
//deinitClassHelper(env, gManagerObject); //deinitClassHelper(env, gManagerObject);
env->UnregisterNatives(clazz); env->UnregisterNatives(clazz);
RING_INFO("JNI_OnUnLoad: Native functions unregistered"); JAMI_INFO("JNI_OnUnLoad: Native functions unregistered");
} }
...@@ -56,7 +56,7 @@ print_title() ...@@ -56,7 +56,7 @@ print_title()
<< "Jami Daemon " << DRing::version() << "Jami Daemon " << DRing::version()
<< ", by Savoir-faire Linux 2004-2019" << std::endl << ", by Savoir-faire Linux 2004-2019" << std::endl
<< "https://jami.net/" << std::endl << "https://jami.net/" << std::endl
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl << "[Video support enabled]" << std::endl
#endif #endif
<< std::endl; << std::endl;
...@@ -191,7 +191,7 @@ main(int argc, char *argv []) ...@@ -191,7 +191,7 @@ main(int argc, char *argv [])
std::vector<char> writable(programName.size() + 1); std::vector<char> writable(programName.size() + 1);
std::copy(programName.begin(), programName.end(), writable.begin()); std::copy(programName.begin(), programName.end(), writable.begin());
ring::fileutils::set_program_dir(writable.data()); jami::fileutils::set_program_dir(writable.data());
#ifdef TOP_BUILDDIR #ifdef TOP_BUILDDIR
if (!getenv("CODECS_PATH")) if (!getenv("CODECS_PATH"))
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "callmanager_interface.h" #include "callmanager_interface.h"
#include "configurationmanager_interface.h" #include "configurationmanager_interface.h"
#include "presencemanager_interface.h" #include "presencemanager_interface.h"
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
#include "videomanager_interface.h" #include "videomanager_interface.h"
#endif #endif
#include "fileutils.h" #include "fileutils.h"
...@@ -45,7 +45,7 @@ print_title() ...@@ -45,7 +45,7 @@ print_title()
<< "Jami Daemon " << DRing::version() << "Jami Daemon " << DRing::version()
<< ", by Savoir-faire Linux 2004-2019" << std::endl << ", by Savoir-faire Linux 2004-2019" << std::endl
<< "https://jami.net/" << std::endl << "https://jami.net/" << std::endl
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl << "[Video support enabled]" << std::endl
#endif #endif
<< std::endl; << std::endl;
...@@ -197,7 +197,7 @@ main(int argc, char *argv []) ...@@ -197,7 +197,7 @@ main(int argc, char *argv [])
std::vector<char> writable(programName.size() + 1); std::vector<char> writable(programName.size() + 1);
std::copy(programName.begin(), programName.end(), writable.begin()); std::copy(programName.begin(), programName.end(), writable.begin());
ring::fileutils::set_program_dir(writable.data()); jami::fileutils::set_program_dir(writable.data());
#ifdef TOP_BUILDDIR #ifdef TOP_BUILDDIR
if (!getenv("CODECS_PATH")) if (!getenv("CODECS_PATH"))
......
...@@ -35,7 +35,7 @@ RestClient::RestClient(int port, int flags, bool persistent) : ...@@ -35,7 +35,7 @@ RestClient::RestClient(int port, int flags, bool persistent) :
settings_ = std::make_shared<restbed::Settings>(); settings_ = std::make_shared<restbed::Settings>();
settings_->set_port(port); settings_->set_port(port);
settings_->set_default_header( "Connection", "close" ); settings_->set_default_header( "Connection", "close" );
RING_INFO("Restclient running on port [%d]", port); JAMI_INFO("Restclient running on port [%d]", port);
// Make it run in a thread, because this is a blocking function // Make it run in a thread, because this is a blocking function
restbed = std::thread([this](){ restbed = std::thread([this](){
...@@ -45,7 +45,7 @@ RestClient::RestClient(int port, int flags, bool persistent) : ...@@ -45,7 +45,7 @@ RestClient::RestClient(int port, int flags, bool persistent) :
RestClient::~RestClient() RestClient::~RestClient()
{ {
RING_INFO("destroying RestClient"); JAMI_INFO("destroying RestClient");
exit(); exit();
} }
...@@ -53,7 +53,7 @@ int ...@@ -53,7 +53,7 @@ int
RestClient::event_loop() noexcept RestClient::event_loop() noexcept
{ {
// While the client is running, the events are polled every 10 milliseconds // While the client is running, the events are polled every 10 milliseconds
RING_INFO("Restclient starting to poll events"); JAMI_INFO("Restclient starting to poll events");
while(!pollNoMore_) while(!pollNoMore_)
{ {
std::this_thread::sleep_for(std::chrono::milliseconds(50)); std::this_thread::sleep_for(std::chrono::milliseconds(50));
...@@ -96,7 +96,7 @@ RestClient::initLib(int flags) ...@@ -96,7 +96,7 @@ RestClient::initLib(int flags)
auto confM = configurationManager_.get(); auto confM = configurationManager_.get();
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
using DRing::VideoSignal; using DRing::VideoSignal;
#endif #endif
...@@ -125,11 +125,11 @@ RestClient::initLib(int flags) ...@@ -125,11 +125,11 @@ RestClient::initLib(int flags)
const std::map<std::string, SharedCallback> configEvHandlers = { const std::map<std::string, SharedCallback> configEvHandlers = {
exportable_callback<ConfigurationSignal::IncomingAccountMessage>([] exportable_callback<ConfigurationSignal::IncomingAccountMessage>([]
(const std::string& accountID, const std::string& from, const std::map<std::string, std::string>& payloads){ (const std::string& accountID, const std::string& from, const std::map<std::string, std::string>& payloads){
RING_INFO("accountID : %s", accountID.c_str()); JAMI_INFO("accountID : %s", accountID.c_str());
RING_INFO("from : %s", from.c_str()); JAMI_INFO("from : %s", from.c_str());
RING_INFO("payloads"); JAMI_INFO("payloads");
for(auto& it : payloads) for(auto& it : payloads)
RING_INFO("%s : %s", it.first.c_str(), it.second.c_str()); JAMI_INFO("%s : %s", it.first.c_str(), it.second.c_str());
}), }),
registeredNameFoundCb, registeredNameFoundCb,
...@@ -143,7 +143,7 @@ RestClient::initLib(int flags) ...@@ -143,7 +143,7 @@ RestClient::initLib(int flags)
// Dummy callbacks are registered for the other managers // Dummy callbacks are registered for the other managers
registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>()); registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>());
registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>()); registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>());
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>()); registerSignalHandlers(std::map<std::string, std::shared_ptr<DRing::CallbackWrapperBase>>());
#endif #endif
...@@ -170,7 +170,7 @@ RestClient::initResources() ...@@ -170,7 +170,7 @@ RestClient::initResources()
default_res->set_path("/"); default_res->set_path("/");
default_res->set_method_handler("GET", [](const std::shared_ptr<restbed::Session> session){ default_res->set_method_handler("GET", [](const std::shared_ptr<restbed::Session> session){
RING_INFO("[%s] GET /", session->get_origin().c_str()); JAMI_INFO("[%s] GET /", session->get_origin().c_str());
std::string body = "Available routes are : \r\n/configurationManager\r\n/videoManager\r\n"; std::string body = "Available routes are : \r\n/configurationManager\r\n/videoManager\r\n";
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "dring/callmanager_interface.h" #include "dring/callmanager_interface.h"
#include "dring/configurationmanager_interface.h" #include "dring/configurationmanager_interface.h"
#include "dring/presencemanager_interface.h" #include "dring/presencemanager_interface.h"
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
#include "dring/videomanager_interface.h" #include "dring/videomanager_interface.h"
#endif #endif
#include "logger.h" #include "logger.h"
......
This diff is collapsed.
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "dring/callmanager_interface.h" #include "dring/callmanager_interface.h"
#include "dring/configurationmanager_interface.h" #include "dring/configurationmanager_interface.h"
#include "dring/presencemanager_interface.h" #include "dring/presencemanager_interface.h"
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
#include "dring/videomanager_interface.h" #include "dring/videomanager_interface.h"
#endif #endif
#include "logger.h" #include "logger.h"
......
...@@ -92,7 +92,7 @@ RestVideoManager::populateResources() ...@@ -92,7 +92,7 @@ RestVideoManager::populateResources()
void void
RestVideoManager::defaultRoute(const std::shared_ptr<restbed::Session> session) RestVideoManager::defaultRoute(const std::shared_ptr<restbed::Session> session)
{ {
RING_INFO("[%s] GET /videoManager", session->get_origin().c_str()); JAMI_INFO("[%s] GET /videoManager", session->get_origin().c_str());
std::string body = "Available routes are : \r\n"; std::string body = "Available routes are : \r\n";
...@@ -107,7 +107,7 @@ RestVideoManager::defaultRoute(const std::shared_ptr<restbed::Session> session) ...@@ -107,7 +107,7 @@ RestVideoManager::defaultRoute(const std::shared_ptr<restbed::Session> session)
void RestVideoManager::getDeviceList(const std::shared_ptr<restbed::Session> session) void RestVideoManager::getDeviceList(const std::shared_ptr<restbed::Session> session)
{ {
RING_INFO("[%s] GET /deviceList", session->get_origin().c_str()); JAMI_INFO("[%s] GET /deviceList", session->get_origin().c_str());
std::vector<std::string> list = DRing::getDeviceList(); std::vector<std::string> list = DRing::getDeviceList();
std::string body = ""; std::string body = "";
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "dring/callmanager_interface.h" #include "dring/callmanager_interface.h"
#include "dring/configurationmanager_interface.h" #include "dring/configurationmanager_interface.h"
#include "dring/presencemanager_interface.h" #include "dring/presencemanager_interface.h"
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
#include "dring/videomanager_interface.h" #include "dring/videomanager_interface.h"
#endif #endif
#include "logger.h" #include "logger.h"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "callmanager_interface.h" #include "callmanager_interface.h"
#include "configurationmanager_interface.h" #include "configurationmanager_interface.h"
#include "presencemanager_interface.h" #include "presencemanager_interface.h"
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
#include "videomanager_interface.h" #include "videomanager_interface.h"
#endif #endif
#include "fileutils.h" #include "fileutils.h"
...@@ -49,7 +49,7 @@ print_title() ...@@ -49,7 +49,7 @@ print_title()
<< "Jami Daemon " << DRing::version() << "Jami Daemon " << DRing::version()
<< ", by Savoir-faire Linux 2004-2019" << std::endl << ", by Savoir-faire Linux 2004-2019" << std::endl
<< "https://jami.net/" << std::endl << "https://jami.net/" << std::endl
#ifdef RING_VIDEO #ifdef ENABLE_VIDEO
<< "[Video support enabled]" << std::endl << "[Video support enabled]" << std::endl
#endif #endif
<< std::endl; << std::endl;
...@@ -213,7 +213,7 @@ main(int argc, char *argv []) ...@@ -213,7 +213,7 @@ main(int argc, char *argv [])
std::vector<char> writable(programName.size() + 1); std::vector<char> writable(programName.size() + 1);
std::copy(std::begin(programName), std::end(programName),std::begin(writable)); std::copy(std::begin(programName), std::end(programName),std::begin(writable));
ring::fileutils::set_program_dir(writable.data()); jami::fileutils::set_program_dir(writable.data());
print_title(); print_title();
......
...@@ -481,15 +481,15 @@ AC_ARG_ENABLE([video], AS_HELP_STRING([--disable-video], [Disable video])) ...@@ -481,15 +481,15 @@ AC_ARG_ENABLE([video], AS_HELP_STRING([--disable-video], [Disable video]))
AS_IF([test "x$enable_video" != "xno"], AS_IF([test "x$enable_video" != "xno"],
[ [
AC_DEFINE(RING_VIDEO, [], [Video support enabled]) AC_DEFINE(ENABLE_VIDEO, [], [Video support enabled])
AM_CONDITIONAL(RING_VIDEO, true) AM_CONDITIONAL(ENABLE_VIDEO, true)
AS_IF([test "$SYS" = linux && test -z "${HAVE_ANDROID_FALSE}"],[ AS_IF([test "$SYS" = linux && test -z "${HAVE_ANDROID_FALSE}"],[
PKG_CHECK_MODULES(UDEV, libudev,, AC_MSG_ERROR([Missing libudev development files])) PKG_CHECK_MODULES(UDEV, libudev,, AC_MSG_ERROR([Missing libudev development files]))
],[ ],[
]) ])
], ],
[ [
AM_CONDITIONAL(RING_VIDEO, false) AM_CONDITIONAL(ENABLE_VIDEO, false)
]); ]);
AC_ARG_ENABLE([accel], AS_HELP_STRING([--disable-accel], [Disable all hardware accelerations (enabled by default)])) AC_ARG_ENABLE([accel], AS_HELP_STRING([--disable-accel], [Disable all hardware accelerations (enabled by default)]))
...@@ -527,7 +527,7 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [ ...@@ -527,7 +527,7 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
AC_CHECK_HEADER([VideoToolbox/VideoToolbox.h], [ AC_CHECK_HEADER([VideoToolbox/VideoToolbox.h], [
AC_CHECK_HEADER([libavcodec/videotoolbox.h], [ AC_CHECK_HEADER([libavcodec/videotoolbox.h], [
ring_vt="yes" ring_vt="yes"
AC_DEFINE([RING_VIDEOTOOLBOX], [1], [Defined if videotoolbox is available]) AC_DEFINE([ENABLE_VIDEOTOOLBOX], [1], [Defined if videotoolbox is available])
]) ])
]) ])
]) ])
...@@ -536,7 +536,7 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [ ...@@ -536,7 +536,7 @@ AS_IF([test "x$enable_video" != "xno" -a "x$enable_accel" != "xno"], [
AM_CONDITIONAL([RING_ACCEL], [test "x${ring_accel}" = "xyes"]) AM_CONDITIONAL([RING_ACCEL], [test "x${ring_accel}" = "xyes"])
AM_CONDITIONAL([RING_VAAPI], [test "x${ring_vaapi}" = "xyes"]) AM_CONDITIONAL([RING_VAAPI], [test "x${ring_vaapi}" = "xyes"])
AM_CONDITIONAL([RING_VDPAU], [test "x${ring_vdpau}" = "xyes"]) AM_CONDITIONAL([RING_VDPAU], [test "x${ring_vdpau}" = "xyes"])
AM_CONDITIONAL([RING_VIDEOTOOLBOX], [test "x${ring_vt}" = "xyes"]) AM_CONDITIONAL([ENABLE_VIDEOTOOLBOX], [test "x${ring_vt}" = "xyes"])
dnl check for GnuTLS dnl check for GnuTLS
PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.4.14], [HAVE_GNUTLS=1], [HAVE_GNUTLS=0]) PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.4.14], [HAVE_GNUTLS=1], [HAVE_GNUTLS=0])
......
include ../globals.mk include ../globals.mk
RING_VIDEO_LIBS= ENABLE_VIDEO_LIBS=
if RING_VIDEO if ENABLE_VIDEO
RING_VIDEO_LIBS+=./media/video/libvideo.la