[Android] MediaWrapper: add slaves

Thomas Guillem git at videolan.org
Thu May 19 15:58:34 CEST 2016


vlc-android | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed May 18 16:57:29 2016 +0200| [fb9aeba207f90a4f53b258e801577a3aa8350846] | committer: Thomas Guillem

MediaWrapper: add slaves

> https://code.videolan.org/videolan/vlc-android/commit/fb9aeba207f90a4f53b258e801577a3aa8350846
---

 vlc-android/src/org/videolan/vlc/media/MediaWrapper.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java b/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java
index 09deef5..a291d07 100644
--- a/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java
+++ b/vlc-android/src/org/videolan/vlc/media/MediaWrapper.java
@@ -24,6 +24,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -85,6 +86,7 @@ public class MediaWrapper implements Parcelable {
     private boolean mIsPictureParsed;
     private int mFlags = 0;
     private long mLastModified = 0l;
+    private Media.Slave mSlaves[] = null;
 
     /**
      * Create a new MediaWrapper
@@ -141,6 +143,7 @@ public class MediaWrapper implements Parcelable {
             updateMeta(media);
             if (mType == TYPE_ALL && media.getType() == Media.Type.Directory)
                 mType = TYPE_DIR;
+            mSlaves = media.getSlaves();
         }
         defineType();
     }
@@ -475,6 +478,11 @@ public class MediaWrapper implements Parcelable {
         mFlags &= ~flags;
     }
 
+    @Nullable
+    public Media.Slave[] getSlaves() {
+        return mSlaves;
+    }
+
     @Override
     public int describeContents() {
         return 0;



More information about the Android mailing list