Merge branch 'master' of http://8.136.234.80:10002/WangYongJun/GameConsole

app/src/main/cpp/frontend/drivers/platform_unix.c

@@ -1607,6 +1607,16 @@ static int frontend_unix_get_rating(void)
    return -1;
 }
 
+static void frontend_unix_content_loaded(void) {
+   struct android_app *app = g_android;
+   JNIEnv *env = NULL;
+
+   CALL_VOID_METHOD(
+        env, app->activity->clazz,
+        app->contentLoaded
+   );
+}
+
 static enum frontend_powerstate frontend_unix_get_powerstate(
       int *seconds, int *percent)
 {
@@ -2561,6 +2571,8 @@ static void frontend_unix_init(void *data)
                  "openGameDialog", "()V");
    GET_METHOD_ID(env, android_app->environmentCallback, class,
                  "environmentCallback", "(ILjava/lang/Object;)V");
+   GET_METHOD_ID(env, android_app->contentLoaded, class,
+                 "contentLoaded", "()V");
 
    GET_OBJECT_CLASS(env, class, obj);
    GET_METHOD_ID(env, android_app->getStringExtra, class,
@@ -3355,7 +3367,7 @@ frontend_ctx_driver_t frontend_ctx_unix = {
 #endif
    frontend_unix_get_os,
    frontend_unix_get_rating,           /* get_rating */
-   NULL,                               /* content_loaded */
+   frontend_unix_content_loaded,                               /* content_loaded */
    frontend_unix_get_arch,             /* get_architecture */
    frontend_unix_get_powerstate,
    frontend_unix_parse_drive_list,
@@ -3405,3 +3417,4 @@ frontend_ctx_driver_t frontend_ctx_unix = {
 
 
 
+

app/src/main/cpp/frontend/drivers/platform_unix.h

@@ -183,6 +183,7 @@ struct android_app
 
    jmethodID openGameDialog;
     jmethodID environmentCallback;
+    jmethodID contentLoaded;
 
    struct
    {

app/src/main/java/com/retroarch/browser/retroactivity/RetroActivityCommon.java

@@ -76,7 +76,7 @@ public abstract class RetroActivityCommon extends NativeActivity
 
   public void environmentCallback(int cmd, Object data) {
     if (callback == null) return;
-    Log.i(TAG, "environmentCallback");
+
     if (cmd == EnvironmentCallbackCmd.SET_INPUT_DESCRIPTORS) {
       callback.setInputDescriptors((InputDescriptorBean[]) data);
     } else if (cmd == EnvironmentCallbackCmd.SET_SYSTEM_AV_INFO) {
@@ -85,6 +85,10 @@ public abstract class RetroActivityCommon extends NativeActivity
       callback.setGeometry((SystemAVInfo.GameGeometry) data);
     }
   }
+  public void contentLoaded() {
+    if (callback != null)
+      callback.contentLoaded();
+  }
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/xugame/app/EnvironmentCallback.java

@@ -7,4 +7,6 @@ public interface EnvironmentCallback {
     void setInputDescriptors(InputDescriptorBean[] descriptors);
     void setSystemAVInfo(SystemAVInfo systemAVInfo);
     void setGeometry(SystemAVInfo.GameGeometry geometry);
+
+    void contentLoaded();
 }

app/src/main/java/com/xugame/gameconsole/emulator/RetroArchEmulatorActivity.java

@@ -133,6 +133,11 @@ public class RetroArchEmulatorActivity extends RetroActivityCamera
                 system.systemAVInfo.setGeometry(geometry);
                 Log.i("EnvironmentCallback", geometry.toString());
             }
+
+            @Override
+            public void contentLoaded() {
+                Log.i("EnvironmentCallback", "Content Loaded");
+            }
         };
         mEmulatorMonitor = new EmulatorMonitor(this, this);
     }