Commit 8b06bdb4 authored by Filippo Carone's avatar Filippo Carone

more libvlc_media_list_player tests

parent 5df4f82a
...@@ -32,6 +32,7 @@ import org.junit.Before; ...@@ -32,6 +32,7 @@ import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.videolan.jvlc.internal.LibVlc.LibVlcInstance; import org.videolan.jvlc.internal.LibVlc.LibVlcInstance;
import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor; import org.videolan.jvlc.internal.LibVlc.LibVlcMediaDescriptor;
import org.videolan.jvlc.internal.LibVlc.LibVlcMediaInstance;
import org.videolan.jvlc.internal.LibVlc.LibVlcMediaList; import org.videolan.jvlc.internal.LibVlc.LibVlcMediaList;
import org.videolan.jvlc.internal.LibVlc.LibVlcMediaListPlayer; import org.videolan.jvlc.internal.LibVlc.LibVlcMediaListPlayer;
import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t; import org.videolan.jvlc.internal.LibVlc.libvlc_exception_t;
...@@ -46,7 +47,6 @@ public class MediaListPlayerTest ...@@ -46,7 +47,6 @@ public class MediaListPlayerTest
private String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath(); private String mrl = this.getClass().getResource("/raffa_voice.ogg").getPath();
@Before @Before
public void testSetup() public void testSetup()
{ {
...@@ -111,9 +111,9 @@ public class MediaListPlayerTest ...@@ -111,9 +111,9 @@ public class MediaListPlayerTest
} }
/** /**
* this fails: see https://trac.videolan.org/vlc/attachment/ticket/1527 * this fails: see https://trac.videolan.org/vlc/ticket/1527
*/ */
@Test // @Test
public void mediaListPlayerPlay() public void mediaListPlayerPlay()
{ {
libvlc_exception_t exception = new libvlc_exception_t(); libvlc_exception_t exception = new libvlc_exception_t();
...@@ -148,7 +148,63 @@ public class MediaListPlayerTest ...@@ -148,7 +148,63 @@ public class MediaListPlayerTest
libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception); libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception);
libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception); libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception); libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);
Thread.sleep(6000); }
@Test
public void mediaListPlayerPause()
{
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_descriptor_new(libvlcInstance, mrl, exception);
libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception);
libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);
libvlc.libvlc_media_list_player_pause(mediaListPlayer, exception);
Assert.assertEquals(0, exception.raised);
int state = libvlc.libvlc_media_list_player_get_state(mediaListPlayer, exception);
Assert.assertEquals(LibVlcState.libvlc_Paused.ordinal(), state);
}
@Test
public void mediaListPlayerIsPlaying() throws Exception
{
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_descriptor_new(libvlcInstance, mrl, exception);
libvlc.libvlc_media_list_add_media_descriptor(mediaList, mediaDescriptor, exception);
libvlc.libvlc_media_list_player_set_media_list(mediaListPlayer, mediaList, exception);
libvlc.libvlc_media_list_player_play_item(mediaListPlayer, mediaDescriptor, exception);
while (true)
{
int playing = libvlc.libvlc_media_list_player_is_playing(mediaListPlayer, exception);
Assert.assertEquals(0, exception.raised);
if (playing == 1)
{
break;
}
Thread.sleep(150);
}
Assert.assertEquals(LibVlcState.libvlc_Playing.ordinal(), libvlc.libvlc_media_list_player_get_state(
mediaListPlayer,
exception));
libvlc.libvlc_media_list_player_stop(mediaListPlayer, exception);
while (true)
{
int playing = libvlc.libvlc_media_list_player_is_playing(mediaListPlayer, exception);
Assert.assertEquals(0, exception.raised);
if (playing == 0)
{
break;
}
Thread.sleep(150);
}
Assert.assertEquals(LibVlcState.libvlc_Stopped.ordinal(), libvlc.libvlc_media_list_player_get_state(
mediaListPlayer,
exception));
} }
@Test @Test
...@@ -160,4 +216,15 @@ public class MediaListPlayerTest ...@@ -160,4 +216,15 @@ public class MediaListPlayerTest
Assert.assertEquals(LibVlcState.libvlc_Stopped.ordinal(), state); Assert.assertEquals(LibVlcState.libvlc_Stopped.ordinal(), state);
} }
@Test
public void mediaListPlayerSetMediaInstance()
{
libvlc_exception_t exception = new libvlc_exception_t();
LibVlcMediaListPlayer mediaListPlayer = libvlc.libvlc_media_list_player_new(libvlcInstance, exception);
LibVlcMediaDescriptor md = libvlc.libvlc_media_descriptor_new(libvlcInstance, mrl, exception);
LibVlcMediaInstance mi = libvlc.libvlc_media_instance_new_from_media_descriptor(md, exception);
libvlc.libvlc_media_list_player_set_media_instance(mediaListPlayer, mi, exception);
Assert.assertEquals(0, exception.raised);
}
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment