Merge branch 'android' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into android

Conflicts: daemon/src/history/history.cpp
2025-08-12 22:09:25 +08:00 · 2013-04-25 14:44:08 -04:00
parent ac5b63f883 2fe0fffafd
commit 0ee2b621ee
9 changed files with 37 additions and 34 deletions
--- a/daemon/config.h
+++ b/daemon/config.h
@ -1,13 +1,12 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */

-#define HAVE_DBUS 0
-
 /* Use cc++ include prefix */
-#define CCPP_PREFIX 1
+/* #undef CCPP_PREFIX */

 /* Use commoncpp include prefix */
-/* #undef COMMONCPP_PREFIX */
+/* #define COMMONCPP_PREFIX 0 */
+#define CCPP_PREFIX 1

 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
   systems. This function is required for `alloca.c' support on those systems.
@ -24,6 +23,9 @@
   */
 #define HAVE_ALLOCA_H 1

+/* Define if you have alsa */
+#define HAVE_ALSA 0
+
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #define HAVE_ARPA_INET_H 1

@ -37,7 +39,7 @@
 #define HAVE_GETOPT_H 1

 /* Define if you have libgsm */
-#define HAVE_GSM 0
+#define HAVE_GSM 1

 /* Define if you have libiax2 */
 #define HAVE_IAX 0
@ -49,16 +51,16 @@
 #define HAVE_INTTYPES_H 1

 /* Define to 1 if you have the `gsm' library (-lgsm). */
-/* #undef HAVE_LIBGSM */
+#define HAVE_LIBGSM 1

 /* Define to 1 if you have the <libintl.h> header file. */
-/* #undef HAVE_LIBINTL_H */
+#define HAVE_LIBINTL_H 1

 /* Define to 1 if you have the `pcre' library (-lpcre). */
-/* #undef HAVE_LIBPCRE */
+#define HAVE_LIBPCRE 1

 /* Define to 1 if you have the `speex' library (-lspeex). */
-/* #undef HAVE_LIBSPEEX */
+#define HAVE_LIBSPEEX 1

 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
@ -94,7 +96,7 @@
 #define HAVE_SDES 0

 /* Define if you have libspeex */
-#define HAVE_SPEEX 0
+#define HAVE_SPEEX 1

 /* Define if you have libspeexdsp */
 #define HAVE_SPEEXDSP 0
@ -149,7 +151,7 @@
 #define LT_OBJDIR ".libs/"

 /* Name of package */
-#define PACKAGE "com.savoirfairelinux.sflphone"
+#define PACKAGE "sflphone"

 /* Define to the address where bug reports for this package should be sent. */
 #define PACKAGE_BUGREPORT "sflphoneteam@savoirfairelinux.com"
@ -158,7 +160,7 @@
 #define PACKAGE_NAME "sflphone"

 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "sflphone 1.1.0"
+#define PACKAGE_STRING "sflphone 1.2.0"

 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "sflphone"
@ -167,7 +169,7 @@
 #define PACKAGE_URL ""

 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.1.0"
+#define PACKAGE_VERSION "1.2.0"

 /* Define to necessary symbol if this constant uses a non-standard name on
   your system. */
@ -194,7 +196,7 @@
 #define TIME_WITH_SYS_TIME 1

 /* Version number of package */
-#define VERSION "1.1.0"
+#define VERSION "1.2.0"

 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
--- a/daemon/src/audio/codecs/audiocodecfactory.cpp
+++ b/daemon/src/audio/codecs/audiocodecfactory.cpp
@ -170,7 +170,7 @@ std::vector<sfl::Codec*> AudioCodecFactory::scanCodecDirectory()
    const char *progDir = fileutils::get_program_dir();

    if (progDir) {
-#if ANDROID
+#if defined(__ANDROID__)
        dirToScan.push_back(std::string(progDir) + DIR_SEPARATOR_STR + "lib/");
 #else
        dirToScan.push_back(std::string(progDir) + DIR_SEPARATOR_STR + "audio/codecs/");
@ -263,7 +263,7 @@ sfl::AudioCodec* AudioCodecFactory::instantiateCodec(int payload) const

            const char *error = dlerror();

-#if ANDROID
+#if defined(__ANDROID__)
            if (createCodec == NULL)
                ERROR("Could not instantiate codec");
 #else
--- a/daemon/src/dbus/Android.mk
+++ b/daemon/src/dbus/Android.mk
@ -32,10 +32,10 @@ LOCAL_SRC_FILES := $(video_SOURCES) $(network_SOURCES) \
 	callmanager.cpp \
    configurationmanager.cpp  \
    instance.cpp  \
-    dbusmanager.cpp
+    dbusmanager.cpp \
 #    callmanager-glue.h              \
 #    configurationmanager-glue.h     \
-#    instance-glue.h
+    instance-glue.h

 # FIXME
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. \
--- a/daemon/src/fileutils.cpp
+++ b/daemon/src/fileutils.cpp
@ -59,7 +59,7 @@ bool check_dir(const char *path)
    return true;
 }

-#if ANDROID
+#ifdef __ANDROID__
 static char *program_dir = "/data/data/com.savoirfairelinux.sflphone";
 #else
 static char *program_dir = NULL;
@ -96,7 +96,7 @@ std::string get_path_for_cache_android(void) {
 bool create_pidfile()
 {

-#if ANDROID
+#ifdef __ANDROID__
    std::string path = get_path_for_cache_android();
 #else
    std::string path = get_path_for_cache();
--- a/daemon/src/logger.h
+++ b/daemon/src/logger.h
@ -33,7 +33,7 @@

 #include <syslog.h>
 #include <pthread.h>
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <android/log.h>
 #endif

@ -48,7 +48,7 @@ bool getDebugMode();
 #define LOGGER(M, LEVEL, ...) Logger::log(LEVEL, "%s:%d:tid %lu:\t" M, __FILE__, \
                                          __LINE__, pthread_self() & 0xffff, ##__VA_ARGS__)

-#ifndef ANDROID
+#ifndef __ANDROID__
 #define ERROR(M, ...)   LOGGER(M, LOG_ERR, ##__VA_ARGS__)
 #define WARN(M, ...)    LOGGER(M, LOG_WARNING, ##__VA_ARGS__)
 #define INFO(M, ...)    LOGGER(M, LOG_INFO, ##__VA_ARGS__)
--- a/daemon/src/managerimpl.cpp
+++ b/daemon/src/managerimpl.cpp
@ -47,7 +47,7 @@
 #include "sip/sipaccount.h"
 #include "sip/sipcall.h"

-#ifndef ANDROID
+#ifndef __ANDROID__
 #include "im/instant_messaging.h"
 #endif

@ -62,7 +62,7 @@
 #include "config/yamlparser.h"
 #include "config/yamlemitter.h"

-#ifndef ANDROID
+#ifndef __ANDROID__
 #include "audio/alsa/alsalayer.h"
 #endif

@ -2126,7 +2126,7 @@ ManagerImpl::getTelephoneFile()
 */
 std::string ManagerImpl::retrieveConfigPath() const
 {
-#if ANDROID
+#ifdef __ANDROID__
    std::string configdir = "/data/data/com.savoirfairelinux.sflphone";
 #else
    std::string configdir = std::string(HOMEDIR) + DIR_SEPARATOR_STR +
--- a/daemon/src/preferences.cpp
+++ b/daemon/src/preferences.cpp
@ -35,14 +35,15 @@
 #include "preferences.h"
 #include "logger.h"
 #include "audio/audiolayer.h"
+#ifdef __ANDROID__
+#include "audio/opensl/opensllayer.h"
+#else
 #if HAVE_ALSA
 #include "audio/alsa/alsalayer.h"
 #endif
 #if HAVE_PULSE
 #include "audio/pulseaudio/pulselayer.h"
 #endif
-#if ANDROID
-#include "audio/opensl/opensllayer.h"
 #endif
 #include "config/yamlemitter.h"
 #include "config/yamlnode.h"
@ -323,7 +324,7 @@ void checkSoundCard(int &card, AudioLayer::PCMType stream)

 AudioLayer* AudioPreference::createAudioLayer()
 {
-#if ANDROID
+#ifdef __ANDROID__
    return new OpenSLLayer();
 #else
 #if HAVE_PULSE
--- a/daemon/src/sip/sipvoiplink.cpp
+++ b/daemon/src/sip/sipvoiplink.cpp
@ -65,7 +65,7 @@
 #include "dbus/video_controls.h"
 #endif

-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <pjsua-lib/pjsua.h>
 #include <android/log.h>
 #endif
@ -197,7 +197,7 @@ pj_bool_t transaction_response_cb(pjsip_rx_data *rdata)
    return PJ_FALSE;
 }

-#ifdef ANDROID
+#ifdef __ANDROID__
 void showMsg(const char *format, ...)
 {
    va_list arg;
@ -478,7 +478,7 @@ SIPVoIPLink::SIPVoIPLink() : sipTransport(endpt_, cp_, pool_), sipAccountMap_(),

    TRY(pjlib_util_init());

-#ifdef ANDROID
+#ifdef __ANDROID__
 	setSipLogFunc();
 #endif
    setSipLogLevel();
@ -630,7 +630,7 @@ void SIPVoIPLink::setSipLogLevel()
        level = level < 0 ? 0 : level;
    }

-#ifdef ANDROID
+#ifdef __ANDROID__
 	/* level = Manager::instance().getSipLogLevel(); */
    level = 6;
 #endif
@ -640,7 +640,7 @@ void SIPVoIPLink::setSipLogLevel()
 	DEBUG("SIP log level set to %d", level);
 }

-#ifdef ANDROID
+#ifdef __ANDROID__
 void SIPVoIPLink::setSipLogFunc()
 {
 	static pj_log_func *currentFunc = (pj_log_func*) pj_log_get_log_func();
--- a/daemon/src/sip/sipvoiplink.h
+++ b/daemon/src/sip/sipvoiplink.h
@ -90,7 +90,7 @@ class SIPVoIPLink : public VoIPLink {
         */
        static void setSipLogLevel();

-#ifdef ANDROID
+#ifdef __ANDROID__
        static void setSipLogFunc();
 #endif