cleanup: Remove the invoke* calls.

These were for testing, but aren't terribly useful.

Author: iphydf

.restyled.yaml

@@ -1,3 +1,5 @@
 ---
 exclude:
   - "gradlew"
+  - "**/*.cpp"
+  - "**/*.h"

docker/jvm.Dockerfile

@@ -41,3 +41,11 @@ COPY lib/ /work/jvm-toxcore-c/lib/
 ENV LD_LIBRARY_PATH=/work/jvm-toxcore-c/_install/host/lib
 ENV PATH=/work/jvm-toxcore-c/_install/host/bin:$PATH
 RUN ./gradlew build
+
+RUN javac -h . -cp /work/jvm-toxcore-c/lib/build/classes/kotlin/main:/work/jvm-toxcore-c/lib/build/classes/java/main \
+ lib/src/main/java/im/tox/tox4j/impl/jni/ToxAvJni.java \
+ lib/src/main/java/im/tox/tox4j/impl/jni/ToxCoreJni.java \
+ lib/src/main/java/im/tox/tox4j/impl/jni/ToxCryptoJni.java
+RUN diff -u lib/src/main/cpp/ToxCore/generated/im_tox_tox4j_impl_jni_ToxCoreJni.h im_tox_tox4j_impl_jni_ToxCoreJni.h \
+ && diff -u lib/src/main/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h im_tox_tox4j_impl_jni_ToxAvJni.h \
+ && diff -u lib/src/main/cpp/ToxCrypto/generated/im_tox_tox4j_impl_jni_ToxCryptoJni.h im_tox_tox4j_impl_jni_ToxCryptoJni.h

lib/src/main/cpp/ToxAv/generated/im_tox_tox4j_impl_jni_ToxAvJni.h

@@ -186,113 +186,3 @@ TOX_METHOD (void, Finalize,
 {
   instances.finalize (env, instanceNumber);
 }
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxAvJni
- * Method:    invokeAudioBitRate
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxAvJni_invokeAudioBitRate
-  (JNIEnv *env, jclass, jint instanceNumber, jint friendNumber, jint audioBitRate)
-{
-  return instances.with_instance (env, instanceNumber,
-    [=] (ToxAV *av, Events &events)
-      {
-        assert (av != nullptr);
-        tox4j_audio_bit_rate_cb (friendNumber, audioBitRate, &events);
-      }
-  );
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxAvJni
- * Method:    invokeVideoBitRate
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxAvJni_invokeVideoBitRate
-  (JNIEnv *env, jclass, jint instanceNumber, jint friendNumber, jint videoBitRate)
-{
-  return instances.with_instance (env, instanceNumber,
-    [=] (ToxAV *av, Events &events)
-      {
-        assert (av != nullptr);
-        tox4j_video_bit_rate_cb (friendNumber, videoBitRate, &events);
-      }
-  );
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxAvJni
- * Method:    invokeAudioReceiveFrame
- * Signature: (II[SII)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxAvJni_invokeAudioReceiveFrame
-  (JNIEnv *env, jclass, jint instanceNumber, jint friendNumber, jshortArray pcm, jint channels, jint samplingRate)
-{
-  return instances.with_instance (env, instanceNumber,
-    [=] (ToxAV *av, Events &events)
-      {
-        assert (av != nullptr);
-        auto pcmData = fromJavaArray (env, pcm);
-        tox4j_assert (pcmData.size () % channels == 0);
-        tox4j_audio_receive_frame_cb (friendNumber, pcmData.data (), pcmData.size () / channels, channels, samplingRate, &events);
-      }
-  );
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxAvJni
- * Method:    invokeCall
- * Signature: (IIZZ)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxAvJni_invokeCall
-  (JNIEnv *env, jclass, jint instanceNumber, jint friendNumber, jboolean audioEnabled, jboolean videoEnabled)
-{
-  return instances.with_instance (env, instanceNumber,
-    [=] (ToxAV *av, Events &events)
-      {
-        assert (av != nullptr);
-        tox4j_call_cb (friendNumber, audioEnabled, videoEnabled, &events);
-      }
-  );
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxAvJni
- * Method:    invokeCallState
- * Signature: (IILjava/util/Collection;)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxAvJni_invokeCallState
-  (JNIEnv *env, jclass, jint instanceNumber, jint friendNumber, jint callState)
-{
-  return instances.with_instance (env, instanceNumber,
-    [=] (ToxAV *av, Events &events)
-      {
-        assert (av != nullptr);
-        tox4j_call_state_cb (friendNumber, callState, &events);
-      }
-  );
-}
-
-/*
- * Class:     im_tox_tox4j_impl_jni_ToxAvJni
- * Method:    invokeVideoReceiveFrame
- * Signature: (IIII[B[B[B[BIIII)V
- */
-JNIEXPORT void JNICALL Java_im_tox_tox4j_impl_jni_ToxAvJni_invokeVideoReceiveFrame
-  (JNIEnv *env, jclass, jint instanceNumber, jint friendNumber, jint width, jint height, jbyteArray y, jbyteArray u, jbyteArray v, jint yStride, jint uStride, jint vStride)
-{
-  return instances.with_instance (env, instanceNumber,
-    [=] (ToxAV *av, Events &events)
-      {
-        assert (av != nullptr);
-        auto yData = fromJavaArray (env, y);
-        auto uData = fromJavaArray (env, u);
-        auto vData = fromJavaArray (env, v);
-        tox4j_assert (yData.size () == std::max<std::size_t> (width    , std::abs (yStride)) * height);
-        tox4j_assert (uData.size () == std::max<std::size_t> (width / 2, std::abs (uStride)) * (height / 2));
-        tox4j_assert (vData.size () == std::max<std::size_t> (width / 2, std::abs (vStride)) * (height / 2));
-        tox4j_video_receive_frame_cb (friendNumber, width, height, yData.data (), uData.data (), vData.data (), yStride, uStride, vStride, &events);
-      }
-  );
-}