android/tutorial1: De-SDKify everything a bit more

TODO: The application icon

diff --git a/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml b/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml
index 1fdda69b2564b7793cea8329dccac4b691aec1c0..0dfa655a5061ed22b3537b2c0a0e0328e6c9c5c6 100644 (file)
--- a/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml
+++ b/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.gst_sdk_tutorials.tutorial_1"
+      package="org.freedesktop.gstreamer.tutorials.tutorial_1"
       android:versionCode="1"
       android:versionName="1.0">
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>

diff --git a/gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c b/gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c
index 2da20b6788068e64b99e3acf1be674bedfb5c789..1599489fa9b29c0c5d70d0fbfcfad3cc89bf473c 100644 (file)
--- a/gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c
+++ b/gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c
@@ -6,7 +6,7 @@
 /*
  * Java Bindings
  */
-jstring gst_native_get_gstreamer_info (JNIEnv* env, jobject thiz) {
+static jstring gst_native_get_gstreamer_info (JNIEnv* env, jobject thiz) {
   char *version_utf8 = gst_version_string();
   jstring *version_jstring = (*env)->NewStringUTF(env, version_utf8);
   g_free (version_utf8);
@@ -24,7 +24,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     __android_log_print (ANDROID_LOG_ERROR, "tutorial-1", "Could not retrieve JNIEnv");
     return 0;
   }
-  jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_1/Tutorial1");
+  jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1");
   (*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS(native_methods));
 
   return JNI_VERSION_1_4;

diff --git a/gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java b/gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java
deleted file mode 100644 (file)
index f424b53..0000000
--- a/gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.gst_sdk_tutorials.tutorial_1;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import org.freedesktop.gstreamer.GStreamer;
-
-public class Tutorial1 extends Activity {
-    private native String nativeGetGStreamerInfo();
-
-    // Called when the activity is first created.
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-
-        try {
-            GStreamer.init(this);
-        } catch (Exception e) {
-            Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
-            finish(); 
-            return;
-        }
-
-        setContentView(R.layout.main);
-
-        TextView tv = (TextView)findViewById(R.id.textview_info);
-        tv.setText("Welcome to " + nativeGetGStreamerInfo() + " !");
-    }
-
-    static {
-        System.loadLibrary("gstreamer_android");
-        System.loadLibrary("tutorial-1");
-    }
-
-}

diff --git a/gst-sdk/tutorials/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java b/gst-sdk/tutorials/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java
new file mode 100644 (file)
index 0000000..74fd9f5
--- /dev/null
+++ b/gst-sdk/tutorials/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java
@@ -0,0 +1,38 @@
+package org.freedesktop.gstreamer.tutorials.tutorial_1;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.freedesktop.gstreamer.GStreamer;
+
+public class Tutorial1 extends Activity {
+    private native String nativeGetGStreamerInfo();
+
+    // Called when the activity is first created.
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+
+        try {
+            GStreamer.init(this);
+        } catch (Exception e) {
+            Toast.makeText(this, e.getMessage(), Toast.LENGTH_LONG).show();
+            finish(); 
+            return;
+        }
+
+        setContentView(R.layout.main);
+
+        TextView tv = (TextView)findViewById(R.id.textview_info);
+        tv.setText("Welcome to " + nativeGetGStreamerInfo() + " !");
+    }
+
+    static {
+        System.loadLibrary("gstreamer_android");
+        System.loadLibrary("tutorial-1");
+    }
+
+}