Changeset 85 for trunk/sources/androidapplestreaming/src/jniwrapper.cpp

Timestamp:

08/20/10 04:21:17 (21 months ago)

Author:

shiretu

Message:

-- added event-based signaling to android apple streaming

File:

• trunk/sources/androidapplestreaming/src/jniwrapper.cpp (modified) (2 diffs)

trunk/sources/androidapplestreaming/src/jniwrapper.cpp

@@ -23 +23 @@
 
 extern "C" void Java_com_rtmpd_CommandsInterface_EnvRun(
-                JNIEnv* pEnv, jobject thiz, jstring host, jint port) {
-        EnvRun(pEnv->GetStringUTFChars(host, NULL), (uint16_t) port);
+                JNIEnv* pEnv, jobject thiz, jobject pInterface, jstring host, jint port) {
+        CallBackInfo ci;
+        ci.pEnv = pEnv;
+        ci.pInterface = pInterface;
+        EnvRun(pEnv->GetStringUTFChars(host, NULL), (uint16_t) port, ci);
 }
 
@@ -130 +133 @@
         return VariantToJObject(result, pEnv);
 }
-
-jobject VariantToJObject(Variant &value, JNIEnv* pEnv) {
-        switch ((VariantType) value) {
-                case V_NULL:
-                case V_UNDEFINED:
-                {
-                        return NULL;
-                }
-                case V_BOOL:
-                {
-                        jclass clazz = pEnv->FindClass("java/lang/Boolean");
-                        jmethodID constructor = pEnv->GetMethodID(clazz, "<init>", "(Z)V");
-                        return pEnv->NewObject(clazz, constructor, (bool)value);
-                }
-                case V_INT8:
-                case V_INT16:
-                case V_INT32:
-                case V_UINT8:
-                case V_UINT16:
-                {
-                        jclass clazz = pEnv->FindClass("java/lang/Integer");
-                        jmethodID constructor = pEnv->GetMethodID(clazz, "<init>", "(I)V");
-                        return pEnv->NewObject(clazz, constructor, (int32_t) value);
-                }
-                case V_INT64:
-                case V_UINT32:
-                {
-                        jclass clazz = pEnv->FindClass("java/lang/Long");
-                        jmethodID constructor = pEnv->GetMethodID(clazz, "<init>", "(J)V");
-                        return pEnv->NewObject(clazz, constructor, (int64_t) value);
-                }
-                case V_UINT64:
-                {
-                        NYI;
-                        return NULL;
-                }
-                case V_DOUBLE:
-                {
-                        jclass clazz = pEnv->FindClass("java/lang/Double");
-                        jmethodID constructor = pEnv->GetMethodID(clazz, "<init>", "(D)V");
-                        return pEnv->NewObject(clazz, constructor, (double) value);
-                }
-                case V_TIMESTAMP:
-                case V_DATE:
-                case V_TIME:
-                {
-                        NYI;
-                        return NULL;
-                }
-                case V_BYTEARRAY:
-                {
-                        NYI;
-                        return NULL;
-                }
-                case V_STRING:
-                {
-                        return pEnv->NewStringUTF(STR(value));
-                }
-                case V_TYPED_MAP:
-                {
-                        NYI;
-                        return NULL;
-                }
-                case V_MAP:
-                {
-                        jclass mapClazz = pEnv->FindClass("java/util/HashMap");
-                        jmethodID mapConstructor = pEnv->GetMethodID(mapClazz, "<init>", "()V");
-                        jmethodID mapPut = pEnv->GetMethodID(mapClazz, "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;");
-
-                        jclass longClazz = pEnv->FindClass("java/lang/Long");
-                        jmethodID longConstructor = pEnv->GetMethodID(longClazz, "<init>", "(J)V");
-
-                        jobject result = pEnv->NewObject(mapClazz, mapConstructor);
-
-                        FOR_MAP(value, string, Variant, i) {
-                                jobject key = NULL;
-                                if (MAP_KEY(i).find("__index__value__") == 0) {
-                                        key = pEnv->NewObject(longClazz, longConstructor,
-                                                        (int64_t) atol(STR(MAP_KEY(i).substr(16))));
-                                } else {
-                                        key = pEnv->NewStringUTF(STR(MAP_KEY(i)));
-                                }
-                                jobject value = VariantToJObject(MAP_VAL(i), pEnv);
-                                pEnv->CallObjectMethod(result, mapPut, key, value);
-                        }
-
-                        return result;
-                }
-                default:
-                {
-                        FATAL("Invalid variant type: %d", (VariantType) value);
-                        return NULL;
-                }
-        }
-}