From e030812824c4fa3286f96615fef07c16fde6c097 Mon Sep 17 00:00:00 2001
From: Xavi Artigas <xartigas@fluendo.com>
Date: Wed, 3 Oct 2012 14:17:08 +0200
Subject: [PATCH] Rename tutorial-1 to tutorial-5

---
 .../AndroidManifest.xml                                     |   4 ++--
 .../jni/Android.mk                                          |   4 ++--
 .../tutorial-1.c => android-tutorial-5/jni/tutorial-5.c}    |   4 ++--
 .../res/drawable-ldpi/gst_sdk_icon.png                      | Bin
 .../res/drawable-xhdpi/gst_sdk_icon.png                     | Bin
 .../res/drawable/file.png                                   | Bin
 .../res/drawable/folder.png                                 | Bin
 .../res/drawable/icon.png                                   | Bin
 .../res/layout/file_dialog_main.xml                         |   0
 .../res/layout/file_dialog_row.xml                          |   0
 .../res/layout/main.xml                                     |   0
 .../res/values/strings.xml                                  |   4 ++--
 .../src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java}    |   6 +++---
 .../src/com/lamerman/FileDialog.java                        |   2 +-
 .../src/com/lamerman/SelectionMode.java                     |   0
 15 files changed, 12 insertions(+), 12 deletions(-)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/AndroidManifest.xml (90%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/jni/Android.mk (95%)
 rename gst-sdk/tutorials/{android-tutorial-1/jni/tutorial-1.c => android-tutorial-5/jni/tutorial-5.c} (99%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/drawable-ldpi/gst_sdk_icon.png (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/drawable-xhdpi/gst_sdk_icon.png (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/drawable/file.png (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/drawable/folder.png (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/drawable/icon.png (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/layout/file_dialog_main.xml (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/layout/file_dialog_row.xml (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/layout/main.xml (100%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/res/values/strings.xml (84%)
 rename gst-sdk/tutorials/{android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java => android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java} (98%)
 mode change 100755 => 100644
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/src/com/lamerman/FileDialog.java (99%)
 rename gst-sdk/tutorials/{android-tutorial-1 => android-tutorial-5}/src/com/lamerman/SelectionMode.java (100%)

diff --git a/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml b/gst-sdk/tutorials/android-tutorial-5/AndroidManifest.xml
similarity index 90%
rename from gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml
rename to gst-sdk/tutorials/android-tutorial-5/AndroidManifest.xml
index 1dbfa36..bd56b1b 100755
--- a/gst-sdk/tutorials/android-tutorial-1/AndroidManifest.xml
+++ b/gst-sdk/tutorials/android-tutorial-5/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="com.gst_sdk_tutorials.tutorial_5"
       android:versionCode="1"
       android:versionName="1.0">
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
@@ -8,7 +8,7 @@
     <uses-feature android:glEsVersion="0x00020000"/>
     <application android:label="@string/app_name"
                  android:icon="@drawable/gst_sdk_icon">
-        <activity android:name=".Tutorial1"
+        <activity android:name=".Tutorial5"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/gst-sdk/tutorials/android-tutorial-1/jni/Android.mk b/gst-sdk/tutorials/android-tutorial-5/jni/Android.mk
similarity index 95%
rename from gst-sdk/tutorials/android-tutorial-1/jni/Android.mk
rename to gst-sdk/tutorials/android-tutorial-5/jni/Android.mk
index e3d2caa..ac56df7 100755
--- a/gst-sdk/tutorials/android-tutorial-1/jni/Android.mk
+++ b/gst-sdk/tutorials/android-tutorial-5/jni/Android.mk
@@ -16,8 +16,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE    := tutorial-1
-LOCAL_SRC_FILES := tutorial-1.c
+LOCAL_MODULE    := tutorial-5
+LOCAL_SRC_FILES := tutorial-5.c
 LOCAL_SHARED_LIBRARIES := gstreamer_android
 LOCAL_LDLIBS := -landroid
 include $(BUILD_SHARED_LIBRARY)
diff --git a/gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c b/gst-sdk/tutorials/android-tutorial-5/jni/tutorial-5.c
similarity index 99%
rename from gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c
rename to gst-sdk/tutorials/android-tutorial-5/jni/tutorial-5.c
index 528b872..2da520e 100755
--- a/gst-sdk/tutorials/android-tutorial-1/jni/tutorial-1.c
+++ b/gst-sdk/tutorials/android-tutorial-5/jni/tutorial-5.c
@@ -460,7 +460,7 @@ static JNINativeMethod native_methods[] = {
 jint JNI_OnLoad(JavaVM *vm, void *reserved) {
   JNIEnv *env = NULL;
 
-  GST_DEBUG_CATEGORY_INIT (debug_category, "tutorial-1", 0, "Android tutorial 1");
+  GST_DEBUG_CATEGORY_INIT (debug_category, "tutorial-5", 0, "Android tutorial 5");
 
   java_vm = vm;
 
@@ -468,7 +468,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
     GST_ERROR ("Could not retrieve JNIEnv");
     return 0;
   }
-  jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_1/Tutorial1");
+  jclass klass = (*env)->FindClass (env, "com/gst_sdk_tutorials/tutorial_5/Tutorial5");
   (*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-1/res/drawable-ldpi/gst_sdk_icon.png b/gst-sdk/tutorials/android-tutorial-5/res/drawable-ldpi/gst_sdk_icon.png
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/drawable-ldpi/gst_sdk_icon.png
rename to gst-sdk/tutorials/android-tutorial-5/res/drawable-ldpi/gst_sdk_icon.png
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/drawable-xhdpi/gst_sdk_icon.png b/gst-sdk/tutorials/android-tutorial-5/res/drawable-xhdpi/gst_sdk_icon.png
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/drawable-xhdpi/gst_sdk_icon.png
rename to gst-sdk/tutorials/android-tutorial-5/res/drawable-xhdpi/gst_sdk_icon.png
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/drawable/file.png b/gst-sdk/tutorials/android-tutorial-5/res/drawable/file.png
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/drawable/file.png
rename to gst-sdk/tutorials/android-tutorial-5/res/drawable/file.png
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/drawable/folder.png b/gst-sdk/tutorials/android-tutorial-5/res/drawable/folder.png
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/drawable/folder.png
rename to gst-sdk/tutorials/android-tutorial-5/res/drawable/folder.png
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/drawable/icon.png b/gst-sdk/tutorials/android-tutorial-5/res/drawable/icon.png
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/drawable/icon.png
rename to gst-sdk/tutorials/android-tutorial-5/res/drawable/icon.png
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/layout/file_dialog_main.xml b/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/layout/file_dialog_main.xml
rename to gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_main.xml
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/layout/file_dialog_row.xml b/gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/layout/file_dialog_row.xml
rename to gst-sdk/tutorials/android-tutorial-5/res/layout/file_dialog_row.xml
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/layout/main.xml b/gst-sdk/tutorials/android-tutorial-5/res/layout/main.xml
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/res/layout/main.xml
rename to gst-sdk/tutorials/android-tutorial-5/res/layout/main.xml
diff --git a/gst-sdk/tutorials/android-tutorial-1/res/values/strings.xml b/gst-sdk/tutorials/android-tutorial-5/res/values/strings.xml
similarity index 84%
rename from gst-sdk/tutorials/android-tutorial-1/res/values/strings.xml
rename to gst-sdk/tutorials/android-tutorial-5/res/values/strings.xml
index f192006..1e12ca9 100755
--- a/gst-sdk/tutorials/android-tutorial-1/res/values/strings.xml
+++ b/gst-sdk/tutorials/android-tutorial-5/res/values/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Android tutorial 1</string>
+    <string name="app_name">Android tutorial 5</string>
     <string name="button_play">Play</string>
     <string name="button_stop">Stop</string>
     <string name="button_select">Select</string>
-    <string name="filechooser_name">Android tutorial 1</string>
+    <string name="filechooser_name">Android tutorial 5</string>
     <string name="location">Location</string>
     <string name="cant_read_folder">folder can\'t be read!</string>
     <string name="nnew">New</string>
diff --git a/gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java b/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
old mode 100755
new mode 100644
similarity index 98%
rename from gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java
rename to gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
index efb4fcb..7978ddc
--- a/gst-sdk/tutorials/android-tutorial-1/src/com/gst_sdk_tutorials/tutorial_1/Tutorial1.java
+++ b/gst-sdk/tutorials/android-tutorial-5/src/com/gst_sdk_tutorials/tutorial_5/Tutorial5.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gst_sdk_tutorials.tutorial_1;
+package com.gst_sdk_tutorials.tutorial_5;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -38,7 +38,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
 
-public class Tutorial1 extends Activity implements SurfaceHolder.Callback, OnSeekBarChangeListener {
+public class Tutorial5 extends Activity implements SurfaceHolder.Callback, OnSeekBarChangeListener {
     private native void nativeInit();
     private native void nativeFinalize();
     private native void nativeSetUri(String uri);
@@ -222,7 +222,7 @@ public class Tutorial1 extends Activity implements SurfaceHolder.Callback, OnSee
 
     static {
         System.loadLibrary("gstreamer_android");
-        System.loadLibrary("tutorial-1");
+        System.loadLibrary("tutorial-5");
         classInit();
     }
 
diff --git a/gst-sdk/tutorials/android-tutorial-1/src/com/lamerman/FileDialog.java b/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java
similarity index 99%
rename from gst-sdk/tutorials/android-tutorial-1/src/com/lamerman/FileDialog.java
rename to gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java
index 770d382..438bad1 100644
--- a/gst-sdk/tutorials/android-tutorial-1/src/com/lamerman/FileDialog.java
+++ b/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/FileDialog.java
@@ -33,7 +33,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.TreeMap;
 
-import com.gst_sdk_tutorials.tutorial_1.R;
+import com.gst_sdk_tutorials.tutorial_5.R;
 
 import android.app.AlertDialog;
 import android.app.ListActivity;
diff --git a/gst-sdk/tutorials/android-tutorial-1/src/com/lamerman/SelectionMode.java b/gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/SelectionMode.java
similarity index 100%
rename from gst-sdk/tutorials/android-tutorial-1/src/com/lamerman/SelectionMode.java
rename to gst-sdk/tutorials/android-tutorial-5/src/com/lamerman/SelectionMode.java
-- 
2.7.4