From cb9232b3ab413fae7bcc2b94abd70f18ca02b263 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 03 十二月 2024 11:20:32 +0800
Subject: [PATCH] 增加铃声；增加TCP/UDP连接选择
---
Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/android_utils.h | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/android_utils.h b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/android_utils.h
index 8e75b0d..685614d 100755
--- a/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/android_utils.h
+++ b/Shared.IOS.HDLLinphoneSDK/Shared.IOS.HDLLinphoneSDK/Library/mediastreamer2.framework/Headers/android_utils.h
@@ -20,62 +20,70 @@
#ifndef android_utils_h
#define android_utils_h
+#include <mediastreamer2/mssndcard.h>
#include <mediastreamer2/msfilter.h>
#include <jni.h>
-enum _DeviceType{
- TELEPHONY,
- AUX_LINE,
- GENERIC_USB,
- HEADSET,
- MICROPHONE,
- EARPIECE,
- HEADPHONES,
- SPEAKER,
- BLUETOOTH,
- UNKNOWN
-};
-
/**
- * Android device type enum.
+ * Retrieve preferred buffer size from Mediastreamer Android Context.
**/
-typedef enum _DeviceType DeviceType;
+MS2_PUBLIC int ms_android_get_preferred_buffer_size();
/**
* Retrieve preferred sample rate from Mediastreamer Android Context.
**/
-int get_preferred_sample_rate();
+MS2_PUBLIC int ms_android_get_preferred_sample_rate();
/**
* Retrieve all devices in a given direction.
* Valid values for string dir are "all" "output" "input"
**/
-jobject get_all_devices(JNIEnv *env, const char * dir);
+MS2_PUBLIC jobjectArray ms_android_get_all_devices(JNIEnv *env, const char * dir);
/**
* Retrieve device ID for the device deviceInfo.
**/
-unsigned int get_device_id(JNIEnv *env, jobject deviceInfo);
+MS2_PUBLIC unsigned int ms_android_get_device_id(JNIEnv *env, jobject deviceInfo);
/**
* Retrieve the value of a JV class field fieldName.
**/
-int getJVIntField(JNIEnv *env, const char * className, const char * fieldName);
+MS2_PUBLIC int ms_android_getJVIntField(JNIEnv *env, const char * className, const char * fieldName);
/**
* Retrieve device type for the device deviceInfo.
**/
-DeviceType get_device_type(JNIEnv *env, jobject deviceInfo);
+MS2_PUBLIC MSSndCardDeviceType ms_android_get_device_type(JNIEnv *env, jobject deviceInfo);
/**
* Retrieve device capabilities (recorder or playback) for the device deviceInfo.
**/
-unsigned int get_device_capabilities(JNIEnv *env, jobject deviceInfo);
+MS2_PUBLIC unsigned int ms_android_get_device_capabilities(JNIEnv *env, jobject deviceInfo);
/**
* Retrieve product name for the device deviceInfo.
**/
-char * get_device_product_name(JNIEnv *env, jobject deviceInfo);
+MS2_PUBLIC char * ms_android_get_device_product_name(JNIEnv *env, jobject deviceInfo);
+
+/**
+ * Retrieve SDK version the app is running on.
+**/
+MS2_PUBLIC int ms_android_get_sdk_version(JNIEnv *env);
+
+/**
+ * Make upcalls to change device from mediastreamer.
+**/
+MS2_PUBLIC void ms_android_change_device(JNIEnv *env, MSSndCardDeviceType type);
+
+/**
+ * Make upcalls to enable/disable bluetooth devices from mediastreamer.
+**/
+MS2_PUBLIC void ms_android_set_bt_enable(JNIEnv *env, const bool_t enable);
+
+/**
+ * Hack required to have volume not set to 0 on some devices
+**/
+MS2_PUBLIC void ms_android_hack_volume(JNIEnv *env);
#ifdef __cplusplus
extern "C"{
--
Gitblit v1.8.0