Skip to content

GitLab

Commit c5962b31 authored by Sébastien Toque's avatar Sébastien Toque
Browse files

rearrange files

parent 644e7dc7
Hide whitespace changes
Inline Side-by-side
Makefile
View file @ c5962b31
......@@ -6,7 +6,7 @@ else
ARCH = armeabi
endif
JAVA_SOURCES=vlc-android/src/org/videolan/vlc/android/*.java
JAVA_SOURCES=vlc-android/src/org/videolan/vlc/*.java
JNI_SOURCES=vlc-android/jni/*.c vlc-android/jni/*.h
VLC_APK=vlc-android/bin/VLC-debug.apk
LIBVLCJNI=vlc-android/libs/$(ARCH)/libvlcjni.so
......@@ -89,7 +89,7 @@ install: $(VLC_APK)
run:
@echo "=== Running VLC on device ==="
adb wait-for-device
adb shell monkey -p org.videolan.vlc.android -s 0 1
adb shell monkey -p org.videolan.vlc -s 0 1
build-and-run: install run
......
vlc-android/AndroidManifest.xml
View file @ c5962b31
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.videolan.vlc"
android:versionCode="1"
android:versionName="0.0-alpha"
package="org.videolan.vlc.android">
android:versionName="0.0-alpha" >
<uses-sdk android:minSdkVersion="7" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_LOGS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application
android:debuggable="true"
android:icon="@drawable/icon"
android:label="@string/app_name" android:debuggable="true">
android:label="@string/app_name" >
<activity
android:label="@string/app_name"
android:name=".gui.MainActivity"
android:configChanges="orientation"
android:icon="@drawable/icon"
android:name=".MainActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="orientation">
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="SearchActivity"
android:theme="@android:style/Theme.NoTitleBar"
android:configChanges="orientation">
android:name=".gui.SearchActivity"
android:configChanges="orientation"
android:theme="@android:style/Theme.NoTitleBar" >
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/searchable"/>
<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>
<activity
android:name="AboutActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
android:name=".gui.AboutActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="PreferencesActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
android:name=".gui.PreferencesActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="VideoActivityGroup"
android:theme="@android:style/Theme.NoTitleBar"/>
android:name=".gui.BrowserActivity"
android:label="@string/mediafiles"
android:theme="@android:style/Theme" />
<activity
android:name=".gui.video.VideoActivityGroup"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="VideoListActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
android:name=".gui.video.VideoListActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name=".MediaInfoActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
android:name=".gui.video.MediaInfoActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="VideoPlayerActivity"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:configChanges="orientation">
android:name=".gui.video.VideoPlayerActivity"
android:configChanges="orientation"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/*" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="video/*" android:scheme="http" />
<data
android:mimeType="video/*"
android:scheme="http" />
</intent-filter>
</activity>
<activity
android:name=".AudioBrowserActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<activity
android:name="AudioListActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
android:name=".gui.audio.AudioBrowserActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name=".AudioActivityGroup"
android:theme="@android:style/Theme.NoTitleBar"/>
android:name=".gui.audio.AudioListActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name=".AudioPlayerActivity"
android:theme="@android:style/Theme.NoTitleBar"/>
<service
android:name=".AudioService"/>
android:name=".gui.audio.AudioActivityGroup"
android:theme="@android:style/Theme.NoTitleBar" />
<activity
android:name="BrowserActivity"
android:label="@string/mediafiles"
android:theme="@android:style/Theme">
</activity>
<receiver
android:name="PhoneStateReceiver">
android:name=".gui.audio.AudioPlayerActivity"
android:theme="@android:style/Theme.NoTitleBar" />
<service android:name=".AudioService" />
<receiver android:name="PhoneStateReceiver" >
<intent-filter>
<action android:name="android.intent.action.PHONE_STATE" />
</intent-filter>
......@@ -94,14 +112,6 @@
android:name="android.appwidget.provider"
android:resource="@xml/vlcwidget" />
</receiver>
</application>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.READ_LOGS"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
</manifest>
</manifest>
\ No newline at end of file
vlc-android/jni/libvlcjni.c
View file @ c5962b31
......@@ -183,7 +183,7 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
pthread_mutex_destroy(&vout_android_lock);
}
void Java_org_videolan_vlc_android_LibVLC_attachSurface(JNIEnv *env, jobject thiz, jobject surf, jobject gui, jint width, jint height) {
void Java_org_videolan_vlc_LibVLC_attachSurface(JNIEnv *env, jobject thiz, jobject surf, jobject gui, jint width, jint height) {
jclass clz;
jfieldID fid;
......@@ -205,7 +205,7 @@ void Java_org_videolan_vlc_android_LibVLC_attachSurface(JNIEnv *env, jobject thi
pthread_mutex_unlock(&vout_android_lock);
}
void Java_org_videolan_vlc_android_LibVLC_detachSurface(JNIEnv *env, jobject thiz) {
void Java_org_videolan_vlc_LibVLC_detachSurface(JNIEnv *env, jobject thiz) {
pthread_mutex_lock(&vout_android_lock);
vout_android_surf = NULL;
if (vout_android_gui != NULL)
......@@ -214,7 +214,7 @@ void Java_org_videolan_vlc_android_LibVLC_detachSurface(JNIEnv *env, jobject thi
pthread_mutex_unlock(&vout_android_lock);
}
void Java_org_videolan_vlc_android_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
{
/* Don't add any invalid options, otherwise it causes LibVLC to crash */
static const char *argv[] = {
......@@ -237,7 +237,7 @@ void Java_org_videolan_vlc_android_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
if (!instance)
{
jclass exc = (*env)->FindClass(env, "org/videolan/vlc/android/LibVlcException");
jclass exc = (*env)->FindClass(env, "org/videolan/vlc/LibVlcException");
(*env)->ThrowNew(env, exc, "Unable to instantiate LibVLC");
}
......@@ -246,7 +246,7 @@ void Java_org_videolan_vlc_android_LibVLC_nativeInit(JNIEnv *env, jobject thiz)
}
void Java_org_videolan_vlc_android_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_LibVLC_nativeDestroy(JNIEnv *env, jobject thiz)
{
releaseMediaPlayer(env, thiz);
jclass clazz = (*env)->GetObjectClass(env, thiz);
......@@ -263,10 +263,10 @@ void Java_org_videolan_vlc_android_LibVLC_nativeDestroy(JNIEnv *env, jobject thi
int currentSdk( JNIEnv *p_env, jobject thiz )
{
jclass cls = (*p_env)->FindClass( p_env, "org/videolan/vlc/android/Util" );
jclass cls = (*p_env)->FindClass( p_env, "org/videolan/vlc/Util" );
if ( !cls )
{
LOGE( "Failed to load util class (org/videolan/vlc/android/Util)" );
LOGE( "Failed to load util class (org/videolan/vlc/Util)" );
return 0;
}
jmethodID methodSdkVersion = (*p_env)->GetStaticMethodID( p_env, cls,
......@@ -281,7 +281,7 @@ int currentSdk( JNIEnv *p_env, jobject thiz )
return version;
}
void Java_org_videolan_vlc_android_LibVLC_detachEventManager(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_LibVLC_detachEventManager(JNIEnv *env, jobject thiz)
{
if (eventManagerInstance != NULL) {
(*env)->DeleteGlobalRef(env, eventManagerInstance);
......@@ -289,7 +289,7 @@ void Java_org_videolan_vlc_android_LibVLC_detachEventManager(JNIEnv *env, jobjec
}
}
void Java_org_videolan_vlc_android_LibVLC_setEventManager(JNIEnv *env, jobject thiz, jobject eventManager)
void Java_org_videolan_vlc_LibVLC_setEventManager(JNIEnv *env, jobject thiz, jobject eventManager)
{
if (eventManagerInstance != NULL) {
(*env)->DeleteGlobalRef(env, eventManagerInstance);
......@@ -311,8 +311,8 @@ void Java_org_videolan_vlc_android_LibVLC_setEventManager(JNIEnv *env, jobject t
eventManagerInstance = (*env)->NewGlobalRef(env, eventManager);
}
jobjectArray Java_org_videolan_vlc_android_LibVLC_readMediaMeta(JNIEnv *env,
jobject thiz, jint instance, jstring mrl)
jobjectArray Java_org_videolan_vlc_LibVLC_readMediaMeta(JNIEnv *env,
jobject thiz, jint instance, jstring mrl)
{
jobjectArray array = (*env)->NewObjectArray(env, 8,
(*env)->FindClass(env, "java/lang/String"),
......@@ -354,8 +354,8 @@ jobjectArray Java_org_videolan_vlc_android_LibVLC_readMediaMeta(JNIEnv *env,
return array;
}
void Java_org_videolan_vlc_android_LibVLC_readMedia(JNIEnv *env, jobject thiz,
jint instance, jstring mrl)
void Java_org_videolan_vlc_LibVLC_readMedia(JNIEnv *env, jobject thiz,
jint instance, jstring mrl)
{
/* Release previous media player, if any */
releaseMediaPlayer(env, thiz);
......@@ -406,8 +406,8 @@ void Java_org_videolan_vlc_android_LibVLC_readMedia(JNIEnv *env, jobject thiz,
libvlc_media_player_play(mp);
}
jboolean Java_org_videolan_vlc_android_LibVLC_hasVideoTrack(JNIEnv *env, jobject thiz,
jint i_instance, jstring filePath)
jboolean Java_org_videolan_vlc_LibVLC_hasVideoTrack(JNIEnv *env, jobject thiz,
jint i_instance, jstring filePath)
{
/* Create a new item and assign it to the media player. */
libvlc_media_t *p_m = new_media(i_instance, env, thiz, filePath);
......@@ -452,8 +452,8 @@ static void length_changed_callback(const libvlc_event_t *ev, void *data)
pthread_mutex_unlock(&monitor->doneMutex);
}
jlong Java_org_videolan_vlc_android_LibVLC_getLengthFromFile(JNIEnv *env, jobject thiz,
jint i_instance, jstring filePath)
jlong Java_org_videolan_vlc_LibVLC_getLengthFromFile(JNIEnv *env, jobject thiz,
jint i_instance, jstring filePath)
{
jlong length = 0;
struct length_change_monitor *monitor;
......@@ -498,12 +498,12 @@ end:
return length;
}
jboolean Java_org_videolan_vlc_android_LibVLC_hasMediaPlayer(JNIEnv *env, jobject thiz)
jboolean Java_org_videolan_vlc_LibVLC_hasMediaPlayer(JNIEnv *env, jobject thiz)
{
return !!getMediaPlayer(env, thiz);
}
jboolean Java_org_videolan_vlc_android_LibVLC_isPlaying(JNIEnv *env, jobject thiz)
jboolean Java_org_videolan_vlc_LibVLC_isPlaying(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -511,7 +511,7 @@ jboolean Java_org_videolan_vlc_android_LibVLC_isPlaying(JNIEnv *env, jobject thi
return 0;
}
jboolean Java_org_videolan_vlc_android_LibVLC_isSeekable(JNIEnv *env, jobject thiz)
jboolean Java_org_videolan_vlc_LibVLC_isSeekable(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -519,28 +519,28 @@ jboolean Java_org_videolan_vlc_android_LibVLC_isSeekable(JNIEnv *env, jobject th
return 0;
}
void Java_org_videolan_vlc_android_LibVLC_play(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_LibVLC_play(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
libvlc_media_player_play(mp);
}
void Java_org_videolan_vlc_android_LibVLC_pause(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_LibVLC_pause(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
libvlc_media_player_pause(mp);
}
void Java_org_videolan_vlc_android_LibVLC_stop(JNIEnv *env, jobject thiz)
void Java_org_videolan_vlc_LibVLC_stop(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
libvlc_media_player_stop(mp);
}
jint Java_org_videolan_vlc_android_LibVLC_getVolume(JNIEnv *env, jobject thiz)
jint Java_org_videolan_vlc_LibVLC_getVolume(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -548,7 +548,7 @@ jint Java_org_videolan_vlc_android_LibVLC_getVolume(JNIEnv *env, jobject thiz)
return -1;
}
jint Java_org_videolan_vlc_android_LibVLC_setVolume(JNIEnv *env, jobject thiz, jint volume)
jint Java_org_videolan_vlc_LibVLC_setVolume(JNIEnv *env, jobject thiz, jint volume)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -557,7 +557,7 @@ jint Java_org_videolan_vlc_android_LibVLC_setVolume(JNIEnv *env, jobject thiz, j
return -1;
}
jlong Java_org_videolan_vlc_android_LibVLC_getTime(JNIEnv *env, jobject thiz)
jlong Java_org_videolan_vlc_LibVLC_getTime(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -565,14 +565,14 @@ jlong Java_org_videolan_vlc_android_LibVLC_getTime(JNIEnv *env, jobject thiz)
return -1;
}
void Java_org_videolan_vlc_android_LibVLC_setTime(JNIEnv *env, jobject thiz, jlong time)
void Java_org_videolan_vlc_LibVLC_setTime(JNIEnv *env, jobject thiz, jlong time)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
libvlc_media_player_set_time(mp, time);
}
jfloat Java_org_videolan_vlc_android_LibVLC_getPosition(JNIEnv *env, jobject thiz)
jfloat Java_org_videolan_vlc_LibVLC_getPosition(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -580,14 +580,14 @@ jfloat Java_org_videolan_vlc_android_LibVLC_getPosition(JNIEnv *env, jobject thi
return -1;
}
void Java_org_videolan_vlc_android_LibVLC_setPosition(JNIEnv *env, jobject thiz, jfloat pos)
void Java_org_videolan_vlc_LibVLC_setPosition(JNIEnv *env, jobject thiz, jfloat pos)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
libvlc_media_player_set_position(mp, pos);
}
jlong Java_org_videolan_vlc_android_LibVLC_getLength(JNIEnv *env, jobject thiz)
jlong Java_org_videolan_vlc_LibVLC_getLength(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -595,22 +595,22 @@ jlong Java_org_videolan_vlc_android_LibVLC_getLength(JNIEnv *env, jobject thiz)
return -1;
}
jstring Java_org_videolan_vlc_android_LibVLC_version(JNIEnv* env, jobject thiz)
jstring Java_org_videolan_vlc_LibVLC_version(JNIEnv* env, jobject thiz)
{
return (*env)->NewStringUTF(env, libvlc_get_version());
}
jstring Java_org_videolan_vlc_android_LibVLC_compiler(JNIEnv* env, jobject thiz)
jstring Java_org_videolan_vlc_LibVLC_compiler(JNIEnv* env, jobject thiz)
{
return (*env)->NewStringUTF(env, libvlc_get_compiler());
}
jstring Java_org_videolan_vlc_android_LibVLC_changeset(JNIEnv* env, jobject thiz)
jstring Java_org_videolan_vlc_LibVLC_changeset(JNIEnv* env, jobject thiz)
{
return (*env)->NewStringUTF(env, libvlc_get_changeset());
}
jint Java_org_videolan_vlc_android_LibVLC_getAudioTracksCount(JNIEnv *env, jobject thiz)
jint Java_org_videolan_vlc_LibVLC_getAudioTracksCount(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -618,7 +618,7 @@ jint Java_org_videolan_vlc_android_LibVLC_getAudioTracksCount(JNIEnv *env, jobje
return -1;
}
jint Java_org_videolan_vlc_android_LibVLC_getVideoTracksCount(JNIEnv *env, jobject thiz)
jint Java_org_videolan_vlc_LibVLC_getVideoTracksCount(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......@@ -626,7 +626,7 @@ jint Java_org_videolan_vlc_android_LibVLC_getVideoTracksCount(JNIEnv *env, jobje
return -1;
}
jint Java_org_videolan_vlc_android_LibVLC_getSpuTracksCount(JNIEnv *env, jobject thiz)
jint Java_org_videolan_vlc_LibVLC_getSpuTracksCount(JNIEnv *env, jobject thiz)
{
libvlc_media_player_t *mp = getMediaPlayer(env, thiz);
if (mp)
......
vlc-android/jni/thumbnailer.c
View file @ c5962b31
......@@ -112,9 +112,9 @@ static void thumbnailer_unlock(void *opaque, void *picture, void *const *pixels)
* Thumbnailer main function.
* return null if the thumbail generation failed.
**/
jbyteArray Java_org_videolan_vlc_android_LibVLC_getThumbnail(JNIEnv *env, jobject thiz,
jint instance, jstring filePath,
jint width, jint height)
jbyteArray Java_org_videolan_vlc_LibVLC_getThumbnail(JNIEnv *env, jobject thiz,
jint instance, jstring filePath,
jint width, jint height)
{
libvlc_instance_t *libvlc = (libvlc_instance_t *)instance;
jbyteArray byteArray = NULL;
......
vlc-android/res/layout/audio_browser.xml
View file @ c5962b31
......@@ -54,7 +54,7 @@
android:layout_width="fill_parent"
android:layout_height="1dip"
android:background="#f0f0f0" />
<org.videolan.vlc.android.widget.FlingViewGroup
<org.videolan.vlc.widget.FlingViewGroup
android:id="@+id/content"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
......@@ -78,5 +78,5 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fastScrollEnabled="true" />
</org.videolan.vlc.android.widget.FlingViewGroup>
</org.videolan.vlc.widget.FlingViewGroup>
</LinearLayout>
vlc-android/res/layout/main.xml
View file @ c5962b31
......@@ -86,7 +86,7 @@
android:layout_height="fill_parent" />
</LinearLayout>
</TabHost>
<org.videolan.vlc.android.widget.AudioMiniPlayer
<org.videolan.vlc.widget.AudioMiniPlayer
android:id="@+id/audio_mini_player"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
......
vlc-android/src/org/videolan/vlc/android/Aout.java → vlc-android/src/org/videolan/vlc/Aout.java
View file @ c5962b31
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
package org.videolan.vlc;
import android.util.Log;
import android.media.AudioFormat;
......
vlc-android/src/org/videolan/vlc/android/AudioService.java → vlc-android/src/org/videolan/vlc/AudioService.java
View file @ c5962b31
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
package org.videolan.vlc;
import java.io.File;
import java.util.ArrayList;
......@@ -26,7 +26,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Stack;
import org.videolan.vlc.android.widget.VLCAppWidgetProvider;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.interfaces.IAudioService;
import org.videolan.vlc.interfaces.IAudioServiceCallback;
import org.videolan.vlc.widget.VLCAppWidgetProvider;
import android.app.Notification;
import android.app.PendingIntent;
......
vlc-android/src/org/videolan/vlc/android/AudioServiceController.java → vlc-android/src/org/videolan/vlc/AudioServiceController.java
View file @ c5962b31
......@@ -18,11 +18,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
package org.videolan.vlc;
import java.util.ArrayList;
import java.util.List;
import org.videolan.vlc.interfaces.IAudioPlayer;
import org.videolan.vlc.interfaces.IAudioPlayerControl;
import org.videolan.vlc.interfaces.IAudioService;
import org.videolan.vlc.interfaces.IAudioServiceCallback;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
......
vlc-android/src/org/videolan/vlc/android/DatabaseManager.java → vlc-android/src/org/videolan/vlc/DatabaseManager.java
View file @ c5962b31
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
package org.videolan.vlc;
import java.io.ByteArrayOutputStream;
import java.io.File;
......
vlc-android/src/org/videolan/vlc/android/EventManager.java → vlc-android/src/org/videolan/vlc/EventManager.java
View file @ c5962b31
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
package org.videolan.vlc;
import java.util.ArrayList;
......
vlc-android/src/org/videolan/vlc/android/LibVLC.java → vlc-android/src/org/videolan/vlc/LibVLC.java
View file @ c5962b31
......@@ -18,8 +18,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
import org.videolan.vlc.android.LibVlcException;
package org.videolan.vlc;
import org.videolan.vlc.LibVlcException;
import org.videolan.vlc.gui.video.VideoPlayerActivity;
import android.util.Log;
import android.view.Surface;
import android.preference.PreferenceManager;
......
vlc-android/src/org/videolan/vlc/android/LibVlcException.java → vlc-android/src/org/videolan/vlc/LibVlcException.java
View file @ c5962b31
......@@ -21,7 +21,7 @@
/**
* LibVlcException: exceptions thrown by the native LibVLC interface
*/
package org.videolan.vlc.android;
package org.videolan.vlc;
/**
* @author jpeg
......
vlc-android/src/org/videolan/vlc/android/Media.java → vlc-android/src/org/videolan/vlc/Media.java
View file @ c5962b31
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
package org.videolan.vlc;
import java.io.File;
......
vlc-android/src/org/videolan/vlc/android/MediaLibrary.java → vlc-android/src/org/videolan/vlc/MediaLibrary.java
View file @ c5962b31
......@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
package org.videolan.vlc.android;
package org.videolan.vlc;
import java.io.File;
import java.io.FileFilter;
......@@ -30,6 +30,9 @@ import java.util.HashSet;
import java.util.List;
import java.util.Stack;
import org.videolan.vlc.gui.MainActivity;
import org.videolan.vlc.gui.audio.AudioBrowserActivity;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Environment;
......@@ -39,7 +42,7 @@ import android.preference.PreferenceManager;
public class MediaLibrary {
public final static String TAG = "VLC/MediaLibrary";
protected static final int MEDIA_ITEMS_UPDATED = 100;
public static final int MEDIA_ITEMS_UPDATED = 100;
private static MediaLibrary mInstance;
private DatabaseManager mDBManager;
......