From 01735c32087353a8a5477370d2ede1f9d2f88733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Wed, 22 Jun 2016 00:51:31 +0300
Subject: [PATCH] android/tutorial3: De-SDKify everything a bit more

TODO: The application icon
---
 gst-sdk/tutorials/android-tutorial-3/AndroidManifest.xml      | 2 +-
 gst-sdk/tutorials/android-tutorial-3/jni/tutorial-3.c         | 2 +-
 gst-sdk/tutorials/android-tutorial-3/res/layout/main.xml      | 4 ++--
 .../gstreamer}/tutorial_3/GStreamerSurfaceView.java           | 2 +-
 .../freedesktop/gstreamer}/tutorial_3/Tutorial3.java          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename gst-sdk/tutorials/android-tutorial-3/src/{com/gst_sdk_tutorials => org/freedesktop/gstreamer}/tutorial_3/GStreamerSurfaceView.java (98%)
 rename gst-sdk/tutorials/android-tutorial-3/src/{com/gst_sdk_tutorials => org/freedesktop/gstreamer}/tutorial_3/Tutorial3.java (98%)

diff --git a/gst-sdk/tutorials/android-tutorial-3/AndroidManifest.xml b/gst-sdk/tutorials/android-tutorial-3/AndroidManifest.xml
index 5a3a5b6497..f5cd143db1 100644
--- a/gst-sdk/tutorials/android-tutorial-3/AndroidManifest.xml
+++ b/gst-sdk/tutorials/android-tutorial-3/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_3"
+      package="org.freedesktop.gstreamer.tutorials.tutorial_3"
       android:versionCode="1"
       android:versionName="1.0">
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
diff --git a/gst-sdk/tutorials/android-tutorial-3/jni/tutorial-3.c b/gst-sdk/tutorials/android-tutorial-3/jni/tutorial-3.c
index d6bb427bda..c713a5cbdf 100644
--- a/gst-sdk/tutorials/android-tutorial-3/jni/tutorial-3.c
+++ b/gst-sdk/tutorials/android-tutorial-3/jni/tutorial-3.c
@@ -328,7 +328,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     __android_log_print (ANDROID_LOG_ERROR, "tutorial-3", "Could not retrieve JNIEnv");
     return 0;
   }
-  jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_3/Tutorial3");
+  jclass klass = (*env)->FindClass (env, "org/freedesktop/gstreamer/tutorials/tutorial_3/Tutorial3");
   (*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS(native_methods));
 
   pthread_key_create (&current_jni_env, detach_current_thread);
diff --git a/gst-sdk/tutorials/android-tutorial-3/res/layout/main.xml b/gst-sdk/tutorials/android-tutorial-3/res/layout/main.xml
index ceb1b6793b..6c9e87dbb9 100644
--- a/gst-sdk/tutorials/android-tutorial-3/res/layout/main.xml
+++ b/gst-sdk/tutorials/android-tutorial-3/res/layout/main.xml
@@ -36,10 +36,10 @@
             android:text="@string/button_stop" />
     </LinearLayout>
 
-    <com.gst_sdk_tutorials.tutorial_3.GStreamerSurfaceView
+    <org.freedesktop.gstreamer.tutorial_3.GStreamerSurfaceView
         android:id="@+id/surface_video"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|center_horizontal" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/gst-sdk/tutorials/android-tutorial-3/src/com/gst_sdk_tutorials/tutorial_3/GStreamerSurfaceView.java b/gst-sdk/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/GStreamerSurfaceView.java
similarity index 98%
rename from gst-sdk/tutorials/android-tutorial-3/src/com/gst_sdk_tutorials/tutorial_3/GStreamerSurfaceView.java
rename to gst-sdk/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/GStreamerSurfaceView.java
index 903c3ed5bb..9af8aba2da 100644
--- a/gst-sdk/tutorials/android-tutorial-3/src/com/gst_sdk_tutorials/tutorial_3/GStreamerSurfaceView.java
+++ b/gst-sdk/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/GStreamerSurfaceView.java
@@ -1,4 +1,4 @@
-package com.gst_sdk_tutorials.tutorial_3;
+package org.freedesktop.gstreamer.tutorials.tutorial_3;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/gst-sdk/tutorials/android-tutorial-3/src/com/gst_sdk_tutorials/tutorial_3/Tutorial3.java b/gst-sdk/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/Tutorial3.java
similarity index 98%
rename from gst-sdk/tutorials/android-tutorial-3/src/com/gst_sdk_tutorials/tutorial_3/Tutorial3.java
rename to gst-sdk/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/Tutorial3.java
index 054a8808c6..1be3bf7799 100644
--- a/gst-sdk/tutorials/android-tutorial-3/src/com/gst_sdk_tutorials/tutorial_3/Tutorial3.java
+++ b/gst-sdk/tutorials/android-tutorial-3/src/org/freedesktop/gstreamer/tutorial_3/Tutorial3.java
@@ -1,4 +1,4 @@
-package com.gst_sdk_tutorials.tutorial_3;
+package org.freedesktop.gstreamer.tutorials.tutorial_3;
 
 import android.app.Activity;
 import android.os.Bundle;