Commit 26234a00 authored by Adrien Maglo's avatar Adrien Maglo
Browse files

Moves the vlc-android Java source file in order to comply with Java conventions.

parent f3db2e4a
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="vlc.android"
android:versionCode="1"
android:versionName="1.0">
android:versionName="1.0" package="org.videolan.vlc.android">
<uses-sdk
android:minSdkVersion="4"
......
......@@ -85,7 +85,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
pthread_mutex_destroy(&vout_android_lock);
}
void Java_vlc_android_LibVLC_attachSurface(JNIEnv *env, jobject thiz, jobject surf, jint width, jint height) {
void Java_org_videolan_vlc_android_LibVLC_attachSurface(JNIEnv *env, jobject thiz, jobject surf, jint width, jint height) {
jclass clz;
jfieldID fid;
jthrowable exp;
......@@ -107,14 +107,14 @@ void Java_vlc_android_LibVLC_attachSurface(JNIEnv *env, jobject thiz, jobject su
pthread_mutex_unlock(&vout_android_lock);
}
void Java_vlc_android_LibVLC_detachSurface(JNIEnv *env, jobject thiz) {
void Java_org_videolan_vlc_android_LibVLC_detachSurface(JNIEnv *env, jobject thiz) {
pthread_mutex_lock(&vout_android_lock);
//(*env)->DeleteGlobalRef(env, vout_android_ref);
vout_android_surf = NULL;
pthread_mutex_unlock(&vout_android_lock);
}
void Java_vlc_android_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_android_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
{
const char *argv[] = {"-I", "dummy", "-vvv", "--no-plugins-cache",
"--no-drop-late-frames"};
......@@ -139,7 +139,7 @@ void Java_vlc_android_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
}
void Java_vlc_android_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_android_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
{
releaseMediaPlayer(env, thiz);
jclass clazz = (*env)->GetObjectClass(env, thiz);
......@@ -156,10 +156,10 @@ void Java_vlc_android_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
int currentSdk( JNIEnv *p_env, jobject thiz )
{
jclass cls = (*p_env)->FindClass( p_env, "vlc/android/Util" );
jclass cls = (*p_env)->FindClass( p_env, "org/videolan/vlc/android/Util" );
if ( !cls )
{
LOGE( "Failed to load util class (vlc/android/Util)" );
LOGE( "Failed to load util class (org/videolan/vlc/android/Util)" );
return 0;
}
jmethodID methodSdkVersion = (*p_env)->GetStaticMethodID( p_env, cls,
......@@ -174,7 +174,7 @@ int currentSdk( JNIEnv *p_env, jobject thiz )
return version;
}
void Java_vlc_android_LibVLC_readMedia(JNIEnv *env, jobject thiz,
void Java_org_videolan_vlc_android_LibVLC_readMedia(JNIEnv *env, jobject thiz,
jint instance, jstring mrl)
{
jboolean isCopy;
......@@ -217,7 +217,7 @@ void Java_vlc_android_LibVLC_readMedia(JNIEnv *env, jobject thiz,
(*env)->ReleaseStringUTFChars(env, mrl, psz_mrl);
}
jboolean Java_vlc_android_LibVLC_hasMediaPlayer(JNIEnv *env, jobject thiz)
jboolean Java_org_videolan_vlc_android_LibVLC_hasMediaPlayer(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -225,7 +225,7 @@ jboolean Java_vlc_android_LibVLC_hasMediaPlayer(JNIEnv *env, jobject thiz)
return 0;
}
jboolean Java_vlc_android_LibVLC_isPlaying(JNIEnv *env, jobject thiz)
jboolean Java_org_videolan_vlc_android_LibVLC_isPlaying(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -236,7 +236,7 @@ jboolean Java_vlc_android_LibVLC_isPlaying(JNIEnv *env, jobject thiz)
return 0;
}
jboolean Java_vlc_android_LibVLC_isSeekable(JNIEnv *env, jobject thiz)
jboolean Java_org_videolan_vlc_android_LibVLC_isSeekable(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -247,7 +247,7 @@ jboolean Java_vlc_android_LibVLC_isSeekable(JNIEnv *env, jobject thiz)
return 0;
}
void Java_vlc_android_LibVLC_play(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_android_LibVLC_play(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -257,7 +257,7 @@ void Java_vlc_android_LibVLC_play(JNIEnv *env, jobject thiz)
}
}
void Java_vlc_android_LibVLC_pause(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_android_LibVLC_pause(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -267,7 +267,7 @@ void Java_vlc_android_LibVLC_pause(JNIEnv *env, jobject thiz)
}
}
void Java_vlc_android_LibVLC_stop(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_android_LibVLC_stop(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -277,7 +277,7 @@ void Java_vlc_android_LibVLC_stop(JNIEnv *env, jobject thiz)
}
}
jint Java_vlc_android_LibVLC_getVolume(JNIEnv *env, jobject thiz)
jint Java_org_videolan_vlc_android_LibVLC_getVolume(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -288,7 +288,7 @@ jint Java_vlc_android_LibVLC_getVolume(JNIEnv *env, jobject thiz)
return -1;
}
jint Java_vlc_android_LibVLC_setVolume(JNIEnv *env, jobject thiz, jint volume)
jint Java_org_videolan_vlc_android_LibVLC_setVolume(JNIEnv *env, jobject thiz, jint volume)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -300,7 +300,7 @@ jint Java_vlc_android_LibVLC_setVolume(JNIEnv *env, jobject thiz, jint volume)
return -1;
}
jlong Java_vlc_android_LibVLC_getTime(JNIEnv *env, jobject thiz)
jlong Java_org_videolan_vlc_android_LibVLC_getTime(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -311,7 +311,7 @@ jlong Java_vlc_android_LibVLC_getTime(JNIEnv *env, jobject thiz)
return -1;
}
void Java_vlc_android_LibVLC_setTime(JNIEnv *env, jobject thiz, jlong time)
void Java_org_videolan_vlc_android_LibVLC_setTime(JNIEnv *env, jobject thiz, jlong time)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -321,7 +321,7 @@ void Java_vlc_android_LibVLC_setTime(JNIEnv *env, jobject thiz, jlong time)
}
}
jfloat Java_vlc_android_LibVLC_getPosition(JNIEnv *env, jobject thiz)
jfloat Java_org_videolan_vlc_android_LibVLC_getPosition(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -332,7 +332,7 @@ jfloat Java_vlc_android_LibVLC_getPosition(JNIEnv *env, jobject thiz)
return -1;
}
void Java_vlc_android_LibVLC_setPosition(JNIEnv *env, jobject thiz, jfloat pos)
void Java_org_videolan_vlc_android_LibVLC_setPosition(JNIEnv *env, jobject thiz, jfloat pos)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -342,7 +342,7 @@ void Java_vlc_android_LibVLC_setPosition(JNIEnv *env, jobject thiz, jfloat pos)
}
}
jlong Java_vlc_android_LibVLC_getLength(JNIEnv *env, jobject thiz)
jlong Java_org_videolan_vlc_android_LibVLC_getLength(JNIEnv *env, jobject thiz)
{
jint mediaPlayer = getMediaPlayer(env, thiz);
if (mediaPlayer != 0)
......@@ -353,17 +353,17 @@ jlong Java_vlc_android_LibVLC_getLength(JNIEnv *env, jobject thiz)
return -1;
}
jstring Java_vlc_android_LibVLC_version(JNIEnv* env, jobject thiz)
jstring Java_org_videolan_vlc_android_LibVLC_version(JNIEnv* env, jobject thiz)
{
return (*env)->NewStringUTF(env, libvlc_get_version());
}
jstring Java_vlc_android_LibVLC_compiler(JNIEnv* env, jobject thiz)
jstring Java_org_videolan_vlc_android_LibVLC_compiler(JNIEnv* env, jobject thiz)
{
return (*env)->NewStringUTF(env, libvlc_get_compiler());
}
jstring Java_vlc_android_LibVLC_changeset(JNIEnv* env, jobject thiz)
jstring Java_org_videolan_vlc_android_LibVLC_changeset(JNIEnv* env, jobject thiz)
{
return (*env)->NewStringUTF(env, libvlc_get_changeset());
}
......@@ -16,9 +16,9 @@
* Thumbnailer main function.
* return null if the thumbail generation failed.
**/
jbyteArray Java_vlc_android_LibVLC_getThumbnail(JNIEnv *p_env, jobject thiz,
jint i_instance, jstring filePath,
jint i_width, jint i_height)
jbyteArray Java_org_videolan_vlc_android_LibVLC_getThumbnail(JNIEnv *p_env, jobject thiz,
jint i_instance, jstring filePath,
jint i_width, jint i_height)
{
libvlc_instance_t *p_instance = (libvlc_instance_t *)i_instance;
jboolean isCopy;
......
package vlc.android;
package org.videolan.vlc.android;
import android.util.Log;
import android.media.AudioFormat;
......
package vlc.android;
package org.videolan.vlc.android;
import android.util.Log;
import android.view.Surface;
......
/**
* LibVlcException: exceptions thrown by the native LibVLC interface
*/
package vlc.android;
package org.videolan.vlc.android;
/**
* @author jpeg
......
package vlc.android;
package org.videolan.vlc.android;
import java.io.File;
import java.io.IOException;
......
package vlc.android;
package org.videolan.vlc.android;
import android.view.SurfaceHolder;
import android.view.SurfaceHolder.Callback;
......
package vlc.android;
package org.videolan.vlc.android;
import java.nio.ByteBuffer;
import java.util.LinkedList;
......@@ -7,7 +7,7 @@ import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import vlc.android.SimpleFileBrowser.FileBrowserItem;
import org.videolan.vlc.android.SimpleFileBrowser.FileBrowserItem;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
......
package vlc.android;
package org.videolan.vlc.android;
import java.lang.reflect.Field;
......
package vlc.android;
package org.videolan.vlc.android;
import android.app.Activity;
......
package vlc.android;
package org.videolan.vlc.android;
import android.content.SharedPreferences;
import android.content.pm.ActivityInfo;
......
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
package vlc.android;
package org.videolan.vlc.android;
import java.io.IOException;
import java.io.InputStream;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment