[Android] Move MediaWrapperList to libVLC

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 23 20:43:03 2015 +0200| [6ceb84e0b6a46e59d8e8bec36ef2ce90c56d4598] | committer: Jean-Baptiste Kempf

Move MediaWrapperList to libVLC

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

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

diff --git a/vlc-android/src/org/videolan/vlc/MediaWrapperList.java b/libvlc/src/org/videolan/libvlc/MediaWrapperList.java
similarity index 98%
rename from vlc-android/src/org/videolan/vlc/MediaWrapperList.java
rename to libvlc/src/org/videolan/libvlc/MediaWrapperList.java
index 6e7aef8..4f7a89b 100644
--- a/vlc-android/src/org/videolan/vlc/MediaWrapperList.java
+++ b/libvlc/src/org/videolan/libvlc/MediaWrapperList.java
@@ -18,9 +18,7 @@
  * 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.vlc;
-
-import android.support.annotation.Nullable;
+package org.videolan.libvlc;
 
 import java.util.ArrayList;
 
@@ -144,7 +142,6 @@ 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 23ebe1e..5f63e7e 100644
--- a/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
+++ b/vlc-android/src/org/videolan/vlc/MediaWrapperListPlayer.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import org.videolan.libvlc.LibVLC;
 import org.videolan.libvlc.Media;
 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 e5146e3..496b8a2 100644
--- a/vlc-android/src/org/videolan/vlc/audio/AudioService.java
+++ b/vlc-android/src/org/videolan/vlc/audio/AudioService.java
@@ -63,7 +63,7 @@ import org.videolan.libvlc.Media;
 import org.videolan.vlc.BuildConfig;
 import org.videolan.vlc.MediaDatabase;
 import org.videolan.libvlc.MediaWrapper;
-import org.videolan.vlc.MediaWrapperList;
+import org.videolan.libvlc.MediaWrapperList;
 import org.videolan.vlc.MediaWrapperListPlayer;
 import org.videolan.vlc.R;
 import org.videolan.vlc.RemoteControlClientReceiver;