Rename tutorial-1 to tutorial-5

This commit is contained in:
Xavi Artigas 2012-10-03 14:17:08 +02:00
parent 90638fdd0e
commit e030812824
15 changed files with 12 additions and 12 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <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:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/>
@ -8,7 +8,7 @@
<uses-feature android:glEsVersion="0x00020000"/> <uses-feature android:glEsVersion="0x00020000"/>
<application android:label="@string/app_name" <application android:label="@string/app_name"
android:icon="@drawable/gst_sdk_icon"> android:icon="@drawable/gst_sdk_icon">
<activity android:name=".Tutorial1" <activity android:name=".Tutorial5"
android:label="@string/app_name"> android:label="@string/app_name">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View file

@ -16,8 +16,8 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := tutorial-1 LOCAL_MODULE := tutorial-5
LOCAL_SRC_FILES := tutorial-1.c LOCAL_SRC_FILES := tutorial-5.c
LOCAL_SHARED_LIBRARIES := gstreamer_android LOCAL_SHARED_LIBRARIES := gstreamer_android
LOCAL_LDLIBS := -landroid LOCAL_LDLIBS := -landroid
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

View file

@ -460,7 +460,7 @@ static JNINativeMethod native_methods[] = {
jint JNI_OnLoad(JavaVM *vm, void *reserved) { jint JNI_OnLoad(JavaVM *vm, void *reserved) {
JNIEnv *env = NULL; 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; java_vm = vm;
@ -468,7 +468,7 @@ jint JNI_OnLoad(JavaVM *vm, void *reserved) {
GST_ERROR ("Could not retrieve JNIEnv"); GST_ERROR ("Could not retrieve JNIEnv");
return 0; 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)); (*env)->RegisterNatives (env, klass, native_methods, G_N_ELEMENTS(native_methods));
pthread_key_create (&current_jni_env, detach_current_thread); pthread_key_create (&current_jni_env, detach_current_thread);

View file

Before

Width:  |  Height:  |  Size: 571 B

After

Width:  |  Height:  |  Size: 571 B

View file

Before

Width:  |  Height:  |  Size: 392 B

After

Width:  |  Height:  |  Size: 392 B

View file

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <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_play">Play</string>
<string name="button_stop">Stop</string> <string name="button_stop">Stop</string>
<string name="button_select">Select</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="location">Location</string>
<string name="cant_read_folder">folder can\'t be read!</string> <string name="cant_read_folder">folder can\'t be read!</string>
<string name="nnew">New</string> <string name="nnew">New</string>

View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.gst_sdk_tutorials.tutorial_1; package com.gst_sdk_tutorials.tutorial_5;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@ -38,7 +38,7 @@ import android.widget.SeekBar.OnSeekBarChangeListener;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; 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 nativeInit();
private native void nativeFinalize(); private native void nativeFinalize();
private native void nativeSetUri(String uri); private native void nativeSetUri(String uri);
@ -222,7 +222,7 @@ public class Tutorial1 extends Activity implements SurfaceHolder.Callback, OnSee
static { static {
System.loadLibrary("gstreamer_android"); System.loadLibrary("gstreamer_android");
System.loadLibrary("tutorial-1"); System.loadLibrary("tutorial-5");
classInit(); classInit();
} }

View file

@ -33,7 +33,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.TreeMap; 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.AlertDialog;
import android.app.ListActivity; import android.app.ListActivity;