summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-06-03 16:17:41 +0300
committerSebastian Dröge <sebastian@centricular.com>2016-06-03 16:17:41 +0300
commitab0be3e7e705efe63f3f4dcf02a0970e23558cc0 (patch)
tree7db8c5a1ca8af0522e8374e519196697ab52c3f1
parent96b0ce21e50fc38ccc40d67ef44eac563d10d5dd (diff)
android/tutorial1: De-SDKify everything a bit more
TODO: The application icon
-rw-r--r--gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml2
-rw-r--r--gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c4
-rw-r--r--gst-sdk/tutorials/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java (renamed from gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java)2
3 files changed, 4 insertions, 4 deletions
diff --git a/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml b/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml
index 1fdda69..0dfa655 100644
--- 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 2da20b6..1599489 100644
--- 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/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java
index f424b53..74fd9f5 100644
--- a/gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java
+++ b/gst-sdk/tutorials/android-tutorial-1/src/org/freedesktop/gstreamer/tutorials/tutorial_1/Tutorial1.java
@@ -1,4 +1,4 @@
-package com.gst_sdk_tutorials.tutorial_1;
+package org.freedesktop.gstreamer.tutorials.tutorial_1;
import android.app.Activity;
import android.os.Bundle;