Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
8b832c45
Commit
8b832c45
authored
Dec 21, 2008
by
Filippo Carone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
jvlc: LibVlcMediaInstance renamed to LibVlcMediaPlayer
parent
0c90be80
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
62 additions
and
62 deletions
+62
-62
bindings/java/core/src/main/java/org/videolan/jvlc/MediaPlayer.java
...ava/core/src/main/java/org/videolan/jvlc/MediaPlayer.java
+4
-4
bindings/java/core/src/main/java/org/videolan/jvlc/Playlist.java
...s/java/core/src/main/java/org/videolan/jvlc/Playlist.java
+2
-2
bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
...core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
+42
-42
bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
.../src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
+3
-3
bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java
...ava/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java
+9
-9
bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
.../java/org/videolan/jvlc/internal/MediaListPlayerTest.java
+2
-2
No files found.
bindings/java/core/src/main/java/org/videolan/jvlc/MediaPlayer.java
View file @
8b832c45
...
...
@@ -34,14 +34,14 @@ import org.videolan.jvlc.event.MediaPlayerListener;
import
org.videolan.jvlc.internal.LibVlc
;
import
org.videolan.jvlc.internal.LibVlcEventType
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcEventManager
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Instance
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Player
;
import
org.videolan.jvlc.internal.LibVlc.libvlc_exception_t
;
public
class
MediaPlayer
{
private
final
LibVlcMedia
Instance
instance
;
private
final
LibVlcMedia
Player
instance
;
private
final
LibVlc
libvlc
;
...
...
@@ -51,7 +51,7 @@ public class MediaPlayer
private
MediaDescriptor
mediaDescriptor
;
MediaPlayer
(
JVLC
jvlc
,
LibVlcMedia
Instance
instance
)
MediaPlayer
(
JVLC
jvlc
,
LibVlcMedia
Player
instance
)
{
libvlc_exception_t
exception
=
new
libvlc_exception_t
();
this
.
instance
=
instance
;
...
...
@@ -188,7 +188,7 @@ public class MediaPlayer
* Returns the instance.
* @return the instance
*/
LibVlcMedia
Instance
getInstance
()
LibVlcMedia
Player
getInstance
()
{
return
instance
;
}
...
...
bindings/java/core/src/main/java/org/videolan/jvlc/Playlist.java
View file @
8b832c45
...
...
@@ -31,7 +31,7 @@ package org.videolan.jvlc;
import
org.videolan.jvlc.internal.LibVlc
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcInstance
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Instance
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Player
;
import
org.videolan.jvlc.internal.LibVlc.libvlc_exception_t
;
/**
...
...
@@ -119,7 +119,7 @@ public class Playlist {
public
MediaPlayer
getMediaInstance
()
{
libvlc_exception_t
exception
=
new
libvlc_exception_t
();
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_playlist_get_media_player
(
libvlcInstance
,
exception
);
LibVlcMedia
Player
mi
=
libvlc
.
libvlc_playlist_get_media_player
(
libvlcInstance
,
exception
);
return
new
MediaPlayer
(
jvlc
,
mi
);
}
...
...
bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java
View file @
8b832c45
...
...
@@ -265,7 +265,7 @@ public interface LibVlc extends Library
{
}
public
class
LibVlcMedia
Instance
extends
PointerType
public
class
LibVlcMedia
Player
extends
PointerType
{
}
...
...
@@ -319,36 +319,36 @@ public interface LibVlc extends Library
void
libvlc_video_set_parent
(
LibVlcInstance
libvlc_instance
,
long
drawable
,
libvlc_exception_t
exception
);
void
libvlc_toggle_fullscreen
(
LibVlcMedia
Instance
libvlc_instance
);
void
libvlc_toggle_fullscreen
(
LibVlcMedia
Player
libvlc_instance
);
void
libvlc_set_fullscreen
(
LibVlcMedia
Instance
instance
,
int
fullscreen
,
libvlc_exception_t
exception
);
void
libvlc_set_fullscreen
(
LibVlcMedia
Player
instance
,
int
fullscreen
,
libvlc_exception_t
exception
);
int
libvlc_get_fullscreen
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
int
libvlc_get_fullscreen
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
int
libvlc_video_get_height
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
int
libvlc_video_get_height
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
int
libvlc_video_get_width
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
int
libvlc_video_get_width
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
String
libvlc_video_get_aspect_ration
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
String
libvlc_video_get_aspect_ration
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
void
libvlc_video_set_aspect_ration
(
LibVlcMedia
Instance
instance
,
String
ratio
,
libvlc_exception_t
exception
);
void
libvlc_video_set_aspect_ration
(
LibVlcMedia
Player
instance
,
String
ratio
,
libvlc_exception_t
exception
);
int
libvlc_video_get_spu
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
int
libvlc_video_get_spu
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
int
libvlc_video_set_spu
(
LibVlcMedia
Instance
instance
,
int
spu
,
libvlc_exception_t
exception
);
int
libvlc_video_set_spu
(
LibVlcMedia
Player
instance
,
int
spu
,
libvlc_exception_t
exception
);
String
libvlc_video_get_crop_geometry
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
String
libvlc_video_get_crop_geometry
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
void
libvlc_video_set_crop_geometry
(
LibVlcMedia
Instance
instance
,
String
geometry
,
libvlc_exception_t
exception
);
void
libvlc_video_set_crop_geometry
(
LibVlcMedia
Player
instance
,
String
geometry
,
libvlc_exception_t
exception
);
void
libvlc_video_take_snapshot
(
LibVlcMedia
Instance
instance
,
String
filename
,
int
width
,
int
height
,
void
libvlc_video_take_snapshot
(
LibVlcMedia
Player
instance
,
String
filename
,
int
width
,
int
height
,
libvlc_exception_t
exception
);
void
libvlc_video_destroy
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
void
libvlc_video_destroy
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
void
libvlc_video_resize
(
LibVlcMedia
Instance
instance
,
int
width
,
int
height
,
libvlc_exception_t
exception
);
void
libvlc_video_resize
(
LibVlcMedia
Player
instance
,
int
width
,
int
height
,
libvlc_exception_t
exception
);
void
libvlc_video_reparent
(
LibVlcMedia
Instance
instance
,
long
drawable
,
libvlc_exception_t
exception
);
void
libvlc_video_reparent
(
LibVlcMedia
Player
instance
,
long
drawable
,
libvlc_exception_t
exception
);
void
libvlc_video_set_size
(
LibVlcInstance
instance
,
int
width
,
int
height
,
libvlc_exception_t
exception
);
...
...
@@ -364,11 +364,11 @@ public interface LibVlc extends Library
int
libvlc_audio_set_volume
(
LibVlcInstance
instance
,
int
volume
,
libvlc_exception_t
exception
);
int
libvlc_audio_get_track_count
(
LibVlcMedia
Instance
mediaInstance
,
libvlc_exception_t
exception
);
int
libvlc_audio_get_track_count
(
LibVlcMedia
Player
mediaInstance
,
libvlc_exception_t
exception
);
int
libvlc_audio_get_track
(
LibVlcMedia
Instance
mediaInstance
,
libvlc_exception_t
exception
);
int
libvlc_audio_get_track
(
LibVlcMedia
Player
mediaInstance
,
libvlc_exception_t
exception
);
void
libvlc_audio_set_track
(
LibVlcMedia
Instance
mediaInstance
,
int
channel
,
libvlc_exception_t
exception
);
void
libvlc_audio_set_track
(
LibVlcMedia
Player
mediaInstance
,
int
channel
,
libvlc_exception_t
exception
);
int
libvlc_audio_get_channel
(
LibVlcInstance
instance
,
libvlc_exception_t
exception
);
...
...
@@ -399,11 +399,11 @@ public interface LibVlc extends Library
int
libvlc_playlist_delete_item
(
LibVlcInstance
instance
,
int
itemIndex
,
libvlc_exception_t
exception
);
LibVlcMedia
Instance
libvlc_playlist_get_media_player
(
LibVlcInstance
instance
,
libvlc_exception_t
exception
);
LibVlcMedia
Player
libvlc_playlist_get_media_player
(
LibVlcInstance
instance
,
libvlc_exception_t
exception
);
int
libvlc_media_player_is_seekable
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
int
libvlc_media_player_is_seekable
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
int
libvlc_media_player_can_pause
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
int
libvlc_media_player_can_pause
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
// media descriptor
...
...
@@ -431,42 +431,42 @@ public interface LibVlc extends Library
// media player
LibVlcMedia
Instance
libvlc_media_player_new
(
LibVlcInstance
instance
,
libvlc_exception_t
exception
);
LibVlcMedia
Player
libvlc_media_player_new
(
LibVlcInstance
instance
,
libvlc_exception_t
exception
);
LibVlcMedia
Instance
libvlc_media_player_new_from_media
(
LibVlcMedia
media
,
libvlc_exception_t
exception
);
LibVlcMedia
Player
libvlc_media_player_new_from_media
(
LibVlcMedia
media
,
libvlc_exception_t
exception
);
void
libvlc_media_player_play
(
LibVlcMedia
Instance
media_player
,
libvlc_exception_t
exception
);
void
libvlc_media_player_play
(
LibVlcMedia
Player
media_player
,
libvlc_exception_t
exception
);
void
libvlc_media_player_pause
(
LibVlcMedia
Instance
media_player
,
libvlc_exception_t
exception
);
void
libvlc_media_player_pause
(
LibVlcMedia
Player
media_player
,
libvlc_exception_t
exception
);
void
libvlc_media_player_stop
(
LibVlcMedia
Instance
media_player
,
libvlc_exception_t
exception
);
void
libvlc_media_player_stop
(
LibVlcMedia
Player
media_player
,
libvlc_exception_t
exception
);
void
libvlc_media_player_set_drawable
(
LibVlcMedia
Instance
libvlc_media_player
,
int
drawable
,
void
libvlc_media_player_set_drawable
(
LibVlcMedia
Player
libvlc_media_player
,
int
drawable
,
libvlc_exception_t
exception
);
long
libvlc_media_player_get_length
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
long
libvlc_media_player_get_length
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
long
libvlc_media_player_get_time
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
long
libvlc_media_player_get_time
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
void
libvlc_media_player_set_time
(
LibVlcMedia
Instance
instance
,
long
time
,
libvlc_exception_t
exception
);
void
libvlc_media_player_set_time
(
LibVlcMedia
Player
instance
,
long
time
,
libvlc_exception_t
exception
);
float
libvlc_media_player_get_position
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
float
libvlc_media_player_get_position
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
void
libvlc_media_player_set_position
(
LibVlcMedia
Instance
instance
,
float
position
,
libvlc_exception_t
exception
);
void
libvlc_media_player_set_position
(
LibVlcMedia
Player
instance
,
float
position
,
libvlc_exception_t
exception
);
int
libvlc_media_player_will_play
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
int
libvlc_media_player_will_play
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
void
libvlc_media_player_set_rate
(
LibVlcMedia
Instance
instance
,
float
rate
,
libvlc_exception_t
exception
);
void
libvlc_media_player_set_rate
(
LibVlcMedia
Player
instance
,
float
rate
,
libvlc_exception_t
exception
);
float
libvlc_media_player_get_rate
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
float
libvlc_media_player_get_rate
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
int
libvlc_media_player_has_vout
(
LibVlcMedia
Instance
instance2
,
libvlc_exception_t
exception
);
int
libvlc_media_player_has_vout
(
LibVlcMedia
Player
instance2
,
libvlc_exception_t
exception
);
float
libvlc_media_player_get_fps
(
LibVlcMedia
Instance
instance2
,
libvlc_exception_t
exception
);
float
libvlc_media_player_get_fps
(
LibVlcMedia
Player
instance2
,
libvlc_exception_t
exception
);
void
libvlc_media_player_release
(
LibVlcMedia
Instance
instance
);
void
libvlc_media_player_release
(
LibVlcMedia
Player
instance
);
LibVlcEventManager
libvlc_media_player_event_manager
(
LibVlcMedia
Instance
media_player
,
libvlc_exception_t
exception
);
LibVlcEventManager
libvlc_media_player_event_manager
(
LibVlcMedia
Player
media_player
,
libvlc_exception_t
exception
);
// media list
...
...
@@ -509,7 +509,7 @@ public interface LibVlc extends Library
void
libvlc_media_list_player_release
(
LibVlcMediaListPlayer
libvlc_media_list_player
);
void
libvlc_media_list_player_set_media_player
(
LibVlcMediaListPlayer
libvlc_media_list_player
,
LibVlcMedia
Instance
libvlc_media_player
,
libvlc_exception_t
exception
);
LibVlcMedia
Player
libvlc_media_player
,
libvlc_exception_t
exception
);
void
libvlc_media_list_player_set_media_list
(
LibVlcMediaListPlayer
libvlc_media_list_player
,
LibVlcMediaList
libvlc_media_list
,
libvlc_exception_t
exception
);
...
...
@@ -583,7 +583,7 @@ public interface LibVlc extends Library
void
libvlc_event_detach
(
LibVlcEventManager
event_manager
,
int
event_type
,
LibVlcCallback
callback
,
Pointer
userData
,
libvlc_exception_t
excecption
);
void
libvlc_toggle_fullscreen
(
LibVlcMedia
Instance
instance
,
libvlc_exception_t
exception
);
void
libvlc_toggle_fullscreen
(
LibVlcMedia
Player
instance
,
libvlc_exception_t
exception
);
// logging
...
...
bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlcImpl.java
View file @
8b832c45
...
...
@@ -34,7 +34,7 @@ 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.LibVlcMedia
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Instance
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Player
;
import
org.videolan.jvlc.internal.LibVlc.libvlc_event_t
;
import
org.videolan.jvlc.internal.LibVlc.libvlc_exception_t
;
...
...
@@ -62,9 +62,9 @@ public class LibVlcImpl
LibVlcInstance
libvlc_instance_t
=
libVlc
.
libvlc_new
(
0
,
new
String
[]
{
"/usr/local/bin/vlc"
},
exception
);
LibVlcMedia
mediaDescriptor
=
libVlc
.
libvlc_media_new
(
libvlc_instance_t
,
"/home/carone/a.avi"
,
exception
);
.
libvlc_media_new
(
libvlc_instance_t
,
"/home/carone/a
pps/a
.avi"
,
exception
);
LibVlcMedia
Instance
mediaPlayer
=
libVlc
.
libvlc_media_player_new_from_media
(
mediaDescriptor
,
exception
);
LibVlcMedia
Player
mediaPlayer
=
libVlc
.
libvlc_media_player_new_from_media
(
mediaDescriptor
,
exception
);
LibVlcEventManager
mediaInstanceEventManager
=
libVlc
.
libvlc_media_player_event_manager
(
mediaPlayer
,
exception
);
...
...
bindings/java/core/src/test/java/org/videolan/jvlc/internal/LibVlcMediaPlayerTest.java
View file @
8b832c45
...
...
@@ -28,7 +28,7 @@ package org.videolan.jvlc.internal;
import
org.junit.Assert
;
import
org.junit.Test
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Instance
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Player
;
public
class
LibVlcMediaPlayerTest
extends
AbstractVLCInternalTest
...
...
@@ -36,7 +36,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
@Test
public
void
mediaInstanceNew
()
{
LibVlcMedia
Instance
instance
=
libvlc
.
libvlc_media_player_new
(
libvlcInstance
,
exception
);
LibVlcMedia
Player
instance
=
libvlc
.
libvlc_media_player_new
(
libvlcInstance
,
exception
);
Assert
.
assertNotNull
(
instance
);
Assert
.
assertEquals
(
0
,
exception
.
raised
);
}
...
...
@@ -44,7 +44,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
@Test
public
void
mediaInstancePlayBad
()
{
LibVlcMedia
Instance
instance
=
libvlc
.
libvlc_media_player_new
(
libvlcInstance
,
exception
);
LibVlcMedia
Player
instance
=
libvlc
.
libvlc_media_player_new
(
libvlcInstance
,
exception
);
libvlc
.
libvlc_media_player_play
(
instance
,
exception
);
Assert
.
assertEquals
(
1
,
exception
.
raised
);
// no associated media descriptor
}
...
...
@@ -53,7 +53,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
public
void
mediaInstancePlay
()
{
LibVlcMedia
md
=
libvlc
.
libvlc_media_new
(
libvlcInstance
,
mrl
,
exception
);
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
LibVlcMedia
Player
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
libvlc
.
libvlc_media_player_play
(
mi
,
exception
);
Assert
.
assertEquals
(
0
,
exception
.
raised
);
}
...
...
@@ -62,7 +62,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
public
void
mediaInstancePauseBad
()
{
LibVlcMedia
md
=
libvlc
.
libvlc_media_new
(
libvlcInstance
,
mrl
,
exception
);
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
LibVlcMedia
Player
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
libvlc
.
libvlc_media_player_pause
(
mi
,
exception
);
Assert
.
assertEquals
(
1
,
exception
.
raised
);
}
...
...
@@ -71,7 +71,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
public
void
mediaInstancePause
()
{
LibVlcMedia
md
=
libvlc
.
libvlc_media_new
(
libvlcInstance
,
mrl
,
exception
);
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
LibVlcMedia
Player
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
libvlc
.
libvlc_media_player_play
(
mi
,
exception
);
libvlc
.
libvlc_media_player_pause
(
mi
,
exception
);
Assert
.
assertEquals
(
0
,
exception
.
raised
);
...
...
@@ -81,7 +81,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
public
void
mediaInstanceSetPosition
()
{
LibVlcMedia
md
=
libvlc
.
libvlc_media_new
(
libvlcInstance
,
mrl
,
exception
);
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
LibVlcMedia
Player
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
);
Assert
.
assertEquals
(
0
,
exception
.
raised
);
...
...
@@ -93,7 +93,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
public
void
mediaInstanceStop
()
{
LibVlcMedia
md
=
libvlc
.
libvlc_media_new
(
libvlcInstance
,
mrl
,
exception
);
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
LibVlcMedia
Player
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
libvlc
.
libvlc_media_player_stop
(
mi
,
exception
);
Assert
.
assertEquals
(
0
,
exception
.
raised
);
}
...
...
@@ -102,7 +102,7 @@ public class LibVlcMediaPlayerTest extends AbstractVLCInternalTest
public
void
mediaInstanceStop2
()
throws
Exception
{
LibVlcMedia
md
=
libvlc
.
libvlc_media_new
(
libvlcInstance
,
mrl
,
exception
);
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
LibVlcMedia
Player
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
libvlc
.
libvlc_media_player_play
(
mi
,
exception
);
Thread
.
sleep
(
100
);
libvlc
.
libvlc_media_player_stop
(
mi
,
exception
);
...
...
bindings/java/core/src/test/java/org/videolan/jvlc/internal/MediaListPlayerTest.java
View file @
8b832c45
...
...
@@ -30,7 +30,7 @@ import junit.framework.Assert;
import
org.junit.After
;
import
org.junit.Test
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Instance
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMedia
Player
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMediaList
;
import
org.videolan.jvlc.internal.LibVlc.LibVlcMediaListPlayer
;
import
org.videolan.jvlc.internal.LibVlc.libvlc_exception_t
;
...
...
@@ -230,7 +230,7 @@ public class MediaListPlayerTest extends AbstractVLCInternalTest
libvlc_exception_t
exception
=
new
libvlc_exception_t
();
LibVlcMediaListPlayer
mediaListPlayer
=
libvlc
.
libvlc_media_list_player_new
(
libvlcInstance
,
exception
);
LibVlcMedia
md
=
libvlc
.
libvlc_media_new
(
libvlcInstance
,
mrl
,
exception
);
LibVlcMedia
Instance
mi
=
libvlc
.
libvlc_media_player_new_from_media
(
md
,
exception
);
LibVlcMedia
Player
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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment