jvlc: LibVlcMediaDescriptor renamed to LibVlcMedia

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java
index d282963b800bc12a4d1f8ba0687eb0e6ce028a7a..7766328ef8328e1182e27ab378ac0247257095aa 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaDescriptor.java
@@ -27,13 +27,13 @@ package org.videolan.jvlc;
 
 import org.videolan.jvlc.internal.LibVlc;
 import org.videolan.jvlc.internal.LibVlc.LibVlcEventManager;
-import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
+import org.videolan.jvlc.internal.LibVlc.LibVlcMedia;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
 
 
 public class MediaDescriptor
 {
-    private LibVlcMediaDescriptor instance;
+    private LibVlcMedia instance;
     private LibVlc libvlc;
     private LibVlcEventManager eventManager;
     private boolean released;
@@ -50,7 +50,7 @@ public class MediaDescriptor
         eventManager = libvlc.libvlc_media_event_manager(instance, exception);
     }
 
-    MediaDescriptor(JVLC jvlc, LibVlcMediaDescriptor instance)
+    MediaDescriptor(JVLC jvlc, LibVlcMedia instance)
     {
         libvlc_exception_t exception = new libvlc_exception_t();
         libvlc = jvlc.getLibvlc();
@@ -90,7 +90,7 @@ public class MediaDescriptor
      * Returns the instance.
      * @return the instance
      */
-    LibVlcMediaDescriptor getInstance()
+    LibVlcMedia getInstance()
     {
         return instance;
     }

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaList.java b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaList.java
index e7f65d86f28104615daa78612f4148943b9e5e63..c7dcbd03b2369e855634e0ab17e0d5a482c09325 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/MediaList.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/MediaList.java
@@ -30,7 +30,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 
 import org.videolan.jvlc.internal.LibVlc.LibVlcEventManager;
-import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
+import org.videolan.jvlc.internal.LibVlc.LibVlcMedia;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaList;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
 
@@ -112,7 +112,7 @@ public class MediaList
         {
             throw new IndexOutOfBoundsException();
         }
-        LibVlcMediaDescriptor descriptor = jvlc.getLibvlc().libvlc_media_list_item_at_index(instance, index, exception);
+        LibVlcMedia descriptor = jvlc.getLibvlc().libvlc_media_list_item_at_index(instance, index, exception);
         return new MediaDescriptor(jvlc, descriptor);
     }
 

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
index ebbba45087fc3f5fbc5dce7b610048fbd97415f8..66725fb16b6217354d98b54021c94189d0d54685 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
@@ -99,7 +99,7 @@ public interface LibVlc extends Library
     public class media_subitem_added extends Structure
     {
 
-        public LibVlcMediaDescriptor new_child;
+        public LibVlcMedia new_child;
     }
 
     public class media_duration_changed extends Structure
@@ -117,7 +117,7 @@ public interface LibVlc extends Library
     public class media_freed extends Structure
     {
 
-        public LibVlcMediaDescriptor md;
+        public LibVlcMedia md;
     }
 
     public class media_state_changed extends Structure
@@ -146,7 +146,7 @@ public interface LibVlc extends Library
     public class media_list_item_added extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -154,7 +154,7 @@ public interface LibVlc extends Library
     public class media_list_will_add_item extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -162,7 +162,7 @@ public interface LibVlc extends Library
     public class media_list_item_deleted extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -170,7 +170,7 @@ public interface LibVlc extends Library
     public class media_list_will_delete_item extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -179,7 +179,7 @@ public interface LibVlc extends Library
     public class media_list_view_item_added extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -187,7 +187,7 @@ public interface LibVlc extends Library
     public class media_list_view_will_add_item extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -195,7 +195,7 @@ public interface LibVlc extends Library
     public class media_list_view_item_deleted extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -203,7 +203,7 @@ public interface LibVlc extends Library
     public class media_list_view_will_delete_item extends Structure
     {
 
-        public LibVlcMediaDescriptor item;
+        public LibVlcMedia item;
 
         public int index;
     }
@@ -261,7 +261,7 @@ public interface LibVlc extends Library
     {
     }
 
-    public class LibVlcMediaDescriptor extends PointerType
+    public class LibVlcMedia extends PointerType
     {
     }
 
@@ -407,21 +407,21 @@ public interface LibVlc extends Library
 
     // media descriptor
 
-    LibVlcMediaDescriptor libvlc_media_new(LibVlcInstance libvlc_instance, String mrl, libvlc_exception_t exception);
+    LibVlcMedia libvlc_media_new(LibVlcInstance libvlc_instance, String mrl, libvlc_exception_t exception);
 
-    void libvlc_media_add_option(LibVlcMediaDescriptor media, String option, libvlc_exception_t exception);
+    void libvlc_media_add_option(LibVlcMedia media, String option, libvlc_exception_t exception);
 
-    String libvlc_media_get_mrl(LibVlcMediaDescriptor media);
+    String libvlc_media_get_mrl(LibVlcMedia media);
 
-    void libvlc_media_release(LibVlcMediaDescriptor media);
+    void libvlc_media_release(LibVlcMedia media);
 
-    LibVlcEventManager libvlc_media_event_manager(LibVlcMediaDescriptor media, libvlc_exception_t exception);
+    LibVlcEventManager libvlc_media_event_manager(LibVlcMedia media, libvlc_exception_t exception);
 
     // media player
 
     LibVlcMediaInstance libvlc_media_player_new(LibVlcInstance instance, libvlc_exception_t exception);
 
-    LibVlcMediaInstance libvlc_media_player_new_from_media(LibVlcMediaDescriptor media, libvlc_exception_t exception);
+    LibVlcMediaInstance libvlc_media_player_new_from_media(LibVlcMedia media, libvlc_exception_t exception);
 
     void libvlc_media_player_play(LibVlcMediaInstance media_player, libvlc_exception_t exception);
 
@@ -465,25 +465,25 @@ public interface LibVlc extends Library
     void libvlc_media_list_add_file_content(LibVlcMediaList libvlc_media_list, String fileName,
         libvlc_exception_t exception);
 
-    void libvlc_media_list_set_media(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
+    void libvlc_media_list_set_media(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
         libvlc_exception_t exception);
 
-    LibVlcMediaDescriptor libvlc_media_list_media(LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
+    LibVlcMedia libvlc_media_list_media(LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
 
-    void libvlc_media_list_add_media(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
+    void libvlc_media_list_add_media(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
         libvlc_exception_t exception);
 
-    void libvlc_media_list_insert_media(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
+    void libvlc_media_list_insert_media(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
         int position, libvlc_exception_t exception);
 
     void libvlc_media_list_remove_index(LibVlcMediaList libvlc_media_list, int position, libvlc_exception_t exception);
 
     int libvlc_media_list_count(LibVlcMediaList libvlc_media_list, libvlc_exception_t exception);
 
-    LibVlcMediaDescriptor libvlc_media_list_item_at_index(LibVlcMediaList libvlc_media_list, int position,
+    LibVlcMedia libvlc_media_list_item_at_index(LibVlcMediaList libvlc_media_list, int position,
         libvlc_exception_t exception);
 
-    int libvlc_media_list_index_of_item(LibVlcMediaList libvlc_media_list, LibVlcMediaDescriptor libvlc_media,
+    int libvlc_media_list_index_of_item(LibVlcMediaList libvlc_media_list, LibVlcMedia libvlc_media,
         libvlc_exception_t exception);
 
     int libvlc_media_list_is_readonly(LibVlcMediaList libvlc_media_list);
@@ -514,7 +514,7 @@ public interface LibVlc extends Library
         libvlc_exception_t exception);
 
     void libvlc_media_list_player_play_item(LibVlcMediaListPlayer libvlc_media_list_player,
-        LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
+        LibVlcMedia libvlc_media, libvlc_exception_t exception);
 
     void libvlc_media_list_player_stop(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
 

diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
index b4f264d0815ae0b0247ff0c636e34509192b0859..ce9ab0e12d4bb21544ec51596118a31d5656f8ef 100644 (file)
--- a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
+++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
@@ -33,7 +33,7 @@ import javax.swing.JPanel;
 import org.videolan.jvlc.internal.LibVlc.LibVlcCallback;
 import org.videolan.jvlc.internal.LibVlc.LibVlcEventManager;
 import org.videolan.jvlc.internal.LibVlc.LibVlcInstance;
-import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
+import org.videolan.jvlc.internal.LibVlc.LibVlcMedia;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaInstance;
 import org.videolan.jvlc.internal.LibVlc.libvlc_event_t;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
@@ -61,7 +61,7 @@ public class LibVlcImpl
         
         LibVlcInstance libvlc_instance_t = libVlc.libvlc_new(0, new String[] {"/usr/local/bin/vlc"}, exception);
 
-        LibVlcMediaDescriptor mediaDescriptor = libVlc
+        LibVlcMedia mediaDescriptor = libVlc
             .libvlc_media_new(libvlc_instance_t, "/home/carone/a.avi", exception);
 
         LibVlcMediaInstance mediaPlayer = libVlc.libvlc_media_player_new_from_media(mediaDescriptor, exception);

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java
index 0f43356c1fcd8a6889c9fbc8a3ca23728b27f77c..cd54a567357fd88c4ce3cdc71cc9c88934b0a5c4 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java
@@ -27,7 +27,7 @@ package org.videolan.jvlc.internal;
 
 import org.junit.Assert;
 import org.junit.Test;
-import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
+import org.videolan.jvlc.internal.LibVlc.LibVlcMedia;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaInstance;
 
 
@@ -52,7 +52,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
     @Test
     public void mediaInstancePlay()
     {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
         libvlc.libvlc_media_player_play(mi, exception);
         Assert.assertEquals(0, exception.raised);
@@ -61,7 +61,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
     @Test
     public void mediaInstancePauseBad()
     {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
         libvlc.libvlc_media_player_pause(mi, exception);
         Assert.assertEquals(1, exception.raised);
@@ -70,7 +70,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
     @Test
     public void mediaInstancePause()
     {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
         libvlc.libvlc_media_player_play(mi, exception);
         libvlc.libvlc_media_player_pause(mi, exception);
@@ -80,7 +80,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
     @Test
     public void mediaInstanceSetPosition()
     {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
         libvlc.libvlc_media_player_play(mi, exception);
         libvlc.libvlc_media_player_set_position(mi, 0.5f, exception);
@@ -92,7 +92,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
     @Test
     public void mediaInstanceStop()
     {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
         libvlc.libvlc_media_player_stop(mi, exception);
         Assert.assertEquals(0, exception.raised);
@@ -101,7 +101,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
     @Test
     public void mediaInstanceStop2() throws Exception
     {
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
         libvlc.libvlc_media_player_play(mi, exception);
         Thread.sleep(100);

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
index 204201400c28e77da0089fcd4dd6081767b455d9..7a5e49bfddfffb8fba7b4229c7af7bce8f5a386b 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaDescriptorTest.java
@@ -28,7 +28,7 @@ package org.videolan.jvlc.internal;
 import junit.framework.Assert;
 
 import org.junit.Test;
-import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
+import org.videolan.jvlc.internal.LibVlc.LibVlcMedia;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
 
 
@@ -39,7 +39,7 @@ public class MediaDescriptorTest extends AbstractVLCInternalTest
     public void mediaDescriptorNew() throws Exception
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         Assert.assertNotNull(md);
         Assert.assertEquals(0, exception.raised);
     }
@@ -48,7 +48,7 @@ public class MediaDescriptorTest extends AbstractVLCInternalTest
     public void mediaDescriptorGetMrl()
     {
         libvlc_exception_t exception = new libvlc_exception_t();
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         String mdMrl = libvlc.libvlc_media_get_mrl(md);
         Assert.assertEquals(mrl, mdMrl);
     }

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
index bad81380fc8413134dd351d7b9b28c758aa5fdd2..994282f79d718feed36d9abade314cbdebfac88c 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
@@ -29,7 +29,7 @@ import junit.framework.Assert;
 
 import org.junit.After;
 import org.junit.Test;
-import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
+import org.videolan.jvlc.internal.LibVlc.LibVlcMedia;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaInstance;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaList;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaListPlayer;
@@ -69,7 +69,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
         Assert.assertEquals(0, exception.raised);
@@ -108,7 +108,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
         current = mediaListPlayer;
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
         libvlc.libvlc_media_list_player_play(mediaListPlayer, exception);
@@ -124,7 +124,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
         libvlc.libvlc_media_list_player_play_item_at_index(mediaListPlayer, 0, exception);
@@ -158,7 +158,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
         libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);
@@ -198,7 +198,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
         libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);
@@ -233,7 +233,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
     {
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         LibVlcMediaInstance mi = libvlc.libvlc_media_player_new_from_media(md, exception);
         libvlc.libvlc_media_list_player_set_media_player(mediaListPlayer, mi, exception);
         Assert.assertEquals(0, exception.raised);
@@ -257,7 +257,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
@@ -274,7 +274,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
-        LibVlcMediaDescriptor mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+        LibVlcMedia mediaDescriptor = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
         libvlc.libvlc_media_list_add_media(mediaList, mediaDescriptor, exception);
         libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
         libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);

diff --git a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
index c9acec01809963676a7acba9774c6f85a7fbb002..97e54afe967084e4e0436f810c17462e67fcf7dc 100644 (file)
--- a/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
+++ b/bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListTest.java
@@ -28,7 +28,7 @@ package org.videolan.jvlc.internal;
 import junit.framework.Assert;
 
 import org.junit.Test;
-import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
+import org.videolan.jvlc.internal.LibVlc.LibVlcMedia;
 import org.videolan.jvlc.internal.LibVlc.LibVlcMediaList;
 import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
 
@@ -51,7 +51,7 @@ public class MediaListTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
+        LibVlcMedia libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);
@@ -65,7 +65,7 @@ public class MediaListTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
+        LibVlcMedia libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);
@@ -95,7 +95,7 @@ public class MediaListTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
+        LibVlcMedia libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);
@@ -111,7 +111,7 @@ public class MediaListTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
+        LibVlcMedia libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);
@@ -126,7 +126,7 @@ public class MediaListTest extends AbstractVLCInternalTest
         libvlc_exception_t exception = new libvlc_exception_t();
         LibVlcMediaList mediaList = libvlc.libvlc_media_list_new(libvlcInstance, exception);
         String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
-        LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
+        LibVlcMedia libvlc_media = libvlc.libvlc_media_new(
             libvlcInstance,
             mrl,
             exception);