mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-13 12:51:16 +00:00
playback/player: Add our own error domain and code
This commit is contained in:
Sebastian Dröge
parent
e85d26115a
commit
038cd47bfb
5 changed files with 173 additions and 8 deletions
92
playback/player/android/build.xml
Normal file
92
playback/player/android/build.xml
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project name="gst-play" default="help">
|
||||
|
||||
<!-- The local.properties file is created and updated by the 'android' tool.
|
||||
It contains the path to the SDK. It should *NOT* be checked into
|
||||
Version Control Systems. -->
|
||||
<property file="local.properties" />
|
||||
|
||||
<!-- The ant.properties file can be created by you. It is only edited by the
|
||||
'android' tool to add properties to it.
|
||||
This is the place to change some Ant specific build properties.
|
||||
Here are some properties you may want to change/update:
|
||||
|
||||
source.dir
|
||||
The name of the source directory. Default is 'src'.
|
||||
out.dir
|
||||
The name of the output directory. Default is 'bin'.
|
||||
|
||||
For other overridable properties, look at the beginning of the rules
|
||||
files in the SDK, at tools/ant/build.xml
|
||||
|
||||
Properties related to the SDK location or the project target should
|
||||
be updated using the 'android' tool with the 'update' action.
|
||||
|
||||
This file is an integral part of the build system for your
|
||||
application and should be checked into Version Control Systems.
|
||||
|
||||
-->
|
||||
<property file="ant.properties" />
|
||||
|
||||
<!-- if sdk.dir was not set from one of the property file, then
|
||||
get it from the ANDROID_HOME env var.
|
||||
This must be done before we load project.properties since
|
||||
the proguard config can use sdk.dir -->
|
||||
<property environment="env" />
|
||||
<condition property="sdk.dir" value="${env.ANDROID_HOME}">
|
||||
<isset property="env.ANDROID_HOME" />
|
||||
</condition>
|
||||
|
||||
<!-- The project.properties file is created and updated by the 'android'
|
||||
tool, as well as ADT.
|
||||
|
||||
This contains project specific properties such as project target, and library
|
||||
dependencies. Lower level build properties are stored in ant.properties
|
||||
(or in .classpath for Eclipse projects).
|
||||
|
||||
This file is an integral part of the build system for your
|
||||
application and should be checked into Version Control Systems. -->
|
||||
<loadproperties srcFile="project.properties" />
|
||||
|
||||
<!-- quick check on sdk.dir -->
|
||||
<fail
|
||||
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
|
||||
unless="sdk.dir"
|
||||
/>
|
||||
|
||||
<!--
|
||||
Import per project custom build rules if present at the root of the project.
|
||||
This is the place to put custom intermediary targets such as:
|
||||
-pre-build
|
||||
-pre-compile
|
||||
-post-compile (This is typically used for code obfuscation.
|
||||
Compiled code location: ${out.classes.absolute.dir}
|
||||
If this is not done in place, override ${out.dex.input.absolute.dir})
|
||||
-post-package
|
||||
-post-build
|
||||
-pre-clean
|
||||
-->
|
||||
<import file="custom_rules.xml" optional="true" />
|
||||
|
||||
<!-- Import the actual build file.
|
||||
|
||||
To customize existing targets, there are two options:
|
||||
- Customize only one target:
|
||||
- copy/paste the target into this file, *before* the
|
||||
<import> task.
|
||||
- customize it to your needs.
|
||||
- Customize the whole content of build.xml
|
||||
- copy/paste the content of the rules files (minus the top node)
|
||||
into this file, replacing the <import> task.
|
||||
- customize to your needs.
|
||||
|
||||
***********************
|
||||
****** IMPORTANT ******
|
||||
***********************
|
||||
In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
|
||||
in order to avoid having your file be overridden by tools such as "android update project"
|
||||
-->
|
||||
<!-- version-tag: 1 -->
|
||||
<import file="${sdk.dir}/tools/ant/build.xml" />
|
||||
|
||||
</project>
|
||||
|
|
@ -161,11 +161,10 @@ on_error (GstPlayer * unused, GError * err, Player * player)
|
|||
JNIEnv *env = get_jni_env ();
|
||||
jstring error_msg;
|
||||
|
||||
// FIXME
|
||||
error_msg = err ? (*env)->NewStringUTF (env, err->message) : NULL;
|
||||
error_msg =(*env)->NewStringUTF (env, err->message);
|
||||
|
||||
(*env)->CallVoidMethod (env, player->java_player, on_error_method_id,
|
||||
error_msg);
|
||||
err->code, error_msg);
|
||||
if ((*env)->ExceptionCheck (env)) {
|
||||
(*env)->ExceptionDescribe (env);
|
||||
(*env)->ExceptionClear (env);
|
||||
|
|
@ -427,7 +426,7 @@ native_class_init (JNIEnv * env, jclass klass)
|
|||
on_seek_finished_method_id =
|
||||
(*env)->GetMethodID (env, klass, "onSeekFinished", "()V");
|
||||
on_error_method_id =
|
||||
(*env)->GetMethodID (env, klass, "onError", "(Ljava/lang/String;)V");
|
||||
(*env)->GetMethodID (env, klass, "onError", "(ILjava/lang/String;)V");
|
||||
on_video_dimensions_changed_method_id =
|
||||
(*env)->GetMethodID (env, klass, "onVideoDimensionsChanged", "(II)V");
|
||||
|
||||
|
|
|
|||
62
playback/player/android/res/layout/main.xml
Normal file
62
playback/player/android/res/layout/main.xml
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dip"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_play"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/button_play"
|
||||
android:src="@android:drawable/ic_media_play"
|
||||
android:text="@string/button_play" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/button_pause"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:contentDescription="@string/button_pause"
|
||||
android:src="@android:drawable/ic_media_pause"
|
||||
android:text="@string/button_pause" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="16dip"
|
||||
android:gravity="center_horizontal"
|
||||
android:orientation="horizontal" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textview_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_marginRight="5dip" />
|
||||
|
||||
<SeekBar
|
||||
android:id="@+id/seek_bar"
|
||||
android:layout_width="0dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_weight="1"
|
||||
android:indeterminate="false" />
|
||||
</LinearLayout>
|
||||
|
||||
<org.freedesktop.gstreamer.play.GStreamerSurfaceView
|
||||
android:id="@+id/surface_video"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical|center_horizontal" />
|
||||
|
||||
</LinearLayout>
|
||||
6
playback/player/android/res/values/strings.xml
Normal file
6
playback/player/android/res/values/strings.xml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">GStreamer Play</string>
|
||||
<string name="button_play">Play</string>
|
||||
<string name="button_pause">Pause</string>
|
||||
</resources>
|
||||
|
|
@ -183,9 +183,14 @@ public class Player implements Closeable {
|
|||
}
|
||||
}
|
||||
|
||||
// Keep these in sync with gstplayer.h
|
||||
private static final Error[] errorMap = {Error.FAILED};
|
||||
public enum Error {
|
||||
FAILED
|
||||
}
|
||||
|
||||
public static interface ErrorListener {
|
||||
// FIXME: enums
|
||||
abstract void error(Player player, String errorMessage);
|
||||
abstract void error(Player player, Error error, String errorMessage);
|
||||
}
|
||||
|
||||
private ErrorListener errorListener;
|
||||
|
|
@ -193,9 +198,10 @@ public class Player implements Closeable {
|
|||
errorListener = listener;
|
||||
}
|
||||
|
||||
private void onError(String errorMessage) {
|
||||
private void onError(int errorCode, String errorMessage) {
|
||||
if (errorListener != null) {
|
||||
errorListener.error(this, errorMessage);
|
||||
Error error = errorMap[errorCode];
|
||||
errorListener.error(this, error, errorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue