[Android] Revert "Move MediaWrapperList to libVLC"

[Thomas Guillem]

vlc-ports/android | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue May 26 18:19:05 2015 +0200| [1670a054dacd6e64b30716f7f10eea452f439793] | committer: Jean-Baptiste Kempf

Revert "Move MediaWrapperList to libVLC"

This reverts commit 6ceb84e0b6a46e59d8e8bec36ef2ce90c56d4598.

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=1670a054dacd6e64b30716f7f10eea452f439793
---

 .../src/org/videolan/vlc}/MediaWrapperList.java                 |    7 ++++---
 vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java    |    1 -
 vlc-android/src/org/videolan/vlc/audio/AudioService.java        |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libvlc/src/org/videolan/libvlc/MediaWrapperList.java b/vlc-android/src/org/videolan/vlc/MediaWrapperList.java
similarity index 98%
rename from libvlc/src/org/videolan/libvlc/MediaWrapperList.java
rename to vlc-android/src/org/videolan/vlc/MediaWrapperList.java
index 922c615..73dae5f 100644
--- a/libvlc/src/org/videolan/libvlc/MediaWrapperList.java
+++ b/vlc-android/src/org/videolan/vlc/MediaWrapperList.java
@@ -18,11 +18,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
-package org.videolan.libvlc;
+package org.videolan.vlc;
 
-import java.util.ArrayList;
+import android.support.annotation.Nullable;
 
-import org.videolan.libvlc.MediaWrapper;
+import java.util.ArrayList;
 
 public class MediaWrapperList {
     private static final String TAG = "VLC/MediaWrapperList";
@@ -141,6 +141,7 @@ public class MediaWrapperList {
         return mInternalList.size();
     }
 
+    @Nullable
     public MediaWrapper getMedia(int position) {
         if (!isValid(position))
             return null;
diff --git a/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java b/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
index 2107ea7..5390191 100644
--- a/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
+++ b/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
@@ -26,7 +26,6 @@ import org.videolan.libvlc.LibVLC;
 import org.videolan.libvlc.Media;
 import org.videolan.libvlc.MediaPlayer;
 import org.videolan.libvlc.MediaWrapper;
-import org.videolan.libvlc.MediaWrapperList;
 
 
 public class MediaWrapperListPlayer {
diff --git a/vlc-android/src/org/videolan/vlc/audio/AudioService.java b/vlc-android/src/org/videolan/vlc/audio/AudioService.java
index a7f91eb..1a033b2 100644
--- a/vlc-android/src/org/videolan/vlc/audio/AudioService.java
+++ b/vlc-android/src/org/videolan/vlc/audio/AudioService.java
@@ -64,7 +64,7 @@ import org.videolan.libvlc.MediaPlayer;
 import org.videolan.vlc.BuildConfig;
 import org.videolan.vlc.MediaDatabase;
 import org.videolan.libvlc.MediaWrapper;
-import org.videolan.libvlc.MediaWrapperList;
+import org.videolan.vlc.MediaWrapperList;
 import org.videolan.vlc.MediaWrapperListPlayer;
 import org.videolan.vlc.R;
 import org.videolan.vlc.RemoteControlClientReceiver;