}
[DllImport ("libvlc-control.dll",
- EntryPoint="libvlc_media_descriptor_new")]
+ EntryPoint="libvlc_media_new")]
public static extern
DescriptorHandle Create (InstanceHandle inst, U8String mrl,
NativeException ex);
[DllImport ("libvlc-control.dll",
- EntryPoint="libvlc_media_descriptor_release")]
+ EntryPoint="libvlc_media_release")]
public static extern void Release (IntPtr ptr);
protected override bool ReleaseHandle ()
{
libvlc_exception_t exception = new libvlc_exception_t();
libvlc = jvlc.getLibvlc();
- instance = libvlc.libvlc_media_descriptor_new(jvlc.getInstance(), media, exception);
- eventManager = libvlc.libvlc_media_descriptor_event_manager(instance, exception);
+ instance = libvlc.libvlc_media_new(jvlc.getInstance(), media, exception);
+ eventManager = libvlc.libvlc_media_event_manager(instance, exception);
}
MediaDescriptor(JVLC jvlc, LibVlcMediaDescriptor instance)
libvlc_exception_t exception = new libvlc_exception_t();
libvlc = jvlc.getLibvlc();
this.instance = instance;
- eventManager = libvlc.libvlc_media_descriptor_event_manager(instance, exception);
+ eventManager = libvlc.libvlc_media_event_manager(instance, exception);
}
public void addOption(String option)
{
libvlc_exception_t exception = new libvlc_exception_t();
- libvlc.libvlc_media_descriptor_add_option(instance, option, exception );
+ libvlc.libvlc_media_add_option(instance, option, exception );
}
public String getMrl()
{
- return libvlc.libvlc_media_descriptor_get_mrl(instance);
+ return libvlc.libvlc_media_get_mrl(instance);
}
public MediaInstance getMediaInstance()
@Override
protected void finalize() throws Throwable
{
- libvlc.libvlc_media_descriptor_release(instance);
+ libvlc.libvlc_media_release(instance);
super.finalize();
}
libvlc_exception_t exception = new libvlc_exception_t();
this.instance = instance;
libvlc = jvlc.getLibvlc();
- eventManager = libvlc.libvlc_media_instance_event_manager(instance, exception);
+ eventManager = libvlc.libvlc_media_player_event_manager(instance, exception);
}
public MediaInstance(MediaDescriptor mediaDescriptor)
{
libvlc_exception_t exception = new libvlc_exception_t();
libvlc = mediaDescriptor.getLibvlc();
- instance = libvlc.libvlc_media_instance_new_from_media_descriptor(mediaDescriptor.getInstance(), exception);
- eventManager = libvlc.libvlc_media_instance_event_manager(instance, exception);
+ instance = libvlc.libvlc_media_player_new_from_media(mediaDescriptor.getInstance(), exception);
+ eventManager = libvlc.libvlc_media_player_event_manager(instance, exception);
this.mediaDescriptor = mediaDescriptor;
}
public void play()
{
libvlc_exception_t exception = new libvlc_exception_t();
- libvlc.libvlc_media_instance_play(instance, exception);
+ libvlc.libvlc_media_player_play(instance, exception);
}
public void stop()
{
libvlc_exception_t exception = new libvlc_exception_t();
- libvlc.libvlc_media_instance_stop(instance, exception);
+ libvlc.libvlc_media_player_stop(instance, exception);
}
public void pause()
{
libvlc_exception_t exception = new libvlc_exception_t();
- libvlc.libvlc_media_instance_pause(instance, exception);
+ libvlc.libvlc_media_player_pause(instance, exception);
}
public long getLength()
{
libvlc_exception_t exception = new libvlc_exception_t();
- return libvlc.libvlc_media_instance_get_length(instance, exception);
+ return libvlc.libvlc_media_player_get_length(instance, exception);
}
public long getTime()
{
libvlc_exception_t exception = new libvlc_exception_t();
- return libvlc.libvlc_media_instance_get_time(instance, exception);
+ return libvlc.libvlc_media_player_get_time(instance, exception);
}
public void setTime(long time)
{
libvlc_exception_t exception = new libvlc_exception_t();
- libvlc.libvlc_media_instance_set_time(instance, time, exception);
+ libvlc.libvlc_media_player_set_time(instance, time, exception);
}
public float getPosition()
{
libvlc_exception_t exception = new libvlc_exception_t();
- return libvlc.libvlc_media_instance_get_position(instance, exception);
+ return libvlc.libvlc_media_player_get_position(instance, exception);
}
public void setPosition(float position)
{
libvlc_exception_t exception = new libvlc_exception_t();
- libvlc.libvlc_media_instance_set_position(instance, position, exception);
+ libvlc.libvlc_media_player_set_position(instance, position, exception);
}
public boolean willPlay()
{
libvlc_exception_t exception = new libvlc_exception_t();
- return (libvlc.libvlc_media_instance_will_play(instance, exception) == 1);
+ return (libvlc.libvlc_media_player_will_play(instance, exception) == 1);
}
public float getRate()
{
libvlc_exception_t exception = new libvlc_exception_t();
- return libvlc.libvlc_media_instance_get_rate(instance, exception);
+ return libvlc.libvlc_media_player_get_rate(instance, exception);
}
public void setRate(float rate)
{
libvlc_exception_t exception = new libvlc_exception_t();
- libvlc.libvlc_media_instance_set_rate(instance, rate, exception);
+ libvlc.libvlc_media_player_set_rate(instance, rate, exception);
}
public boolean hasVideoOutput()
{
libvlc_exception_t exception = new libvlc_exception_t();
- return (libvlc.libvlc_media_instance_has_vout(instance, exception) == 1);
+ return (libvlc.libvlc_media_player_has_vout(instance, exception) == 1);
}
public float getFPS()
{
libvlc_exception_t exception = new libvlc_exception_t();
- return libvlc.libvlc_media_instance_get_fps(instance, exception);
+ return libvlc.libvlc_media_player_get_fps(instance, exception);
}
public void addListener(final MediaInstanceListener listener)
libvlc.libvlc_event_detach(eventManager, event.ordinal(), callback, null, exception);
}
}
- libvlc.libvlc_media_instance_release(instance);
+ libvlc.libvlc_media_player_release(instance);
super.finalize();
}
}
items.add(descriptor.getMrl());
libvlc_exception_t exception = new libvlc_exception_t();
- jvlc.getLibvlc().libvlc_media_list_add_media_descriptor(instance, descriptor.getInstance(), exception);
+ jvlc.getLibvlc().libvlc_media_list_add_media(instance, descriptor.getInstance(), exception);
}
/**
libvlc_exception_t exception = new libvlc_exception_t();
jvlc
.getLibvlc()
- .libvlc_media_list_insert_media_descriptor(instance, descriptor.getInstance(), index, exception);
+ .libvlc_media_list_insert_media(instance, descriptor.getInstance(), index, exception);
}
/**
public void setMediaInstance(MediaInstance mediaInstance)
{
libvlc_exception_t exception = new libvlc_exception_t();
- jvlc.getLibvlc().libvlc_media_list_player_set_media_instance(instance, mediaInstance.getInstance(), exception);
+ jvlc.getLibvlc().libvlc_media_list_player_set_media_player(instance, mediaInstance.getInstance(), exception);
}
/**
public MediaInstance getMediaInstance()
{
libvlc_exception_t exception = new libvlc_exception_t();
- LibVlcMediaInstance mi = libvlc.libvlc_playlist_get_media_instance(libvlcInstance, exception);
+ LibVlcMediaInstance mi = libvlc.libvlc_playlist_get_media_player(libvlcInstance, exception);
return new MediaInstance(jvlc, mi);
}
import org.videolan.jvlc.internal.LibVlcEventType;
import org.videolan.jvlc.internal.LibVlc.LibVlcCallback;
import org.videolan.jvlc.internal.LibVlc.libvlc_event_t;
-import org.videolan.jvlc.internal.LibVlc.media_instance_time_changed;
+import org.videolan.jvlc.internal.LibVlc.media_player_time_changed;
import com.sun.jna.Pointer;
}
else if (libvlc_event.type == LibVlcEventType.libvlc_MediaInstanceTimeChanged.ordinal())
{
- libvlc_event.event_type_specific.setType(LibVlc.media_instance_time_changed.class);
- LibVlc.media_instance_time_changed timeChanged = (media_instance_time_changed) libvlc_event.event_type_specific
- .readField("media_instance_time_changed");
+ libvlc_event.event_type_specific.setType(LibVlc.media_player_time_changed.class);
+ LibVlc.media_player_time_changed timeChanged = (media_player_time_changed) libvlc_event.event_type_specific
+ .readField("media_player_time_changed");
listener.timeChanged(mediaInstance, timeChanged.new_time);
}
else
}
- public class media_descriptor_meta_changed extends Structure
+ public class media_meta_changed extends Structure
{
public Pointer meta_type;
}
- public class media_descriptor_subitem_added extends Structure
+ public class media_subitem_added extends Structure
{
public LibVlcMediaDescriptor new_child;
}
- public class media_descriptor_duration_changed extends Structure
+ public class media_duration_changed extends Structure
{
public NativeLong new_duration;
}
- public class media_descriptor_preparsed_changed extends Structure
+ public class media_preparsed_changed extends Structure
{
public int new_status;
}
- public class media_descriptor_freed extends Structure
+ public class media_freed extends Structure
{
public LibVlcMediaDescriptor md;
}
- public class media_descriptor_state_changed extends Structure
+ public class media_state_changed extends Structure
{
// @todo: check this one
/* media instance */
- public class media_instance_position_changed extends Structure
+ public class media_player_position_changed extends Structure
{
public float new_position;
}
- public class media_instance_time_changed extends Structure
+ public class media_player_time_changed extends Structure
{
// @todo: check this one
public class event_type_specific extends Union
{
- public media_descriptor_meta_changed media_descriptor_meta_changed;
- public media_descriptor_subitem_added media_descriptor_subitem_added;
- public media_descriptor_duration_changed media_descriptor_duration_changed;
- public media_descriptor_preparsed_changed media_descriptor_preparsed_changed;
- public media_descriptor_freed media_descriptor_freed;
- public media_descriptor_state_changed media_descriptor_state_changed;
- public media_instance_position_changed media_instance_position_changed;
- public media_instance_time_changed media_instance_time_changed;
+ public media_meta_changed media_meta_changed;
+ public media_subitem_added media_subitem_added;
+ public media_duration_changed media_duration_changed;
+ public media_preparsed_changed media_preparsed_changed;
+ public media_freed media_freed;
+ public media_state_changed media_state_changed;
+ public media_player_position_changed media_player_position_changed;
+ public media_player_time_changed media_player_time_changed;
public media_list_item_added media_list_item_added;
public media_list_will_add_item media_list_will_add_item;
public media_list_item_deleted media_list_item_deleted;
int libvlc_playlist_delete_item(LibVlcInstance instance, int itemIndex, libvlc_exception_t exception);
- LibVlcMediaInstance libvlc_playlist_get_media_instance(LibVlcInstance instance, libvlc_exception_t exception);
+ LibVlcMediaInstance libvlc_playlist_get_media_player(LibVlcInstance instance, libvlc_exception_t exception);
- int libvlc_media_instance_is_seekable(LibVlcMediaInstance instance, libvlc_exception_t exception);
+ int libvlc_media_player_is_seekable(LibVlcMediaInstance instance, libvlc_exception_t exception);
- int libvlc_media_instance_can_pause(LibVlcMediaInstance instance, libvlc_exception_t exception);
+ int libvlc_media_player_can_pause(LibVlcMediaInstance instance, libvlc_exception_t exception);
// media descriptor
- LibVlcMediaDescriptor libvlc_media_descriptor_new(LibVlcInstance libvlc_instance, String mrl,
+ LibVlcMediaDescriptor libvlc_media_new(LibVlcInstance libvlc_instance, String mrl,
libvlc_exception_t exception);
- void libvlc_media_descriptor_add_option(LibVlcMediaDescriptor media_descriptor, String option,
+ void libvlc_media_add_option(LibVlcMediaDescriptor media, String option,
libvlc_exception_t exception);
- String libvlc_media_descriptor_get_mrl(LibVlcMediaDescriptor media_descriptor);
+ String libvlc_media_get_mrl(LibVlcMediaDescriptor media);
- void libvlc_media_descriptor_release(LibVlcMediaDescriptor media_descriptor);
+ void libvlc_media_release(LibVlcMediaDescriptor media);
- LibVlcEventManager libvlc_media_descriptor_event_manager(LibVlcMediaDescriptor media_descriptor,
+ LibVlcEventManager libvlc_media_event_manager(LibVlcMediaDescriptor media,
libvlc_exception_t exception);
// media instance
- LibVlcMediaInstance libvlc_media_instance_new(LibVlcInstance instance, libvlc_exception_t exception);
+ LibVlcMediaInstance libvlc_media_player_new(LibVlcInstance instance, libvlc_exception_t exception);
- LibVlcMediaInstance libvlc_media_instance_new_from_media_descriptor(LibVlcMediaDescriptor media_descriptor,
+ LibVlcMediaInstance libvlc_media_player_new_from_media(LibVlcMediaDescriptor media,
libvlc_exception_t exception);
- void libvlc_media_instance_play(LibVlcMediaInstance media_instance, libvlc_exception_t exception);
+ void libvlc_media_player_play(LibVlcMediaInstance media_player, libvlc_exception_t exception);
- void libvlc_media_instance_pause(LibVlcMediaInstance media_instance, libvlc_exception_t exception);
+ void libvlc_media_player_pause(LibVlcMediaInstance media_player, libvlc_exception_t exception);
- void libvlc_media_instance_stop(LibVlcMediaInstance media_instance, libvlc_exception_t exception);
+ void libvlc_media_player_stop(LibVlcMediaInstance media_player, libvlc_exception_t exception);
- void libvlc_media_instance_set_drawable(LibVlcMediaInstance libvlc_media_instance, long drawable,
+ void libvlc_media_player_set_drawable(LibVlcMediaInstance libvlc_media_player, long drawable,
libvlc_exception_t exception);
- long libvlc_media_instance_get_length(LibVlcMediaInstance instance, libvlc_exception_t exception);
+ long libvlc_media_player_get_length(LibVlcMediaInstance instance, libvlc_exception_t exception);
- long libvlc_media_instance_get_time(LibVlcMediaInstance instance, libvlc_exception_t exception);
+ long libvlc_media_player_get_time(LibVlcMediaInstance instance, libvlc_exception_t exception);
- void libvlc_media_instance_set_time(LibVlcMediaInstance instance, long time, libvlc_exception_t exception);
+ void libvlc_media_player_set_time(LibVlcMediaInstance instance, long time, libvlc_exception_t exception);
- float libvlc_media_instance_get_position(LibVlcMediaInstance instance, libvlc_exception_t exception);
+ float libvlc_media_player_get_position(LibVlcMediaInstance instance, libvlc_exception_t exception);
- void libvlc_media_instance_set_position(LibVlcMediaInstance instance, float position, libvlc_exception_t exception);
+ void libvlc_media_player_set_position(LibVlcMediaInstance instance, float position, libvlc_exception_t exception);
- int libvlc_media_instance_will_play(LibVlcMediaInstance instance, libvlc_exception_t exception);
+ int libvlc_media_player_will_play(LibVlcMediaInstance instance, libvlc_exception_t exception);
- void libvlc_media_instance_set_rate(LibVlcMediaInstance instance, float rate, libvlc_exception_t exception);
+ void libvlc_media_player_set_rate(LibVlcMediaInstance instance, float rate, libvlc_exception_t exception);
- float libvlc_media_instance_get_rate(LibVlcMediaInstance instance, libvlc_exception_t exception);
+ float libvlc_media_player_get_rate(LibVlcMediaInstance instance, libvlc_exception_t exception);
- int libvlc_media_instance_has_vout(LibVlcMediaInstance instance2, libvlc_exception_t exception);
+ int libvlc_media_player_has_vout(LibVlcMediaInstance instance2, libvlc_exception_t exception);
- float libvlc_media_instance_get_fps(LibVlcMediaInstance instance2, libvlc_exception_t exception);
+ float libvlc_media_player_get_fps(LibVlcMediaInstance instance2, libvlc_exception_t exception);
- void libvlc_media_instance_release(LibVlcMediaInstance instance);
+ void libvlc_media_player_release(LibVlcMediaInstance instance);
- LibVlcEventManager libvlc_media_instance_event_manager(LibVlcMediaInstance media_instance,
+ LibVlcEventManager libvlc_media_player_event_manager(LibVlcMediaInstance media_player,
libvlc_exception_t exception);
// media list
void libvlc_media_list_add_file_content(LibVlcMediaList libvlc_media_list, String fileName,
libvlc_exception_t exception);
- void libvlc_media_list_set_media_descriptor(LibVlcMediaList libvlc_media_list,
- LibVlcMediaDescriptor libvlc_media_descriptor, libvlc_exception_t exception);
+ void libvlc_media_list_set_media(LibVlcMediaList libvlc_media_list,
+ LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
- LibVlcMediaDescriptor libvlc_media_list_media_descriptor(LibVlcMediaList libvlc_media_list,
+ LibVlcMediaDescriptor libvlc_media_list_media(LibVlcMediaList libvlc_media_list,
libvlc_exception_t exception);
- void libvlc_media_list_add_media_descriptor(LibVlcMediaList libvlc_media_list,
- LibVlcMediaDescriptor libvlc_media_descriptor, libvlc_exception_t exception);
+ void libvlc_media_list_add_media(LibVlcMediaList libvlc_media_list,
+ LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
- void libvlc_media_list_insert_media_descriptor(LibVlcMediaList libvlc_media_list,
- LibVlcMediaDescriptor libvlc_media_descriptor, int position, libvlc_exception_t exception);
+ void libvlc_media_list_insert_media(LibVlcMediaList libvlc_media_list,
+ LibVlcMediaDescriptor libvlc_media, int position, libvlc_exception_t exception);
void libvlc_media_list_remove_index(LibVlcMediaList libvlc_media_list, int position, libvlc_exception_t exception);
libvlc_exception_t exception);
int libvlc_media_list_index_of_item(LibVlcMediaList libvlc_media_list,
- LibVlcMediaDescriptor libvlc_media_descriptor, libvlc_exception_t exception);
+ LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
int libvlc_media_list_is_readonly(LibVlcMediaList libvlc_media_list);
// libvlc_media_list_player
- LibVlcMediaListPlayer libvlc_media_list_player_new(LibVlcInstance libvlc_media_instance,
+ LibVlcMediaListPlayer libvlc_media_list_player_new(LibVlcInstance libvlc_media_player,
libvlc_exception_t exception);
void libvlc_media_list_player_release(LibVlcMediaListPlayer libvlc_media_list_player);
- void libvlc_media_list_player_set_media_instance(LibVlcMediaListPlayer libvlc_media_list_player,
- LibVlcMediaInstance libvlc_media_instance, libvlc_exception_t exception);
+ void libvlc_media_list_player_set_media_player(LibVlcMediaListPlayer libvlc_media_list_player,
+ LibVlcMediaInstance 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);
libvlc_exception_t exception);
void libvlc_media_list_player_play_item(LibVlcMediaListPlayer libvlc_media_list_player,
- LibVlcMediaDescriptor libvlc_media_descriptor, libvlc_exception_t exception);
+ LibVlcMediaDescriptor libvlc_media, libvlc_exception_t exception);
void libvlc_media_list_player_stop(LibVlcMediaListPlayer libvlc_media_list_player, libvlc_exception_t exception);
LibVlcInstance libvlc_instance_t = libVlc.libvlc_new(0, new String[] {"/usr/local/bin/vlc"}, exception);
LibVlcMediaDescriptor mediaDescriptor = libVlc
- .libvlc_media_descriptor_new(libvlc_instance_t, "/home/carone/a.avi", exception);
+ .libvlc_media_new(libvlc_instance_t, "/home/carone/a.avi", exception);
- LibVlcMediaInstance mediaInstance = libVlc.libvlc_media_instance_new_from_media_descriptor(mediaDescriptor, exception);
+ LibVlcMediaInstance mediaInstance = libVlc.libvlc_media_player_new_from_media(mediaDescriptor, exception);
- LibVlcEventManager mediaInstanceEventManager = libVlc.libvlc_media_instance_event_manager(mediaInstance, exception);
+ LibVlcEventManager mediaInstanceEventManager = libVlc.libvlc_media_player_event_manager(mediaInstance, exception);
LibVlcCallback played = new LibVlcCallback()
{
libVlc.libvlc_video_set_parent(libvlc_instance_t, drawable, exception);
- libVlc.libvlc_media_instance_play(mediaInstance, exception);
+ libVlc.libvlc_media_player_play(mediaInstance, exception);
}
}
@Test
public void mediaInstanceNew()
{
- LibVlcMediaInstance instance = libvlc.libvlc_media_instance_new(libvlcInstance, exception);
+ LibVlcMediaInstance instance = libvlc.libvlc_media_player_new(libvlcInstance, exception);
Assert.assertNotNull(instance);
Assert.assertEquals(0, exception.raised);
}
@Test
public void mediaInstancePlayBad()
{
- LibVlcMediaInstance instance = libvlc.libvlc_media_instance_new(libvlcInstance, exception);
- libvlc.libvlc_media_instance_play(instance, exception);
+ LibVlcMediaInstance instance = libvlc.libvlc_media_player_new(libvlcInstance, exception);
+ libvlc.libvlc_media_player_play(instance, exception);
Assert.assertEquals(1, exception.raised); // no associated media descriptor
}
@Test
public void mediaInstancePlay()
{
- 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_instance_play(mi, exception);
+ LibVlcMediaDescriptor 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);
}
@Test
public void mediaInstancePauseBad()
{
- 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_instance_pause(mi, exception);
+ LibVlcMediaDescriptor 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);
}
@Test
public void mediaInstancePause()
{
- 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_instance_play(mi, exception);
- libvlc.libvlc_media_instance_pause(mi, exception);
+ LibVlcMediaDescriptor 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);
Assert.assertEquals(0, exception.raised);
}
@Test
public void mediaInstanceSetPosition()
{
- 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_instance_play(mi, exception);
- libvlc.libvlc_media_instance_set_position(mi, 0.5f, exception);
+ LibVlcMediaDescriptor 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);
Assert.assertEquals(0, exception.raised);
- float position = libvlc.libvlc_media_instance_get_position(mi, exception);
+ float position = libvlc.libvlc_media_player_get_position(mi, exception);
Assert.assertTrue("Position is: " + position, position >= 0.5f);
}
@Test
public void mediaInstanceStop()
{
- 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_instance_stop(mi, exception);
+ LibVlcMediaDescriptor 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);
}
@Test
public void mediaInstanceStop2()
{
- 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_instance_play(mi, exception);
- libvlc.libvlc_media_instance_stop(mi, exception);
+ LibVlcMediaDescriptor 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_stop(mi, exception);
Assert.assertEquals(0, exception.raised);
}
public void mediaDescriptorNew() throws Exception
{
libvlc_exception_t exception = new libvlc_exception_t();
- LibVlcMediaDescriptor md = libvlc.libvlc_media_descriptor_new(libvlcInstance, mrl, exception);
+ LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
Assert.assertNotNull(md);
Assert.assertEquals(0, exception.raised);
}
public void mediaDescriptorGetMrl()
{
libvlc_exception_t exception = new libvlc_exception_t();
- LibVlcMediaDescriptor md = libvlc.libvlc_media_descriptor_new(libvlcInstance, mrl, exception);
- String mdMrl = libvlc.libvlc_media_descriptor_get_mrl(md);
+ LibVlcMediaDescriptor md = libvlc.libvlc_media_new(libvlcInstance, mrl, exception);
+ String mdMrl = libvlc.libvlc_media_get_mrl(md);
Assert.assertEquals(mrl, mdMrl);
}
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);
+ LibVlcMediaDescriptor 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);
}
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);
+ LibVlcMediaDescriptor 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);
Assert.assertEquals("Exception message: " + exception.message + ".\n", 0, exception.raised);
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);
+ LibVlcMediaDescriptor 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);
while (true)
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);
+ LibVlcMediaDescriptor 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);
Assert.assertEquals(0, exception.raised);
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);
+ LibVlcMediaDescriptor 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);
while (true)
{
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);
+ LibVlcMediaDescriptor 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);
}
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_add_media_descriptor(mediaList, mediaDescriptor, exception);
+ LibVlcMediaDescriptor 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);
libvlc.libvlc_media_list_player_play_item_at_index(mediaListPlayer, 0, exception);
Thread.sleep(150);
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);
+ LibVlcMediaDescriptor 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);
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_descriptor = libvlc.libvlc_media_descriptor_new(
+ LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
libvlcInstance,
mrl,
exception);
- libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+ libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
Assert.assertEquals(0, exception.raised);
}
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_descriptor = libvlc.libvlc_media_descriptor_new(
+ LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
libvlcInstance,
mrl,
exception);
- libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+ libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
int result = libvlc.libvlc_media_list_count(mediaList, exception);
Assert.assertEquals(1, result);
Assert.assertEquals(0, exception.raised);
- libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+ libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
result = libvlc.libvlc_media_list_count(mediaList, exception);
Assert.assertEquals(2, result);
Assert.assertEquals(0, exception.raised);
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_descriptor = libvlc.libvlc_media_descriptor_new(
+ LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
libvlcInstance,
mrl,
exception);
- libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
- int index = libvlc.libvlc_media_list_index_of_item(mediaList, libvlc_media_descriptor, exception);
+ libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
+ int index = libvlc.libvlc_media_list_index_of_item(mediaList, libvlc_media, exception);
Assert.assertEquals(0, index);
Assert.assertEquals(0, exception.raised);
}
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_descriptor = libvlc.libvlc_media_descriptor_new(
+ LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
libvlcInstance,
mrl,
exception);
- libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+ libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
Assert.assertEquals(0, exception.raised);
}
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_descriptor = libvlc.libvlc_media_descriptor_new(
+ LibVlcMediaDescriptor libvlc_media = libvlc.libvlc_media_new(
libvlcInstance,
mrl,
exception);
- libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+ libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
Assert.assertEquals(0, exception.raised);
- libvlc_media_descriptor = libvlc.libvlc_media_descriptor_new(
+ libvlc_media = libvlc.libvlc_media_new(
libvlcInstance,
mrl,
exception);
- libvlc.libvlc_media_list_add_media_descriptor(mediaList, libvlc_media_descriptor, exception);
+ libvlc.libvlc_media_list_add_media(mediaList, libvlc_media, exception);
libvlc.libvlc_media_list_remove_index(mediaList, 0, exception);
}
libvlc_exception_t ex;
vlc_int64_t i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_get_length( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ i_ret = libvlc_media_player_get_length( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "L", i_ret );
}
libvlc_exception_t ex;
vlc_int64_t i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_get_time( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ i_ret = libvlc_media_player_get_time( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "L", i_ret );
}
return NULL;
LIBVLC_TRY;
- libvlc_media_instance_set_time( LIBVLC_MEDIAINSTANCE->p_mi, i_time, &ex);
+ libvlc_media_player_set_time( LIBVLC_MEDIAINSTANCE->p_mi, i_time, &ex);
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
libvlc_exception_t ex;
float f_ret;
LIBVLC_TRY;
- f_ret = libvlc_media_instance_get_position( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ f_ret = libvlc_media_player_get_position( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "f", f_ret );
}
return NULL;
LIBVLC_TRY;
- libvlc_media_instance_set_position( LIBVLC_MEDIAINSTANCE->p_mi, f_pos, &ex);
+ libvlc_media_player_set_position( LIBVLC_MEDIAINSTANCE->p_mi, f_pos, &ex);
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
libvlc_exception_t ex;
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_will_play( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ i_ret = libvlc_media_player_will_play( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
libvlc_exception_t ex;
float f_ret;
LIBVLC_TRY;
- f_ret = libvlc_media_instance_get_rate( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ f_ret = libvlc_media_player_get_rate( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "f", f_ret );
}
return NULL;
LIBVLC_TRY;
- libvlc_media_instance_set_rate( LIBVLC_MEDIAINSTANCE->p_mi, f_rate, &ex);
+ libvlc_media_player_set_rate( LIBVLC_MEDIAINSTANCE->p_mi, f_rate, &ex);
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
libvlc_exception_t ex;
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_get_state( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ i_ret = libvlc_media_player_get_state( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
libvlc_exception_t ex;
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_has_vout( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ i_ret = libvlc_media_player_has_vout( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
libvlc_exception_t ex;
float f_ret;
LIBVLC_TRY;
- f_ret = libvlc_media_instance_get_fps( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ f_ret = libvlc_media_player_get_fps( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "f", f_ret );
}
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_get_chapter( LIBVLC_MEDIAINSTANCE->p_mi, &ex );
+ i_ret = libvlc_media_player_get_chapter( LIBVLC_MEDIAINSTANCE->p_mi, &ex );
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_get_chapter_count( LIBVLC_MEDIAINSTANCE->p_mi, &ex );
+ i_ret = libvlc_media_player_get_chapter_count( LIBVLC_MEDIAINSTANCE->p_mi, &ex );
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
return NULL;
LIBVLC_TRY;
- libvlc_media_instance_set_chapter( LIBVLC_MEDIAINSTANCE->p_mi, i_chapter, &ex );
+ libvlc_media_player_set_chapter( LIBVLC_MEDIAINSTANCE->p_mi, i_chapter, &ex );
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
libvlc_exception_t ex;
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_is_seekable( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ i_ret = libvlc_media_player_is_seekable( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
libvlc_exception_t ex;
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_instance_can_pause( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ i_ret = libvlc_media_player_can_pause( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
libvlc_exception_t ex;
LIBVLC_TRY;
- libvlc_media_instance_play( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ libvlc_media_player_play( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
libvlc_exception_t ex;
LIBVLC_TRY;
- libvlc_media_instance_pause( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ libvlc_media_player_pause( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
libvlc_exception_t ex;
LIBVLC_TRY;
- libvlc_media_instance_stop( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
+ libvlc_media_player_stop( LIBVLC_MEDIAINSTANCE->p_mi, &ex);
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
return NULL;
LIBVLC_TRY;
- libvlc_media_instance_set_drawable( LIBVLC_MEDIAINSTANCE->p_mi, (libvlc_drawable_t) i_drawable, &ex );
+ libvlc_media_player_set_drawable( LIBVLC_MEDIAINSTANCE->p_mi, (libvlc_drawable_t) i_drawable, &ex );
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
}
static PyObject *
-vlcMediaInstance_set_media_descriptor( PyObject *self, PyObject *args )
+vlcMediaInstance_set_media( PyObject *self, PyObject *args )
{
libvlc_exception_t ex;
PyObject* py_param = NULL;
if( PyObject_TypeCheck( py_param, &vlcMediaDescriptor_Type ) == 1 )
{
LIBVLC_TRY;
- libvlc_media_instance_set_media_descriptor( LIBVLC_MEDIAINSTANCE->p_mi, ((vlcMediaDescriptor*)py_param)->p_md, &ex );
+ libvlc_media_player_set_media( LIBVLC_MEDIAINSTANCE->p_mi, ((vlcMediaDescriptor*)py_param)->p_md, &ex );
LIBVLC_EXCEPT;
}
else
}
static PyObject *
-vlcMediaInstance_get_media_descriptor( PyObject *self, PyObject *args )
+vlcMediaInstance_get_media( PyObject *self, PyObject *args )
{
libvlc_exception_t ex;
- libvlc_media_descriptor_t *p_md;
+ libvlc_media_t *p_md;
vlcMediaDescriptor *p_ret;
LIBVLC_TRY;
- p_md = libvlc_media_instance_get_media_descriptor( LIBVLC_MEDIAINSTANCE->p_mi, &ex );
+ p_md = libvlc_media_player_get_media( LIBVLC_MEDIAINSTANCE->p_mi, &ex );
LIBVLC_EXCEPT;
if( !p_md )
{ "get_chapter_count", vlcMediaInstance_get_chapter_count, METH_VARARGS,
"get_chapter_count() -> int Get current chapter count" },
- { "set_mediadescriptor", vlcMediaInstance_set_media_descriptor, METH_VARARGS,
- "set_mediadescriptor(vlc.MediaDescriptor) Set the media descriptor that will be used by the media_instance" },
- { "get_mediadescriptor", vlcMediaInstance_get_media_descriptor, METH_VARARGS,
- "get_mediadescriptor() -> vlc.MediaDescriptor Get the media descriptor used by the media_instance (if any)." },
+ { "set_mediadescriptor", vlcMediaInstance_set_media, METH_VARARGS,
+ "set_mediadescriptor(vlc.MediaDescriptor) Set the media descriptor that will be used by the media_player" },
+ { "get_mediadescriptor", vlcMediaInstance_get_media, METH_VARARGS,
+ "get_mediadescriptor() -> vlc.MediaDescriptor Get the media descriptor used by the media_player (if any)." },
{ "get_spu", vlcMediaInstance_get_spu, METH_VARARGS,
"get_spu() -> int Get current video subtitle" },
}
static PyObject *
-vlcInstance_playlist_get_media_instance( PyObject *self, PyObject *args )
+vlcInstance_playlist_get_media_player( PyObject *self, PyObject *args )
{
libvlc_exception_t ex;
- libvlc_media_instance_t *p_mi;
+ libvlc_media_player_t *p_mi;
vlcMediaInstance *p_ret;
LIBVLC_TRY;
- p_mi = libvlc_playlist_get_media_instance( LIBVLC_INSTANCE->p_instance, &ex );
+ p_mi = libvlc_playlist_get_media_player( LIBVLC_INSTANCE->p_instance, &ex );
LIBVLC_EXCEPT;
p_ret = PyObject_New( vlcMediaInstance, &vlcMediaInstance_Type );
}
static PyObject *
-vlcInstance_media_descriptor_new( PyObject *self, PyObject *args )
+vlcInstance_media_new( PyObject *self, PyObject *args )
{
libvlc_exception_t ex;
- libvlc_media_descriptor_t *p_md;
+ libvlc_media_t *p_md;
char* psz_mrl = NULL;
vlcMediaDescriptor *p_ret;
return NULL;
LIBVLC_TRY;
- p_md = libvlc_media_descriptor_new( LIBVLC_INSTANCE->p_instance, psz_mrl, &ex );
+ p_md = libvlc_media_new( LIBVLC_INSTANCE->p_instance, psz_mrl, &ex );
LIBVLC_EXCEPT;
p_ret = PyObject_New( vlcMediaDescriptor, &vlcMediaDescriptor_Type );
"playlist_add(mrl=str, name=str, options=list) -> int Add a new item to the playlist. options is a list of strings."},
{ "playlist_delete_item", vlcInstance_playlist_delete_item, METH_VARARGS,
"playlist_delete_item(id=int) Delete the given item"},
- { "playlist_get_media_instance", vlcInstance_playlist_get_media_instance, METH_VARARGS,
- "playlist_get_media_instance() -> object Return the current media instance"},
+ { "playlist_get_media_player", vlcInstance_playlist_get_media_player, METH_VARARGS,
+ "playlist_get_media_player() -> object Return the current media instance"},
{ "video_set_parent", vlcInstance_video_set_parent, METH_VARARGS,
"video_set_parent(xid=int) Set the parent xid/HWND/CGrafPort"},
{ "video_get_parent", vlcInstance_video_get_parent, METH_VARARGS,
{ "audio_set_channel", vlcInstance_audio_set_channel, METH_VARARGS,
"audio_set_channel(int) Set current audio channel" },
- { "media_descriptor_new", vlcInstance_media_descriptor_new, METH_VARARGS,
- "media_descriptor_new(str) -> object Create a media descriptor with the given mrl."},
+ { "media_new", vlcInstance_media_new, METH_VARARGS,
+ "media_new(str) -> object Create a media descriptor with the given mrl."},
{ "vlm_add_broadcast", vlcInstance_vlm_add_broadcast, METH_VARARGS | METH_KEYWORDS,
"vlm_add_broadcast(name=str, input=str, output=str, options=list, enable=int, loop=int) Add a new broadcast" },
static void
vlcMediaDescriptor_dealloc( PyObject *self )
{
- libvlc_media_descriptor_release( LIBVLC_MEDIADESCRIPTOR->p_md );
+ libvlc_media_release( LIBVLC_MEDIADESCRIPTOR->p_md );
PyObject_DEL( self );
}
return NULL;
LIBVLC_TRY;
- libvlc_media_descriptor_add_option( LIBVLC_MEDIADESCRIPTOR->p_md, psz_options, &ex);
+ libvlc_media_add_option( LIBVLC_MEDIADESCRIPTOR->p_md, psz_options, &ex);
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
PyObject * o_ret;
LIBVLC_TRY;
- psz_mrl = libvlc_media_descriptor_get_mrl( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
+ psz_mrl = libvlc_media_get_mrl( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
LIBVLC_EXCEPT;
o_ret = Py_BuildValue( "s", psz_mrl );
libvlc_state_t i_state;
LIBVLC_TRY;
- i_state = libvlc_media_descriptor_get_state( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
+ i_state = libvlc_media_get_state( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
LIBVLC_EXCEPT;
/* FIXME: return the defined state constant */
return Py_BuildValue( "i", i_state );
return NULL;
LIBVLC_TRY;
- libvlc_media_descriptor_add_tag( LIBVLC_MEDIADESCRIPTOR->p_md, psz_key, ( libvlc_tag_t )psz_tag, &ex );
+ libvlc_media_add_tag( LIBVLC_MEDIADESCRIPTOR->p_md, psz_key, ( libvlc_tag_t )psz_tag, &ex );
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
return NULL;
LIBVLC_TRY;
- libvlc_media_descriptor_remove_tag( LIBVLC_MEDIADESCRIPTOR->p_md, psz_key, ( libvlc_tag_t )psz_tag, &ex );
+ libvlc_media_remove_tag( LIBVLC_MEDIADESCRIPTOR->p_md, psz_key, ( libvlc_tag_t )psz_tag, &ex );
LIBVLC_EXCEPT;
Py_INCREF( Py_None );
return Py_None;
return NULL;
LIBVLC_TRY;
- i_ret=libvlc_media_descriptor_tags_count_for_key( LIBVLC_MEDIADESCRIPTOR->p_md, psz_tag, &ex );
+ i_ret=libvlc_media_tags_count_for_key( LIBVLC_MEDIADESCRIPTOR->p_md, psz_tag, &ex );
LIBVLC_EXCEPT;
return Py_BuildValue( "i", i_ret );
}
libvlc_exception_t ex;
libvlc_time_t i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_descriptor_get_duration( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
+ i_ret = libvlc_media_get_duration( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "L", i_ret );
}
static PyObject *
-vlcMediaDescriptor_media_instance_new( PyObject *self, PyObject *args )
+vlcMediaDescriptor_media_player_new( PyObject *self, PyObject *args )
{
libvlc_exception_t ex;
- libvlc_media_instance_t *p_mi;
+ libvlc_media_player_t *p_mi;
vlcMediaInstance *p_ret;
LIBVLC_TRY;
- p_mi = libvlc_media_instance_new_from_media_descriptor( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
+ p_mi = libvlc_media_player_new_from_media( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
LIBVLC_EXCEPT;
p_ret = PyObject_New( vlcMediaInstance, &vlcMediaInstance_Type );
libvlc_exception_t ex;
int i_ret;
LIBVLC_TRY;
- i_ret = libvlc_media_descriptor_is_preparsed( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
+ i_ret = libvlc_media_is_preparsed( LIBVLC_MEDIADESCRIPTOR->p_md, &ex);
LIBVLC_EXCEPT;
return Py_BuildValue( "L", i_ret );
}
}
LIBVLC_TRY;
- psz_ret = libvlc_media_descriptor_get_meta( LIBVLC_MEDIADESCRIPTOR->p_md, i_index, &ex);
+ psz_ret = libvlc_media_get_meta( LIBVLC_MEDIADESCRIPTOR->p_md, i_index, &ex);
LIBVLC_EXCEPT;
o_ret = Py_BuildValue( "s", psz_ret );
"tags_count_for_key(str) ." },
{ "get_duration", vlcMediaDescriptor_get_duration, METH_VARARGS,
"get_duration() -> int" },
- { "mediainstance_new", vlcMediaDescriptor_media_instance_new, METH_VARARGS,
+ { "mediainstance_new", vlcMediaDescriptor_media_player_new, METH_VARARGS,
"mediainstance_new() -> vlc.MediaInstance Create a Media Instance object from a Media Descriptor" },
{ "is_preparsed", vlcMediaDescriptor_is_preparsed, METH_VARARGS,
"is_preparsed() -> int" },
typedef struct
{
PyObject_HEAD
- libvlc_media_instance_t* p_mi;
+ libvlc_media_player_t* p_mi;
} vlcMediaInstance;
/**********************************************************************
typedef struct
{
PyObject_HEAD
- libvlc_media_descriptor_t* p_md;
+ libvlc_media_t* p_md;
} vlcMediaDescriptor;
/* Forward declarations */
* \param p_e an initialized exception pointern
* \return a media instance object
*/
-VLC_DEPRECATED_API libvlc_media_instance_t * libvlc_playlist_get_media_instance(
+VLC_DEPRECATED_API libvlc_media_player_t * libvlc_playlist_get_media_player(
libvlc_instance_t *, libvlc_exception_t * );
/** @}*/
/*****************************************************************************
* Media descriptor
*****************************************************************************/
-/** \defgroup libvlc_media_descriptor libvlc_media_descriptor
+/** \defgroup libvlc_media libvlc_media
* \ingroup libvlc
* LibVLC Media Descriptor
* @{
* \param p_e an initialized exception pointer
* \return the newly created media descriptor
*/
-VLC_PUBLIC_API libvlc_media_descriptor_t * libvlc_media_descriptor_new(
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_new(
libvlc_instance_t *p_instance,
const char * psz_mrl,
libvlc_exception_t *p_e );
* \param p_e an initialized exception pointer
* \return the new empty media descriptor
*/
-VLC_PUBLIC_API libvlc_media_descriptor_t * libvlc_media_descriptor_new_as_node(
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_new_as_node(
libvlc_instance_t *p_instance,
const char * psz_name,
libvlc_exception_t *p_e );
/**
* Add an option to the media descriptor.
*
- * This option will be used to determine how the media_instance will
- * read the media_descriptor. This allows to use VLC's advanced
+ * This option will be used to determine how the media_player will
+ * read the media. This allows to use VLC's advanced
* reading/streaming options on a per-media basis.
*
* The options are detailed in vlc --long-help, for instance "--sout-all"
* \param psz_mrl the MRL to read
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_descriptor_add_option(
- libvlc_media_descriptor_t * p_md,
+VLC_PUBLIC_API void libvlc_media_add_option(
+ libvlc_media_t * p_md,
const char * ppsz_options,
libvlc_exception_t * p_e );
-VLC_PUBLIC_API void libvlc_media_descriptor_retain(
- libvlc_media_descriptor_t *p_meta_desc );
+VLC_PUBLIC_API void libvlc_media_retain(
+ libvlc_media_t *p_meta_desc );
-VLC_PUBLIC_API void libvlc_media_descriptor_release(
- libvlc_media_descriptor_t *p_meta_desc );
+VLC_PUBLIC_API void libvlc_media_release(
+ libvlc_media_t *p_meta_desc );
-VLC_PUBLIC_API char * libvlc_media_descriptor_get_mrl( libvlc_media_descriptor_t * p_md,
+VLC_PUBLIC_API char * libvlc_media_get_mrl( libvlc_media_t * p_md,
libvlc_exception_t * p_e );
-VLC_PUBLIC_API libvlc_media_descriptor_t * libvlc_media_descriptor_duplicate( libvlc_media_descriptor_t * );
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_duplicate( libvlc_media_t * );
/**
* Read the meta of the media descriptor.
* \param p_e an initialized exception pointer
* \return the media descriptor's meta
*/
-VLC_PUBLIC_API char * libvlc_media_descriptor_get_meta(
- libvlc_media_descriptor_t *p_meta_desc,
+VLC_PUBLIC_API char * libvlc_media_get_meta(
+ libvlc_media_t *p_meta_desc,
libvlc_meta_t e_meta,
libvlc_exception_t *p_e );
-VLC_PUBLIC_API libvlc_state_t libvlc_media_descriptor_get_state(
- libvlc_media_descriptor_t *p_meta_desc,
+VLC_PUBLIC_API libvlc_state_t libvlc_media_get_state(
+ libvlc_media_t *p_meta_desc,
libvlc_exception_t *p_e );
VLC_PUBLIC_API libvlc_media_list_t *
- libvlc_media_descriptor_subitems( libvlc_media_descriptor_t *p_md,
+ libvlc_media_subitems( libvlc_media_t *p_md,
libvlc_exception_t *p_e );
VLC_PUBLIC_API libvlc_event_manager_t *
- libvlc_media_descriptor_event_manager( libvlc_media_descriptor_t * p_md,
+ libvlc_media_event_manager( libvlc_media_t * p_md,
libvlc_exception_t * p_e );
VLC_PUBLIC_API libvlc_time_t
- libvlc_media_descriptor_get_duration( libvlc_media_descriptor_t * p_md,
+ libvlc_media_get_duration( libvlc_media_t * p_md,
libvlc_exception_t * p_e );
VLC_PUBLIC_API int
- libvlc_media_descriptor_is_preparsed( libvlc_media_descriptor_t * p_md,
+ libvlc_media_is_preparsed( libvlc_media_t * p_md,
libvlc_exception_t * p_e );
VLC_PUBLIC_API void
- libvlc_media_descriptor_set_user_data( libvlc_media_descriptor_t * p_md,
+ libvlc_media_set_user_data( libvlc_media_t * p_md,
void * p_new_user_data,
libvlc_exception_t * p_e);
VLC_PUBLIC_API void *
- libvlc_media_descriptor_get_user_data( libvlc_media_descriptor_t * p_md,
+ libvlc_media_get_user_data( libvlc_media_t * p_md,
libvlc_exception_t * p_e);
/** @}*/
/*****************************************************************************
* Media Instance
*****************************************************************************/
-/** \defgroup libvlc_media_instance libvlc_media_instance
+/** \defgroup libvlc_media_player libvlc_media_player
* \ingroup libvlc
* LibVLC Media Instance, object that let you play a media descriptor
* in a libvlc_drawable_t
* should be created.
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API libvlc_media_instance_t * libvlc_media_instance_new( libvlc_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t *, libvlc_exception_t * );
/**
* Create a Media Instance object from a Media Descriptor
* destroyed.
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API libvlc_media_instance_t * libvlc_media_instance_new_from_media_descriptor( libvlc_media_descriptor_t *, libvlc_exception_t * );
+VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_media_t *, libvlc_exception_t * );
/**
- * Release a media_instance after use
+ * Release a media_player after use
*
* \param p_mi the Media Instance to free
*/
-VLC_PUBLIC_API void libvlc_media_instance_release( libvlc_media_instance_t * );
-VLC_PUBLIC_API void libvlc_media_instance_retain( libvlc_media_instance_t * );
+VLC_PUBLIC_API void libvlc_media_player_release( libvlc_media_player_t * );
+VLC_PUBLIC_API void libvlc_media_player_retain( libvlc_media_player_t * );
-/** Set the media descriptor that will be used by the media_instance. If any,
+/** Set the media descriptor that will be used by the media_player. If any,
* previous md will be released.
*
* \param p_mi the Media Instance
* destroyed.
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_instance_set_media_descriptor( libvlc_media_instance_t *, libvlc_media_descriptor_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_media_player_set_media( libvlc_media_player_t *, libvlc_media_t *, libvlc_exception_t * );
/**
- * Get the media descriptor used by the media_instance.
+ * Get the media descriptor used by the media_player.
*
* \param p_mi the Media Instance
* \param p_e an initialized exception pointer
* \return the media descriptor associated with p_mi, or NULL if no
* media descriptor is associated
*/
-VLC_PUBLIC_API libvlc_media_descriptor_t * libvlc_media_instance_get_media_descriptor( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API libvlc_media_t * libvlc_media_player_get_media( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Get the Event Manager from which the media instance send event.
* \param p_e an initialized exception pointer
* \return the event manager associated with p_mi
*/
-VLC_PUBLIC_API libvlc_event_manager_t * libvlc_media_instance_event_manager ( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API libvlc_event_manager_t * libvlc_media_player_event_manager ( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Play
* \param p_mi the Media Instance
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_instance_play ( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_media_player_play ( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Pause
* \param p_mi the Media Instance
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_instance_pause ( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_media_player_pause ( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Stop
* \param p_mi the Media Instance
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_instance_stop ( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Set the drawable where the media instance should render its video output
* should render its video
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_media_instance_set_drawable ( libvlc_media_instance_t *, libvlc_drawable_t, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_media_player_set_drawable ( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * );
/**
* Get the drawable where the media instance should render its video output
* should render its video
*/
VLC_PUBLIC_API libvlc_drawable_t
- libvlc_media_instance_get_drawable ( libvlc_media_instance_t *, libvlc_exception_t * );
+ libvlc_media_player_get_drawable ( libvlc_media_player_t *, libvlc_exception_t * );
/** \bug This might go away ... to be replaced by a broader system */
-VLC_PUBLIC_API libvlc_time_t libvlc_media_instance_get_length ( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API libvlc_time_t libvlc_media_instance_get_time ( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API void libvlc_media_instance_set_time ( libvlc_media_instance_t *, libvlc_time_t, libvlc_exception_t *);
-VLC_PUBLIC_API float libvlc_media_instance_get_position ( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API void libvlc_media_instance_set_position ( libvlc_media_instance_t *, float, libvlc_exception_t *);
-VLC_PUBLIC_API void libvlc_media_instance_set_chapter ( libvlc_media_instance_t *, int, libvlc_exception_t *);
-VLC_PUBLIC_API int libvlc_media_instance_get_chapter (libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API int libvlc_media_instance_get_chapter_count( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API int libvlc_media_instance_will_play ( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API float libvlc_media_instance_get_rate ( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API void libvlc_media_instance_set_rate ( libvlc_media_instance_t *, float, libvlc_exception_t *);
-VLC_PUBLIC_API libvlc_state_t libvlc_media_instance_get_state ( libvlc_media_instance_t *, libvlc_exception_t *);
-VLC_PUBLIC_API float libvlc_media_instance_get_fps( libvlc_media_instance_t *, libvlc_exception_t *);
+VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_length ( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_time ( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API void libvlc_media_player_set_time ( libvlc_media_player_t *, libvlc_time_t, libvlc_exception_t *);
+VLC_PUBLIC_API float libvlc_media_player_get_position ( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API void libvlc_media_player_set_position ( libvlc_media_player_t *, float, libvlc_exception_t *);
+VLC_PUBLIC_API void libvlc_media_player_set_chapter ( libvlc_media_player_t *, int, libvlc_exception_t *);
+VLC_PUBLIC_API int libvlc_media_player_get_chapter (libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API int libvlc_media_player_will_play ( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API float libvlc_media_player_get_rate ( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API void libvlc_media_player_set_rate ( libvlc_media_player_t *, float, libvlc_exception_t *);
+VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state ( libvlc_media_player_t *, libvlc_exception_t *);
+VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t *, libvlc_exception_t *);
/**
* Does this media instance have a video output?
* \param p_md the media instance
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API int libvlc_media_instance_has_vout( libvlc_media_instance_t *, libvlc_exception_t *);
+VLC_PUBLIC_API int libvlc_media_player_has_vout( libvlc_media_player_t *, libvlc_exception_t *);
/**
* Is this media instance seekable?
* \param p_input the input
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API int libvlc_media_instance_is_seekable( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e );
+VLC_PUBLIC_API int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e );
/**
* Can this media instance be paused?
* \param p_input the input
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API int libvlc_media_instance_can_pause( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e );
+VLC_PUBLIC_API int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e );
/** \defgroup libvlc_video libvlc_video
- * \ingroup libvlc_media_instance
+ * \ingroup libvlc_media_player
* LibVLC Video handling
* @{
*/
* \param p_input the input
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_toggle_fullscreen( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Enable or disable fullscreen on a video output.
* \param b_fullscreen boolean for fullscreen status
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_set_fullscreen( libvlc_media_instance_t *, int, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_set_fullscreen( libvlc_media_player_t *, int, libvlc_exception_t * );
/**
* Get current fullscreen status.
* \param p_e an initialized exception pointer
* \return the fullscreen status (boolean)
*/
-VLC_PUBLIC_API int libvlc_get_fullscreen( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_get_fullscreen( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Get current video height.
* \param p_e an initialized exception pointer
* \return the video height
*/
-VLC_PUBLIC_API int libvlc_video_get_height( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_video_get_height( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Get current video width.
* \param p_e an initialized exception pointer
* \return the video width
*/
-VLC_PUBLIC_API int libvlc_video_get_width( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_video_get_width( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Get current video aspect ratio.
* \param p_e an initialized exception pointer
* \return the video aspect ratio
*/
-VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Set new video aspect ratio.
* \param psz_aspect new video aspect-ratio
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_instance_t *, char *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_set_aspect_ratio( libvlc_media_player_t *, char *, libvlc_exception_t * );
/**
* Get current video subtitle.
* \param p_e an initialized exception pointer
* \return the video subtitle selected
*/
-VLC_PUBLIC_API int libvlc_video_get_spu( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_video_get_spu( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Set new video subtitle.
* \param i_spu new video subtitle to select
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_video_set_spu( libvlc_media_instance_t *, int , libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_set_spu( libvlc_media_player_t *, int , libvlc_exception_t * );
/**
* Get current crop filter geometry.
* \param p_e an initialized exception pointer
* \return the crop filter geometry
*/
-VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API char *libvlc_video_get_crop_geometry( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Set new crop filter geometry.
* \param psz_geometry new crop filter geometry
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_instance_t *, char *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_set_crop_geometry( libvlc_media_player_t *, char *, libvlc_exception_t * );
/**
* Toggle teletext transparent status on video output.
* \param p_input the input
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Get current teletext page requested.
* \param p_e an initialized exception pointer
* \return the current teletext page requested.
*/
-VLC_PUBLIC_API int libvlc_video_get_teletext( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_video_get_teletext( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Set new teletext page to retrieve.
* \param i_page teletex page number requested
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_video_set_teletext( libvlc_media_instance_t *, int, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_set_teletext( libvlc_media_player_t *, int, libvlc_exception_t * );
/**
* Take a snapshot of the current video window.
* \param i_height the snapshot's height
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_video_take_snapshot( libvlc_media_instance_t *, char *,unsigned int, unsigned int, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_take_snapshot( libvlc_media_player_t *, char *,unsigned int, unsigned int, libvlc_exception_t * );
-VLC_PUBLIC_API int libvlc_video_destroy( libvlc_media_instance_t *, libvlc_exception_t *);
+VLC_PUBLIC_API int libvlc_video_destroy( libvlc_media_player_t *, libvlc_exception_t *);
/**
* Resize the current video output window.
* \param p_e an initialized exception pointer
* \return the success status (boolean)
*/
-VLC_PUBLIC_API void libvlc_video_resize( libvlc_media_instance_t *, int, int, libvlc_exception_t *);
+VLC_PUBLIC_API void libvlc_video_resize( libvlc_media_player_t *, int, int, libvlc_exception_t *);
/**
* Change the parent for the current the video output.
* \param p_e an initialized exception pointer
* \return the success status (boolean)
*/
-VLC_PUBLIC_API int libvlc_video_reparent( libvlc_media_instance_t *, libvlc_drawable_t, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_video_reparent( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * );
/**
* Tell windowless video output to redraw rectangular area (MacOS X only).
* \param area coordinates within video drawable
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_video_redraw_rectangle( libvlc_media_instance_t *, const libvlc_rectangle_t *, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_video_redraw_rectangle( libvlc_media_player_t *, const libvlc_rectangle_t *, libvlc_exception_t * );
/**
* Set the default video output's parent.
/** @} video */
/** \defgroup libvlc_audio libvlc_audio
- * \ingroup libvlc_media_instance
+ * \ingroup libvlc_media_player
* LibVLC Audio handling
* @{
*/
* \param p_e an initialized exception
* \return the number of available audio tracks (int)
*/
-VLC_PUBLIC_API int libvlc_audio_get_track_count( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_audio_get_track_count( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Get current audio track.
* \param p_e an initialized exception pointer
* \return the audio track (int)
*/
-VLC_PUBLIC_API int libvlc_audio_get_track( libvlc_media_instance_t *, libvlc_exception_t * );
+VLC_PUBLIC_API int libvlc_audio_get_track( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Set current audio track.
* \param i_track the track (int)
* \param p_e an initialized exception pointer
*/
-VLC_PUBLIC_API void libvlc_audio_set_track( libvlc_media_instance_t *, int, libvlc_exception_t * );
+VLC_PUBLIC_API void libvlc_audio_set_track( libvlc_media_player_t *, int, libvlc_exception_t * );
/**
* Get current audio channel.
/** @} audio */
-/** @} media_instance */
+/** @} media_player */
/*****************************************************************************
* Event handling
struct
{
libvlc_meta_t meta_type;
- } media_descriptor_meta_changed;
+ } media_meta_changed;
struct
{
- libvlc_media_descriptor_t * new_child;
- } media_descriptor_subitem_added;
+ libvlc_media_t * new_child;
+ } media_subitem_added;
struct
{
vlc_int64_t new_duration;
- } media_descriptor_duration_changed;
+ } media_duration_changed;
struct
{
int new_status;
- } media_descriptor_preparsed_changed;
+ } media_preparsed_changed;
struct
{
- libvlc_media_descriptor_t * md;
- } media_descriptor_freed;
+ libvlc_media_t * md;
+ } media_freed;
struct
{
libvlc_state_t new_state;
- } media_descriptor_state_changed;
+ } media_state_changed;
/* media instance */
struct
{
float new_position;
- } media_instance_position_changed;
+ } media_player_position_changed;
struct
{
libvlc_time_t new_time;
- } media_instance_time_changed;
+ } media_player_time_changed;
struct
{
libvlc_time_t new_seekable;
- } media_instance_seekable_changed;
+ } media_player_seekable_changed;
struct
{
libvlc_time_t new_pausable;
- } media_instance_pausable_changed;
+ } media_player_pausable_changed;
/* media list */
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_item_added;
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_will_add_item;
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_item_deleted;
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_will_delete_item;
/* media list view */
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_view_item_added;
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_view_will_add_item;
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_view_item_deleted;
struct
{
- libvlc_media_descriptor_t * item;
+ libvlc_media_t * item;
int index;
} media_list_view_will_delete_item;
libvlc_exception_t * p_e );
VLC_PUBLIC_API void
- libvlc_media_list_set_media_descriptor( libvlc_media_list_t *,
- libvlc_media_descriptor_t *,
+ libvlc_media_list_set_media( libvlc_media_list_t *,
+ libvlc_media_t *,
libvlc_exception_t *);
-VLC_PUBLIC_API libvlc_media_descriptor_t *
- libvlc_media_list_media_descriptor( libvlc_media_list_t *,
+VLC_PUBLIC_API libvlc_media_t *
+ libvlc_media_list_media( libvlc_media_list_t *,
libvlc_exception_t *);
VLC_PUBLIC_API void
- libvlc_media_list_add_media_descriptor( libvlc_media_list_t *,
- libvlc_media_descriptor_t *,
+ libvlc_media_list_add_media( libvlc_media_list_t *,
+ libvlc_media_t *,
libvlc_exception_t * );
VLC_PUBLIC_API void
- libvlc_media_list_insert_media_descriptor( libvlc_media_list_t *,
- libvlc_media_descriptor_t *,
+ libvlc_media_list_insert_media( libvlc_media_list_t *,
+ libvlc_media_t *,
int,
libvlc_exception_t * );
VLC_PUBLIC_API void
libvlc_media_list_count( libvlc_media_list_t * p_mlist,
libvlc_exception_t * p_e );
-VLC_PUBLIC_API libvlc_media_descriptor_t *
+VLC_PUBLIC_API libvlc_media_t *
libvlc_media_list_item_at_index( libvlc_media_list_t *, int,
libvlc_exception_t * );
VLC_PUBLIC_API int
libvlc_media_list_index_of_item( libvlc_media_list_t *,
- libvlc_media_descriptor_t *,
+ libvlc_media_t *,
libvlc_exception_t * );
/* This indicates if this media list is read-only from a user point of view */
libvlc_media_list_view_count( libvlc_media_list_view_t * p_mlv,
libvlc_exception_t * p_e );
-VLC_PUBLIC_API libvlc_media_descriptor_t *
+VLC_PUBLIC_API libvlc_media_t *
libvlc_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
int index,
libvlc_exception_t * p_e );
VLC_PUBLIC_API libvlc_media_list_view_t *
libvlc_media_list_view_children_for_item( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e );
VLC_PUBLIC_API int
libvlc_media_list_view_index_of_item( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e );
VLC_PUBLIC_API void
libvlc_media_list_view_insert_at_index( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
int index,
libvlc_exception_t * p_e );
VLC_PUBLIC_API void
libvlc_media_list_view_add_item( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e );
VLC_PUBLIC_API libvlc_media_list_t *
libvlc_media_list_player_release( libvlc_media_list_player_t * p_mlp );
VLC_PUBLIC_API void
- libvlc_media_list_player_set_media_instance(
+ libvlc_media_list_player_set_media_player(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_instance_t * p_mi,
+ libvlc_media_player_t * p_mi,
libvlc_exception_t * p_e );
VLC_PUBLIC_API void
VLC_PUBLIC_API void
libvlc_media_list_player_play_item(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e );
VLC_PUBLIC_API void
/*****************************************************************************
* Media Descriptor
*****************************************************************************/
-/** \defgroup libvlc_media_descriptor libvlc_media_descriptor
+/** \defgroup libvlc_media libvlc_media
* \ingroup libvlc
* LibVLC Media Descriptor handling
* @{
/* Meta Handling */
/** defgroup libvlc_meta libvlc_meta
- * \ingroup libvlc_media_descriptor
+ * \ingroup libvlc_media
* LibVLC Media Meta
* @{
*/
/**@} */
-typedef struct libvlc_media_descriptor_t libvlc_media_descriptor_t;
+typedef struct libvlc_media_t libvlc_media_t;
/**@} */
/*****************************************************************************
* Media Instance
*****************************************************************************/
-/** \defgroup libvlc_media_instance libvlc_media_instance
+/** \defgroup libvlc_media_player libvlc_media_player
* \ingroup libvlc
* LibVLC Media Instance handling
* @{
*/
-typedef struct libvlc_media_instance_t libvlc_media_instance_t;
+typedef struct libvlc_media_player_t libvlc_media_player_t;
typedef enum libvlc_state_t
{
* Video
*****************************************************************************/
/** \defgroup libvlc_video libvlc_video
- * \ingroup libvlc_media_instance
+ * \ingroup libvlc_media_player
* LibVLC Video handling
* @{
*/
VLC_PUBLIC_API char* libvlc_vlm_show_media( libvlc_instance_t *, char *, libvlc_exception_t * );
#define LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( attr, returnType, getType, default)\
-returnType libvlc_vlm_get_media_## attr( libvlc_instance_t *, \
+returnType libvlc_vlm_get_media_instance_## attr( libvlc_instance_t *, \
char *, int , libvlc_exception_t * );
VLC_PUBLIC_API LIBVLC_VLM_GET_MEDIA_ATTRIBUTE( position, float, Float, -1);
setStartTime(_i_time);
if( isRunning() )
{
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(_p_libvlc, NULL);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(_p_libvlc, NULL);
if( NULL != p_md )
{
- libvlc_media_instance_set_time(p_md, _i_time, NULL);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_set_time(p_md, _i_time, NULL);
+ libvlc_media_player_release(p_md);
}
}
}
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
*track = libvlc_audio_get_track(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCAudio,
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
libvlc_audio_set_track(p_md, track, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCAudio,
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *length = (double)libvlc_media_instance_get_length(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ *length = (double)libvlc_media_player_get_length(p_md, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *position = libvlc_media_instance_get_position(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ *position = libvlc_media_player_get_position(p_md, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_instance_set_position(p_md, position, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_set_position(p_md, position, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *time = (double)libvlc_media_instance_get_time(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ *time = (double)libvlc_media_player_get_time(p_md, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_instance_set_time(p_md, (vlc_int64_t)time, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_set_time(p_md, (vlc_int64_t)time, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *state = libvlc_media_instance_get_state(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ *state = libvlc_media_player_get_state(p_md, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *rate = libvlc_media_instance_get_rate(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ *rate = libvlc_media_player_get_rate(p_md, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- libvlc_media_instance_set_rate(p_md, rate, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_set_rate(p_md, rate, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *fps = libvlc_media_instance_get_fps(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ *fps = libvlc_media_player_get_fps(p_md, &ex);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
- *hasVout = libvlc_media_instance_has_vout(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
- libvlc_media_instance_release(p_md);
+ *hasVout = libvlc_media_player_has_vout(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
*fullscreen = libvlc_get_fullscreen(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
libvlc_set_fullscreen(p_md, VARIANT_FALSE != fullscreen, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
*width = libvlc_video_get_width(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
*height = libvlc_video_get_height(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
char *psz_aspect = libvlc_video_get_aspect_ratio(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
if( NULL == psz_aspect )
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
char *psz_aspect = CStrFromBSTR(CP_UTF8, aspect);
libvlc_video_set_aspect_ratio(p_md, psz_aspect, &ex);
CoTaskMemFree(psz_aspect);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCVideo,
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
*spu = libvlc_video_get_spu(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
libvlc_video_set_spu(p_md, spu, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
char *psz_geometry = libvlc_video_get_crop_geometry(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
if( NULL == psz_geometry )
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
char *psz_geometry = CStrFromBSTR(CP_UTF8, geometry);
libvlc_video_set_crop_geometry(p_md, psz_geometry, &ex);
CoTaskMemFree(psz_geometry);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCVideo,
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
*page = libvlc_video_get_teletext(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
libvlc_video_set_teletext(p_md, page, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( libvlc_exception_raised(&ex) )
{
_p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
static int uniqueId = 0;
/* take snapshot into file */
libvlc_video_take_snapshot(p_md, psz_filepath, 0, 0, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
hr = E_FAIL;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
libvlc_toggle_fullscreen(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
if( ! libvlc_exception_raised(&ex) )
{
libvlc_toggle_teletext(p_md, &ex);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
if( ! libvlc_exception_raised(&ex) )
{
return NOERROR;
*/
static void HandleMediaMetaChanged(const libvlc_event_t * event, void * self)
{
- if( event->u.media_descriptor_meta_changed.meta_type == libvlc_meta_Publisher ||
- event->u.media_descriptor_meta_changed.meta_type == libvlc_meta_NowPlaying )
+ if( event->u.media_meta_changed.meta_type == libvlc_meta_Publisher ||
+ event->u.media_meta_changed.meta_type == libvlc_meta_NowPlaying )
{
/* Skip those meta. We don't really care about them for now.
* And they occure a lot */
NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
[[VLCEventManager sharedManager] callOnMainThreadObject:self
withMethod:@selector(metaChanged:)
- withArgumentAsObject:[VLCMedia metaTypeToString:event->u.media_descriptor_meta_changed.meta_type]];
+ withArgumentAsObject:[VLCMedia metaTypeToString:event->u.media_meta_changed.meta_type]];
[pool release];
}
// [[VLCEventManager sharedManager] callOnMainThreadObject:self
// withMethod:@selector(setLength:)
// withArgumentAsObject:[VLCTime timeWithNumber:
-// [NSNumber numberWithLongLong:event->u.media_descriptor_duration_changed.new_duration]]];
+// [NSNumber numberWithLongLong:event->u.media_duration_changed.new_duration]]];
// [pool release];
//}
[[VLCEventManager sharedManager] callOnMainThreadObject:self
withMethod:@selector(setStateAsNumber:)
withArgumentAsObject:[NSNumber numberWithInt:
- LibVLCStateToMediaState(event->u.media_descriptor_state_changed.new_state)]];
+ LibVLCStateToMediaState(event->u.media_state_changed.new_state)]];
[pool release];
}
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- p_md = libvlc_media_descriptor_new([VLCLibrary sharedInstance],
+ p_md = libvlc_media_new([VLCLibrary sharedInstance],
[aPath UTF8String],
&ex);
catch_exception(&ex);
libvlc_exception_t ex;
libvlc_exception_init(&ex);
- p_md = libvlc_media_descriptor_new_as_node([VLCLibrary sharedInstance],
+ p_md = libvlc_media_new_as_node([VLCLibrary sharedInstance],
[aName UTF8String],
&ex);
catch_exception(&ex);
/* We must make sure we won't receive new event after an upcoming dealloc
* We also may receive a -retain in some event callback that may occcur
* Before libvlc_event_detach. So this can't happen in dealloc */
- libvlc_event_manager_t * p_em = libvlc_media_descriptor_event_manager(p_md, NULL);
+ libvlc_event_manager_t * p_em = libvlc_media_event_manager(p_md, NULL);
libvlc_event_detach(p_em, libvlc_MediaDescriptorMetaChanged, HandleMediaMetaChanged, self, NULL);
// libvlc_event_detach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, NULL);
libvlc_event_detach(p_em, libvlc_MediaDescriptorStateChanged, HandleMediaStateChanged, self, NULL);
[subitems release];
[metaDictionary release];
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
[super dealloc];
}
if (!length)
{
// Try figuring out what the length is
- long long duration = libvlc_media_descriptor_get_duration( p_md, NULL );
+ long long duration = libvlc_media_get_duration( p_md, NULL );
if (duration > -1)
{
[self setLength:[VLCTime timeWithNumber:[NSNumber numberWithLongLong:duration]]];
- (BOOL)isPreparsed
{
- return libvlc_media_descriptor_is_preparsed( p_md, NULL );
+ return libvlc_media_is_preparsed( p_md, NULL );
}
@synthesize url;
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_descriptor_retain( md );
+ libvlc_media_retain( md );
p_md = md;
metaDictionary = [[NSMutableDictionary alloc] initWithCapacity:3];
+ (id)mediaWithMedia:(VLCMedia *)media andLibVLCOptions:(NSDictionary *)options
{
- libvlc_media_descriptor_t * p_md;
- p_md = libvlc_media_descriptor_duplicate( [media libVLCMediaDescriptor] );
+ libvlc_media_t * p_md;
+ p_md = libvlc_media_duplicate( [media libVLCMediaDescriptor] );
for( NSString * key in [options allKeys] )
{
- libvlc_media_descriptor_add_option(p_md, [[NSString stringWithFormat:@"%@=#%@", key, [options objectForKey:key]] UTF8String], NULL);
+ libvlc_media_add_option(p_md, [[NSString stringWithFormat:@"%@=#%@", key, [options objectForKey:key]] UTF8String], NULL);
}
return [VLCMedia mediaWithLibVLCMediaDescriptor:p_md];
}
artFetched = NO;
- char * p_url = libvlc_media_descriptor_get_mrl( p_md, &ex );
+ char * p_url = libvlc_media_get_mrl( p_md, &ex );
catch_exception( &ex );
url = [[NSURL URLWithString:[NSString stringWithUTF8String:p_url]] retain];
url = [[NSURL fileURLWithPath:[NSString stringWithUTF8String:p_url]] retain];
free( p_url );
- libvlc_media_descriptor_set_user_data( p_md, (void*)self, &ex );
+ libvlc_media_set_user_data( p_md, (void*)self, &ex );
catch_exception( &ex );
- libvlc_event_manager_t * p_em = libvlc_media_descriptor_event_manager( p_md, &ex );
+ libvlc_event_manager_t * p_em = libvlc_media_event_manager( p_md, &ex );
libvlc_event_attach(p_em, libvlc_MediaDescriptorMetaChanged, HandleMediaMetaChanged, self, &ex);
// libvlc_event_attach(p_em, libvlc_MediaDescriptorDurationChanged, HandleMediaDurationChanged, self, &ex);
libvlc_event_attach(p_em, libvlc_MediaDescriptorStateChanged, HandleMediaStateChanged, self, &ex);
libvlc_event_attach(p_em, libvlc_MediaDescriptorSubItemAdded, HandleMediaSubItemAdded, self, &ex);
catch_exception( &ex );
- libvlc_media_list_t * p_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
+ libvlc_media_list_t * p_mlist = libvlc_media_subitems( p_md, NULL );
if (!p_mlist)
subitems = nil;
libvlc_media_list_release( p_mlist );
}
- state = LibVLCStateToMediaState(libvlc_media_descriptor_get_state( p_md, NULL ));
+ state = LibVLCStateToMediaState(libvlc_media_get_state( p_md, NULL ));
/* Force VLCMetaInformationTitle, that will trigger preparsing
* And all the other meta will be added through the libvlc event system */
- (void)fetchMetaInformationFromLibVLCWithType:(NSString *)metaType
{
- char * psz_value = libvlc_media_descriptor_get_meta( p_md, [VLCMedia stringToMetaType:metaType], NULL);
+ char * psz_value = libvlc_media_get_meta( p_md, [VLCMedia stringToMetaType:metaType], NULL);
NSString * newValue = psz_value ? [NSString stringWithUTF8String: psz_value] : nil;
NSString * oldValue = [metaDictionary valueForKey:metaType];
free(psz_value);
if( subitems )
return; /* Nothing to do */
- libvlc_media_list_t * p_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
+ libvlc_media_list_t * p_mlist = libvlc_media_subitems( p_md, NULL );
NSAssert( p_mlist, @"The mlist shouldn't be nil, we are receiving a subItemAdded");
// Add it to the libvlc's medialist
libvlc_exception_t p_e;
libvlc_exception_init( &p_e );
- libvlc_media_list_insert_media_descriptor( p_mlist, [media libVLCMediaDescriptor], index, &p_e );
+ libvlc_media_list_insert_media( p_mlist, [media libVLCMediaDescriptor], index, &p_e );
catch_exception( &p_e );
}
int i, count = libvlc_media_list_count( p_mlist, NULL );
for( i = 0; i < count; i++ )
{
- libvlc_media_descriptor_t * p_md = libvlc_media_list_item_at_index( p_mlist, i, NULL );
+ libvlc_media_t * p_md = libvlc_media_list_item_at_index( p_mlist, i, NULL );
[cachedMedia addObject:[VLCMedia mediaWithLibVLCMediaDescriptor:p_md]];
- libvlc_media_descriptor_release(p_md);
+ libvlc_media_release(p_md);
}
[self initInternalMediaList];
libvlc_media_list_unlock(p_mlist);
{
libvlc_exception_t p_e;
libvlc_exception_init( &p_e );
- libvlc_media_descriptor_t * p_md = libvlc_media_list_view_item_at_index( p_mlv, index, &p_e );
+ libvlc_media_t * p_md = libvlc_media_list_view_item_at_index( p_mlv, index, &p_e );
catch_exception( &p_e );
// Returns local object for media descriptor, searchs for user data first. If not found it creates a
int i, count = libvlc_media_list_view_count(p_mlv, NULL);
for( i = 0; i < count; i++ )
{
- libvlc_media_descriptor_t * p_md = libvlc_media_list_view_item_at_index(p_mlv, i, NULL);
+ libvlc_media_t * p_md = libvlc_media_list_view_item_at_index(p_mlv, i, NULL);
libvlc_media_list_view_t * p_sub_mlv = libvlc_media_list_view_children_at_index(p_mlv, i, NULL);
VLCMediaListAspectNode * node = [[[VLCMediaListAspectNode alloc] init] autorelease];
[node setMedia:[VLCMedia mediaWithLibVLCMediaDescriptor: p_md]];
if( p_sub_mlv ) NSAssert(![node isLeaf], @"Not leaf");
[cachedNode addObject:node];
- libvlc_media_descriptor_release(p_md);
+ libvlc_media_release(p_md);
if( p_sub_mlv ) libvlc_media_list_view_release(p_sub_mlv);
}
[self initInternalMediaListView];
[[VLCEventManager sharedManager] callOnMainThreadObject:self
withMethod:@selector(mediaPlayerTimeChanged:)
- withArgumentAsObject:[NSNumber numberWithLongLong:event->u.media_instance_time_changed.new_time]];
+ withArgumentAsObject:[NSNumber numberWithLongLong:event->u.media_player_time_changed.new_time]];
[[VLCEventManager sharedManager] callOnMainThreadDelegateOfObject:self
withDelegateMethod:@selector(mediaPlayerTimeChanged:)
[[VLCEventManager sharedManager] callOnMainThreadObject:self
withMethod:@selector(mediaPlayerPositionChanged:)
- withArgumentAsObject:[NSNumber numberWithFloat:event->u.media_instance_position_changed.new_position]];
+ withArgumentAsObject:[NSNumber numberWithFloat:event->u.media_player_position_changed.new_position]];
[pool release];
}
// TODO: Should we tell the delegate that we're shutting down?
delegate = nil;
- libvlc_media_instance_release((libvlc_media_instance_t *)instance);
+ libvlc_media_player_release((libvlc_media_player_t *)instance);
// Get rid of everything else
[media release];
// Make sure that this instance has been associated with the drawing canvas.
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_instance_set_drawable ((libvlc_media_instance_t *)instance,
+ libvlc_media_player_set_drawable ((libvlc_media_player_t *)instance,
(libvlc_drawable_t)aDrawable,
&ex);
catch_exception( &ex );
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_drawable_t ret = libvlc_media_instance_get_drawable ((libvlc_media_instance_t *)instance,
+ libvlc_drawable_t ret = libvlc_media_player_get_drawable ((libvlc_media_player_t *)instance,
&ex);
catch_exception( &ex );
return (id)ret;
- (void)setRate:(float)value
{
- libvlc_media_instance_set_rate( instance, value, NULL );
+ libvlc_media_player_set_rate( instance, value, NULL );
}
- (float)rate
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- float result = libvlc_media_instance_get_rate( instance, &ex );
+ float result = libvlc_media_player_get_rate( instance, &ex );
catch_exception( &ex );
return result;
}
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- NSSize result = NSMakeSize(libvlc_video_get_height((libvlc_media_instance_t *)instance, &ex),
- libvlc_video_get_width((libvlc_media_instance_t *)instance, &ex));
+ NSSize result = NSMakeSize(libvlc_video_get_height((libvlc_media_player_t *)instance, &ex),
+ libvlc_video_get_width((libvlc_media_player_t *)instance, &ex));
catch_exception( &ex );
return result;
}
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- BOOL result = libvlc_media_instance_has_vout((libvlc_media_instance_t *)instance, &ex);
+ BOOL result = libvlc_media_player_has_vout((libvlc_media_player_t *)instance, &ex);
if (libvlc_exception_raised( &ex ))
{
libvlc_exception_clear( &ex );
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- float result = libvlc_media_instance_get_fps( (libvlc_media_instance_t *)instance, &ex );
+ float result = libvlc_media_player_get_fps( (libvlc_media_player_t *)instance, &ex );
catch_exception( &ex );
return result;
}
libvlc_exception_init( &ex );
// Time is managed in seconds, while duration is managed in microseconds
// TODO: Redo VLCTime to provide value numberAsMilliseconds, numberAsMicroseconds, numberAsSeconds, numberAsMinutes, numberAsHours
- libvlc_media_instance_set_time( (libvlc_media_instance_t *)instance,
+ libvlc_media_player_set_time( (libvlc_media_player_t *)instance,
(value ? [[value numberValue] longLongValue] / 1000 : 0),
&ex );
catch_exception( &ex );
- (void)setChapter:(int)value;
{
- libvlc_media_instance_set_chapter( instance, value, NULL );
+ libvlc_media_player_set_chapter( instance, value, NULL );
}
- (int)chapter
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- int result = libvlc_media_instance_get_chapter( instance, &ex );
+ int result = libvlc_media_player_get_chapter( instance, &ex );
catch_exception( &ex );
return result;
}
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- int result = libvlc_media_instance_get_chapter_count( instance, &ex );
+ int result = libvlc_media_player_get_chapter_count( instance, &ex );
catch_exception( &ex );
return result;
}
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_instance_set_media_descriptor( instance, [media libVLCMediaDescriptor], &ex );
+ libvlc_media_player_set_media( instance, [media libVLCMediaDescriptor], &ex );
catch_exception( &ex );
}
}
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_instance_play( (libvlc_media_instance_t *)instance, &ex );
+ libvlc_media_player_play( (libvlc_media_player_t *)instance, &ex );
catch_exception( &ex );
return YES;
}
// Pause the stream
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_instance_pause( (libvlc_media_instance_t *)instance, &ex );
+ libvlc_media_player_pause( (libvlc_media_player_t *)instance, &ex );
catch_exception( &ex );
// TODO: Should we record the time in case the media instance is destroyed
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_instance_stop((libvlc_media_instance_t *)instance, &ex);
+ libvlc_media_player_stop((libvlc_media_player_t *)instance, &ex);
catch_exception( &ex );
}
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- BOOL ret = libvlc_media_instance_will_play( (libvlc_media_instance_t *)instance, &ex );
+ BOOL ret = libvlc_media_player_will_play( (libvlc_media_player_t *)instance, &ex );
if (libvlc_exception_raised(&ex))
{
libvlc_exception_clear(&ex);
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_instance_set_position( instance, newPosition, &ex );
+ libvlc_media_player_set_position( instance, newPosition, &ex );
catch_exception( &ex );
}
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- BOOL ret = libvlc_media_instance_is_seekable( instance, &ex );
+ BOOL ret = libvlc_media_player_is_seekable( instance, &ex );
catch_exception( &ex );
return ret;
}
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- BOOL ret = libvlc_media_instance_can_pause( instance, &ex );
+ BOOL ret = libvlc_media_player_can_pause( instance, &ex );
catch_exception( &ex );
return ret;
}
// instance
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- instance = (void *)libvlc_media_instance_new([VLCLibrary sharedInstance], &ex);
+ instance = (void *)libvlc_media_player_new([VLCLibrary sharedInstance], &ex);
catch_exception( &ex );
[self registerObservers];
libvlc_exception_init( &ex );
// Attach event observers into the media instance
- libvlc_event_manager_t * p_em = libvlc_media_instance_event_manager( instance, &ex );
+ libvlc_event_manager_t * p_em = libvlc_media_player_event_manager( instance, &ex );
libvlc_event_attach( p_em, libvlc_MediaInstancePlayed, HandleMediaInstanceStateChanged, self, &ex );
libvlc_event_attach( p_em, libvlc_MediaInstancePaused, HandleMediaInstanceStateChanged, self, &ex );
libvlc_event_attach( p_em, libvlc_MediaInstanceReachedEnd, HandleMediaInstanceStateChanged, self, &ex );
- (void)unregisterObservers
{
- libvlc_event_manager_t * p_em = libvlc_media_instance_event_manager( instance, NULL );
+ libvlc_event_manager_t * p_em = libvlc_media_player_event_manager( instance, NULL );
libvlc_event_detach( p_em, libvlc_MediaInstancePlayed, HandleMediaInstanceStateChanged, self, NULL );
libvlc_event_detach( p_em, libvlc_MediaInstancePaused, HandleMediaInstanceStateChanged, self, NULL );
libvlc_event_detach( p_em, libvlc_MediaInstanceReachedEnd, HandleMediaInstanceStateChanged, self, NULL );
}\r
case ID_audio_track:\r
{\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
return INVOKERESULT_GENERIC_ERROR;\r
}\r
int track = libvlc_audio_get_track(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_audio_track:\r
if( isNumberValue(value) )\r
{\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
libvlc_audio_set_track(p_md,\r
numberValue(value), &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
libvlc_exception_t ex;\r
libvlc_exception_init(&ex);\r
\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
if( index != ID_input_state )\r
{\r
case ID_input_length:\r
{\r
- double val = (double)libvlc_media_instance_get_length(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ double val = (double)libvlc_media_player_get_length(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
case ID_input_position:\r
{\r
- double val = libvlc_media_instance_get_position(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ double val = libvlc_media_player_get_position(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
case ID_input_time:\r
{\r
- double val = (double)libvlc_media_instance_get_time(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ double val = (double)libvlc_media_player_get_time(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
case ID_input_state:\r
{\r
- int val = libvlc_media_instance_get_state(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ int val = libvlc_media_player_get_state(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
case ID_input_rate:\r
{\r
- float val = libvlc_media_instance_get_rate(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ float val = libvlc_media_player_get_rate(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
case ID_input_fps:\r
{\r
- double val = libvlc_media_instance_get_fps(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ double val = libvlc_media_player_get_fps(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
case ID_input_hasvout:\r
{\r
- vlc_bool_t val = libvlc_media_instance_has_vout(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ vlc_bool_t val = libvlc_media_player_has_vout(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
default:\r
;\r
}\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
}\r
return INVOKERESULT_GENERIC_ERROR;\r
}\r
libvlc_exception_t ex;\r
libvlc_exception_init(&ex);\r
\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
{\r
if( ! NPVARIANT_IS_DOUBLE(value) )\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
\r
float val = (float)NPVARIANT_TO_DOUBLE(value);\r
- libvlc_media_instance_set_position(p_md, val, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_set_position(p_md, val, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
val = (vlc_int64_t)NPVARIANT_TO_DOUBLE(value);\r
else\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
\r
- libvlc_media_instance_set_time(p_md, val, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_set_time(p_md, val, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
val = (float)NPVARIANT_TO_DOUBLE(value);\r
else\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
\r
- libvlc_media_instance_set_rate(p_md, val, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_set_rate(p_md, val, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
default:\r
;\r
}\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
}\r
return INVOKERESULT_GENERIC_ERROR;\r
}\r
libvlc_exception_t ex;\r
libvlc_exception_init(&ex);\r
\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_video_fullscreen:\r
{\r
int val = libvlc_get_fullscreen(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_video_height:\r
{\r
int val = libvlc_video_get_height(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_video_width:\r
{\r
int val = libvlc_video_get_width(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_video_aspectratio:\r
{\r
NPUTF8 *psz_aspect = libvlc_video_get_aspect_ratio(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_video_subtitle:\r
{\r
int i_spu = libvlc_video_get_spu(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_video_crop:\r
{\r
NPUTF8 *psz_geometry = libvlc_video_get_crop_geometry(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_video_teletext:\r
{\r
int i_page = libvlc_video_get_teletext(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
return INVOKERESULT_NO_ERROR;\r
}\r
}\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
}\r
return INVOKERESULT_GENERIC_ERROR;\r
}\r
libvlc_exception_t ex;\r
libvlc_exception_init(&ex);\r
\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
{\r
if( ! NPVARIANT_IS_BOOLEAN(value) )\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
\r
int val = NPVARIANT_TO_BOOLEAN(value);\r
libvlc_set_fullscreen(p_md, val, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
\r
if( libvlc_exception_raised(&ex) )\r
{\r
\r
if( ! NPVARIANT_IS_STRING(value) )\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
\r
psz_aspect = stringValue(NPVARIANT_TO_STRING(value));\r
if( !psz_aspect )\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_GENERIC_ERROR;\r
}\r
\r
libvlc_video_set_aspect_ratio(p_md, psz_aspect, &ex);\r
delete psz_aspect;\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
\r
if( libvlc_exception_raised(&ex) )\r
{\r
{\r
libvlc_video_set_spu(p_md,\r
numberValue(value), &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
return INVOKERESULT_NO_ERROR;\r
}\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
case ID_video_crop:\r
\r
if( ! NPVARIANT_IS_STRING(value) )\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
\r
psz_geometry = stringValue(NPVARIANT_TO_STRING(value));\r
if( !psz_geometry )\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_GENERIC_ERROR;\r
}\r
\r
libvlc_video_set_crop_geometry(p_md, psz_geometry, &ex);\r
delete psz_geometry;\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
\r
if( libvlc_exception_raised(&ex) )\r
{\r
{\r
libvlc_video_set_teletext(p_md,\r
numberValue(value), &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
}\r
return INVOKERESULT_NO_ERROR;\r
}\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
return INVOKERESULT_INVALID_VALUE;\r
}\r
}\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
}\r
return INVOKERESULT_GENERIC_ERROR;\r
}\r
libvlc_exception_t ex;\r
libvlc_exception_init(&ex);\r
\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
if( argCount == 0 )\r
{\r
libvlc_toggle_fullscreen(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
if( argCount == 0 )\r
{\r
libvlc_toggle_teletext(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_fullscreen: /* deprecated */\r
if( argCount == 0 )\r
{\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( p_md )\r
{\r
libvlc_toggle_fullscreen(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_get_length: /* deprecated */\r
if( argCount == 0 )\r
{\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( p_md )\r
{\r
- vlc_int64_t val = libvlc_media_instance_get_length(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ vlc_int64_t val = libvlc_media_player_get_length(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_get_position: /* deprecated */\r
if( argCount == 0 )\r
{\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( p_md )\r
{\r
- float val = libvlc_media_instance_get_position(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ float val = libvlc_media_player_get_position(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
case ID_get_time: /* deprecated */\r
if( argCount == 0 )\r
{\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( p_md )\r
{\r
- vlc_int64_t val = libvlc_media_instance_get_time(p_md, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ vlc_int64_t val = libvlc_media_player_get_time(p_md, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
&& isNumberValue(args[0])\r
&& NPVARIANT_IS_BOOLEAN(args[1]) )\r
{\r
- libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);\r
+ libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);\r
if( p_md )\r
{\r
vlc_int64_t pos = 0;\r
if( NPVARIANT_TO_BOOLEAN(args[1]) )\r
{\r
/* relative seek */\r
- vlc_int64_t from = libvlc_media_instance_get_time(p_md, &ex);\r
+ vlc_int64_t from = libvlc_media_player_get_time(p_md, &ex);\r
if( libvlc_exception_raised(&ex) )\r
{\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_release(p_md);\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
libvlc_exception_clear(&ex);\r
return INVOKERESULT_GENERIC_ERROR;\r
pos += from;\r
}\r
/* jump to time */\r
- libvlc_media_instance_set_time(p_md, pos, &ex);\r
- libvlc_media_instance_release(p_md);\r
+ libvlc_media_player_set_time(p_md, pos, &ex);\r
+ libvlc_media_player_release(p_md);\r
if( libvlc_exception_raised(&ex) )\r
{\r
NPN_SetException(this, libvlc_exception_get_message(&ex));\r
void VlcPlugin::redrawToolbar()
{
- libvlc_media_instance_t *p_md = NULL;
+ libvlc_media_player_t *p_md = NULL;
libvlc_exception_t ex;
float f_position = 0.0;
int i_playing = 0;
/* get media instance */
libvlc_exception_init( &ex );
- p_md = libvlc_playlist_get_media_instance( getVLC(), &ex );
+ p_md = libvlc_playlist_get_media_player( getVLC(), &ex );
libvlc_exception_clear( &ex );
/* get isplaying */
if( i_playing == 1 )
{
libvlc_exception_init( &ex );
- f_position = libvlc_media_instance_get_position( p_md, &ex ) * 100;
+ f_position = libvlc_media_player_get_position( p_md, &ex ) * 100;
libvlc_exception_clear( &ex );
}
- libvlc_media_instance_release( p_md );
+ libvlc_media_player_release( p_md );
gcv.foreground = BlackPixel( p_display, 0 );
gc = XCreateGC( p_display, control, GCForeground, &gcv );
{
if( libvlc_playlist_isplaying(p_vlc, NULL) )
{
- libvlc_media_instance_t *p_md =
- libvlc_playlist_get_media_instance(p_vlc, NULL);
+ libvlc_media_player_t *p_md =
+ libvlc_playlist_get_media_player(p_vlc, NULL);
if( p_md )
{
libvlc_toggle_fullscreen(p_md, NULL);
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
}
}
}
{
if( libvlc_playlist_isplaying(p_vlc, NULL) )
{
- libvlc_media_instance_t *p_md =
- libvlc_playlist_get_media_instance(p_vlc, NULL);
+ libvlc_media_player_t *p_md =
+ libvlc_playlist_get_media_player(p_vlc, NULL);
if( p_md )
{
- hasVout = libvlc_media_instance_has_vout(p_md,
+ hasVout = libvlc_media_player_has_vout(p_md,
NULL);
if( hasVout )
{
libvlc_video_redraw_rectangle(p_md, &area,
NULL);
}
- libvlc_media_instance_release(p_md);
+ libvlc_media_player_release(p_md);
}
}
}
/* callback */
/*
- libvlc_media_instance_t *p_md;
+ libvlc_media_player_t *p_md;
libvlc_exception_t ex;
libvlc_exception_init(& ex );
- p_md = libvlc_playlist_get_media_instance( p_plugin->getVLC(), &ex );
+ p_md = libvlc_playlist_get_media_player( p_plugin->getVLC(), &ex );
libvlc_exception_init( &ex );
- libvlc_event_attach( libvlc_media_instance_event_manager( p_md, &ex ),
+ libvlc_event_attach( libvlc_media_player_event_manager( p_md, &ex ),
libvlc_MediaInstancePositionChanged, Redraw, NULL, &ex );
*/
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
- libvlc_media_instance_t *p_md =
- libvlc_playlist_get_media_instance(p_plugin->getVLC(), &ex);
+ libvlc_media_player_t *p_md =
+ libvlc_playlist_get_media_player(p_plugin->getVLC(), &ex);
libvlc_exception_clear( &ex );
/* jump in the movie */
{
vlc_int64_t f_length;
libvlc_exception_init( &ex );
- f_length = libvlc_media_instance_get_length( p_md, &ex ) / 100;
+ f_length = libvlc_media_player_get_length( p_md, &ex ) / 100;
libvlc_exception_clear( &ex );
f_length = (float)f_length *
( ((float)i_xPos-4 ) / ( ((float)i_width-8)/100) );
libvlc_exception_init( &ex );
- libvlc_media_instance_set_time( p_md, f_length, &ex );
+ libvlc_media_player_set_time( p_md, f_length, &ex );
libvlc_exception_clear( &ex );
}
}
libvlc_exception_clear( &ex );
}
- if( p_md ) libvlc_media_instance_release( p_md );
+ if( p_md ) libvlc_media_player_release( p_md );
}
Redraw( w, closure, event );
}
control/flat_media_list_view.c \
control/hierarchical_media_list_view.c \
control/hierarchical_node_media_list_view.c \
- control/media_descriptor.c \
- control/media_instance.c \
+ control/media.c \
+ control/media_player.c \
control/media_list.c \
control/media_list_path.h \
control/media_list_player.c \
/*****************************************************************************
* libvlc_audio_get_track_count : Get the number of available audio tracks
*****************************************************************************/
-int libvlc_audio_get_track_count( libvlc_media_instance_t *p_mi,
+int libvlc_audio_get_track_count( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
/*****************************************************************************
* libvlc_audio_get_track : Get the current audio track
*****************************************************************************/
-int libvlc_audio_get_track( libvlc_media_instance_t *p_mi,
+int libvlc_audio_get_track( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
/*****************************************************************************
* libvlc_audio_set_track : Set the current audio track
*****************************************************************************/
-void libvlc_audio_set_track( libvlc_media_instance_t *p_mi, int i_track,
+void libvlc_audio_set_track( libvlc_media_player_t *p_mi, int i_track,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
ml_item_added( const libvlc_event_t * p_event, libvlc_media_list_view_t * p_mlv )
{
int index = vlc_array_count( &p_mlv->p_this_view_data->array );
- libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_t * p_md = p_event->u.media_list_item_added.item;
+ libvlc_media_retain( p_md );
trace("appending item at index %d\n", index);
libvlc_media_list_view_will_add_item( p_mlv, p_md, index );
static void
ml_item_removed( const libvlc_event_t * p_event, libvlc_media_list_view_t * p_mlv )
{
- libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_deleted.item;
+ libvlc_media_t * p_md = p_event->u.media_list_item_deleted.item;
int i = vlc_array_index_of_item( &p_mlv->p_this_view_data->array, p_md );
if( i >= 0 )
{
libvlc_media_list_view_will_delete_item( p_mlv, p_md, i );
vlc_array_remove( &p_mlv->p_this_view_data->array, i );
libvlc_media_list_view_item_deleted( p_mlv, p_md, i );
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
}
}
* flat_media_list_view_item_at_index (private)
* (called by flat_media_list_view_item_at_index)
**************************************************************************/
-static libvlc_media_descriptor_t *
+static libvlc_media_t *
flat_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
int index,
libvlc_exception_t * p_e )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
(void)p_e;
p_md = vlc_array_item_at_index( &p_mlv->p_this_view_data->array, index );
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_retain( p_md );
return p_md;
}
count = libvlc_media_list_count( p_mlist, p_e );
for( i = 0; i < count; i++ )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
p_md = libvlc_media_list_item_at_index( p_mlist, i, p_e );
vlc_array_append( &p_mlv->p_this_view_data->array, p_md );
- p_submlist = libvlc_media_descriptor_subitems( p_md, p_e );
+ p_submlist = libvlc_media_subitems( p_md, p_e );
if( p_submlist )
{
libvlc_media_list_lock( p_submlist );
* flat_media_list_view_item_at_index (private)
* (called by flat_media_list_view_item_at_index)
**************************************************************************/
-static libvlc_media_descriptor_t *
+static libvlc_media_t *
hierarch_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
int index,
libvlc_exception_t * p_e )
int index,
libvlc_exception_t * p_e )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
libvlc_media_list_view_t * p_ret;
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, index, p_e );
if( !p_md ) return NULL;
- p_submlist = libvlc_media_descriptor_subitems( p_md, p_e );
- libvlc_media_descriptor_release( p_md );
+ p_submlist = libvlc_media_subitems( p_md, p_e );
+ libvlc_media_release( p_md );
if( !p_submlist ) return NULL;
p_ret = libvlc_media_list_hierarchical_view( p_submlist, p_e );
libvlc_media_list_release( p_submlist );
static void
media_list_item_added( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index = p_event->u.media_list_item_added.index;
p_md = p_event->u.media_list_item_added.item;
static void
media_list_will_add_item( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index = p_event->u.media_list_will_add_item.index;
p_md = p_event->u.media_list_will_add_item.item;
static void
media_list_item_deleted( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index = p_event->u.media_list_item_deleted.index;
p_md = p_event->u.media_list_item_deleted.item;
static void
media_list_will_delete_item( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index = p_event->u.media_list_will_delete_item.index;
p_md = p_event->u.media_list_will_delete_item.item;
{
/* FIXME: we may want to cache that */
int i, ret, count = libvlc_media_list_count( p_mlv->p_mlist, p_e );
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
ret = 0;
trace("\n");
{
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, p_e );
if( !p_md ) continue;
- p_submlist = libvlc_media_descriptor_subitems( p_md, p_e );
+ p_submlist = libvlc_media_subitems( p_md, p_e );
if( !p_submlist ) continue;
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
libvlc_media_list_release( p_submlist );
ret++;
}
* flat_media_list_view_item_at_index (private)
* (called by flat_media_list_view_item_at_index)
**************************************************************************/
-static libvlc_media_descriptor_t *
+static libvlc_media_t *
hierarch_node_media_list_view_item_at_index( libvlc_media_list_view_t * p_mlv,
int index,
libvlc_exception_t * p_e )
{
/* FIXME: we may want to cache that */
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
trace("%d\n", index);
int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist, p_e );
{
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, p_e );
if( !p_md ) continue;
- p_submlist = libvlc_media_descriptor_subitems( p_md, p_e );
+ p_submlist = libvlc_media_subitems( p_md, p_e );
if( !p_submlist ) continue;
libvlc_media_list_release( p_submlist );
current_index++;
if( current_index == index )
return p_md;
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
}
libvlc_exception_raise( p_e, "Index out of bound in Media List View" );
int index,
libvlc_exception_t * p_e )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_t * p_submlist;
libvlc_media_list_view_t * p_ret;
p_md = hierarch_node_media_list_view_item_at_index( p_mlv, index, p_e );
if( !p_md ) return NULL;
- p_submlist = libvlc_media_descriptor_subitems( p_md, p_e );
- libvlc_media_descriptor_release( p_md );
+ p_submlist = libvlc_media_subitems( p_md, p_e );
+ libvlc_media_release( p_md );
if( !p_submlist ) return NULL;
p_ret = libvlc_media_list_hierarchical_node_view( p_submlist, p_e );
libvlc_media_list_release( p_submlist );
/* Helper */
static int
-index_of_item( libvlc_media_list_view_t * p_mlv, libvlc_media_descriptor_t * p_md )
+index_of_item( libvlc_media_list_view_t * p_mlv, libvlc_media_t * p_md )
{
- libvlc_media_descriptor_t * p_iter_md;
+ libvlc_media_t * p_iter_md;
libvlc_media_list_t * p_submlist;
int i, current_index, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
{
p_iter_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, NULL );
if( !p_iter_md ) continue;
- p_submlist = libvlc_media_descriptor_subitems( p_iter_md, NULL );
+ p_submlist = libvlc_media_subitems( p_iter_md, NULL );
if( !p_submlist ) continue;
libvlc_media_list_release( p_submlist );
- libvlc_media_descriptor_release( p_iter_md );
+ libvlc_media_release( p_iter_md );
current_index++;
if( p_md == p_iter_md )
return current_index;
}
static vlc_bool_t
-item_is_already_added( libvlc_media_descriptor_t * p_md )
+item_is_already_added( libvlc_media_t * p_md )
{
libvlc_media_list_t * p_submlist;
- p_submlist = libvlc_media_descriptor_subitems( p_md, NULL );
+ p_submlist = libvlc_media_subitems( p_md, NULL );
if( !p_submlist ) return VLC_FALSE;
int count = libvlc_media_list_count( p_submlist, NULL );
libvlc_media_list_release( p_submlist );
static void
items_subitems_added( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index;
p_md = p_event->p_obj;
static void
media_list_item_added( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index;
p_md = p_event->u.media_list_item_added.item;
static void
media_list_will_add_item( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index;
p_md = p_event->u.media_list_will_add_item.item;
static void
media_list_item_deleted( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index;
p_md = p_event->u.media_list_item_deleted.item;
static void
media_list_will_delete_item( const libvlc_event_t * p_event, void * user_data )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_list_view_t * p_mlv = user_data;
int index;
p_md = p_event->u.media_list_will_delete_item.item;
struct libvlc_callback_entry_list_t *p_callback_list;
};
-struct libvlc_media_descriptor_t
+struct libvlc_media_t
{
libvlc_event_manager_t * p_event_manager;
int b_preparsed;
libvlc_instance_t * p_libvlc_instance;
int i_refcount;
vlc_mutex_t object_lock;
- libvlc_media_descriptor_t * p_md; /* The media_descriptor from which the
+ libvlc_media_t * p_md; /* The media from which the
* mlist comes, if any. */
vlc_array_t items;
typedef int (*libvlc_media_list_view_count_func_t)( libvlc_media_list_view_t * p_mlv,
libvlc_exception_t * ) ;
-typedef libvlc_media_descriptor_t *
+typedef libvlc_media_t *
(*libvlc_media_list_view_item_at_index_func_t)(
libvlc_media_list_view_t * p_mlv,
int index,
void (*pf_ml_item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *);
};
-struct libvlc_media_instance_t
+struct libvlc_media_player_t
{
int i_refcount;
vlc_mutex_t object_lock;
input_thread_t * p_input_thread;
struct libvlc_instance_t * p_libvlc_instance; /* Parent instance */
- libvlc_media_descriptor_t * p_md; /* current media descriptor */
+ libvlc_media_t * p_md; /* current media descriptor */
libvlc_event_manager_t * p_event_manager;
libvlc_drawable_t drawable;
int i_refcount;
vlc_mutex_t object_lock;
libvlc_media_list_path_t current_playing_item_path;
- libvlc_media_descriptor_t * p_current_playing_item;
+ libvlc_media_t * p_current_playing_item;
libvlc_media_list_t * p_mlist;
- libvlc_media_instance_t * p_mi;
+ libvlc_media_player_t * p_mi;
};
struct libvlc_media_library_t
* Other internal functions
***************************************************************************/
VLC_EXPORT (input_thread_t *, libvlc_get_input_thread,
- ( struct libvlc_media_instance_t *, libvlc_exception_t * ) );
+ ( struct libvlc_media_player_t *, libvlc_exception_t * ) );
/* Media instance */
-VLC_EXPORT (libvlc_media_instance_t *, libvlc_media_instance_new_from_input_thread,
+VLC_EXPORT (libvlc_media_player_t *, libvlc_media_player_new_from_input_thread,
( struct libvlc_instance_t *, input_thread_t *, libvlc_exception_t * ) );
-VLC_EXPORT (void, libvlc_media_instance_destroy,
- ( libvlc_media_instance_t * ) );
+VLC_EXPORT (void, libvlc_media_player_destroy,
+ ( libvlc_media_player_t * ) );
/* Media Descriptor */
-VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_item,
+VLC_EXPORT (libvlc_media_t *, libvlc_media_new_from_input_item,
( struct libvlc_instance_t *, input_item_t *, libvlc_exception_t * ) );
-VLC_EXPORT (void, libvlc_media_descriptor_set_state,
- ( libvlc_media_descriptor_t *, libvlc_state_t, libvlc_exception_t * ) );
+VLC_EXPORT (void, libvlc_media_set_state,
+ ( libvlc_media_t *, libvlc_state_t, libvlc_exception_t * ) );
/* Media List */
-VLC_EXPORT ( void, _libvlc_media_list_add_media_descriptor,
+VLC_EXPORT ( void, _libvlc_media_list_add_media,
( libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e ) );
-VLC_EXPORT ( void, _libvlc_media_list_insert_media_descriptor,
+VLC_EXPORT ( void, _libvlc_media_list_insert_media,
( libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
int index,
libvlc_exception_t * p_e ) );
void (*item_removed)(const libvlc_event_t *, libvlc_media_list_view_t *) ));
VLC_EXPORT ( void, libvlc_media_list_view_will_delete_item, ( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index ));
VLC_EXPORT ( void, libvlc_media_list_view_item_deleted, ( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index ));
VLC_EXPORT ( void, libvlc_media_list_view_will_add_item, ( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index ));
VLC_EXPORT ( void, libvlc_media_list_view_item_added, ( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index ));
/* Events */
/*****************************************************************************
- * media_descriptor.c: Libvlc API media descripor management
+ * media.c: Libvlc API media descripor management
*****************************************************************************
* Copyright (C) 2007 the VideoLAN team
* $Id$
static void input_item_subitem_added( const vlc_event_t *p_event,
void * user_data )
{
- libvlc_media_descriptor_t * p_md = user_data;
- libvlc_media_descriptor_t * p_md_child;
+ libvlc_media_t * p_md = user_data;
+ libvlc_media_t * p_md_child;
libvlc_event_t event;
- p_md_child = libvlc_media_descriptor_new_from_input_item(
+ p_md_child = libvlc_media_new_from_input_item(
p_md->p_libvlc_instance,
p_event->u.input_item_subitem_added.p_new_child, NULL );
if( !p_md->p_subitems )
{
p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
- libvlc_media_list_set_media_descriptor( p_md->p_subitems, p_md, NULL );
+ libvlc_media_list_set_media( p_md->p_subitems, p_md, NULL );
}
if( p_md->p_subitems )
{
- libvlc_media_list_add_media_descriptor( p_md->p_subitems, p_md_child, NULL );
+ libvlc_media_list_add_media( p_md->p_subitems, p_md_child, NULL );
}
/* Construct the event */
event.type = libvlc_MediaDescriptorSubItemAdded;
- event.u.media_descriptor_subitem_added.new_child = p_md_child;
+ event.u.media_subitem_added.new_child = p_md_child;
/* Send the event */
libvlc_event_send( p_md->p_event_manager, &event );
- libvlc_media_descriptor_release( p_md_child );
+ libvlc_media_release( p_md_child );
}
/**************************************************************************
static void input_item_meta_changed( const vlc_event_t *p_event,
void * user_data )
{
- libvlc_media_descriptor_t * p_md = user_data;
+ libvlc_media_t * p_md = user_data;
libvlc_event_t event;
/* Construct the event */
event.type = libvlc_MediaDescriptorMetaChanged;
- event.u.media_descriptor_meta_changed.meta_type =
+ event.u.media_meta_changed.meta_type =
vlc_to_libvlc_meta[p_event->u.input_item_meta_changed.meta_type];
/* Send the event */
static void input_item_duration_changed( const vlc_event_t *p_event,
void * user_data )
{
- libvlc_media_descriptor_t * p_md = user_data;
+ libvlc_media_t * p_md = user_data;
libvlc_event_t event;
/* Construct the event */
event.type = libvlc_MediaDescriptorDurationChanged;
- event.u.media_descriptor_duration_changed.new_duration =
+ event.u.media_duration_changed.new_duration =
p_event->u.input_item_duration_changed.new_duration;
/* Send the event */
static void input_item_preparsed_changed( const vlc_event_t *p_event,
void * user_data )
{
- libvlc_media_descriptor_t * p_md = user_data;
+ libvlc_media_t * p_md = user_data;
libvlc_event_t event;
/* Construct the event */
event.type = libvlc_MediaDescriptorPreparsedChanged;
- event.u.media_descriptor_preparsed_changed.new_status =
+ event.u.media_preparsed_changed.new_status =
p_event->u.input_item_preparsed_changed.new_status;
/* Send the event */
/**************************************************************************
* Install event handler (Private)
**************************************************************************/
-static void install_input_item_observer( libvlc_media_descriptor_t *p_md )
+static void install_input_item_observer( libvlc_media_t *p_md )
{
vlc_event_attach( &p_md->p_input_item->event_manager,
vlc_InputItemSubItemAdded,
/**************************************************************************
* Uninstall event handler (Private)
**************************************************************************/
-static void uninstall_input_item_observer( libvlc_media_descriptor_t *p_md )
+static void uninstall_input_item_observer( libvlc_media_t *p_md )
{
vlc_event_detach( &p_md->p_input_item->event_manager,
vlc_InputItemSubItemAdded,
/**************************************************************************
* Preparse if not already done (Private)
**************************************************************************/
-static void preparse_if_needed( libvlc_media_descriptor_t *p_md )
+static void preparse_if_needed( libvlc_media_t *p_md )
{
/* XXX: need some locking here */
if (!p_md->b_preparsed)
* (libvlc internal)
* That's the generic constructor
**************************************************************************/
-libvlc_media_descriptor_t * libvlc_media_descriptor_new_from_input_item(
+libvlc_media_t * libvlc_media_new_from_input_item(
libvlc_instance_t *p_instance,
input_item_t *p_input_item,
libvlc_exception_t *p_e )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
if (!p_input_item)
{
return NULL;
}
- p_md = malloc( sizeof(libvlc_media_descriptor_t) );
+ p_md = malloc( sizeof(libvlc_media_t) );
p_md->p_libvlc_instance = p_instance;
p_md->p_input_item = p_input_item;
p_md->b_preparsed = VLC_FALSE;
/**************************************************************************
* Create a new media descriptor object
**************************************************************************/
-libvlc_media_descriptor_t * libvlc_media_descriptor_new(
+libvlc_media_t * libvlc_media_new(
libvlc_instance_t *p_instance,
const char * psz_mrl,
libvlc_exception_t *p_e )
{
input_item_t * p_input_item;
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
p_input_item = input_ItemNew( p_instance->p_libvlc_int, psz_mrl, NULL );
return NULL;
}
- p_md = libvlc_media_descriptor_new_from_input_item( p_instance,
+ p_md = libvlc_media_new_from_input_item( p_instance,
p_input_item, p_e );
- /* The p_input_item is retained in libvlc_media_descriptor_new_from_input_item */
+ /* The p_input_item is retained in libvlc_media_new_from_input_item */
vlc_gc_decref( p_input_item );
return p_md;
/**************************************************************************
* Create a new media descriptor object
**************************************************************************/
-libvlc_media_descriptor_t * libvlc_media_descriptor_new_as_node(
+libvlc_media_t * libvlc_media_new_as_node(
libvlc_instance_t *p_instance,
const char * psz_name,
libvlc_exception_t *p_e )
{
input_item_t * p_input_item;
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
p_input_item = input_ItemNew( p_instance->p_libvlc_int, "vlc://nop", psz_name );
return NULL;
}
- p_md = libvlc_media_descriptor_new_from_input_item( p_instance,
+ p_md = libvlc_media_new_from_input_item( p_instance,
p_input_item, p_e );
p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
/**************************************************************************
* Add an option to the media descriptor,
- * that will be used to determine how the media_instance will read the
- * media_descriptor. This allow to use VLC advanced reading/streaming
+ * that will be used to determine how the media_player will read the
+ * media. This allow to use VLC advanced reading/streaming
* options in a per-media basis
*
* The options are detailled in vlc --long-help, for instance "--sout-all"
**************************************************************************/
-void libvlc_media_descriptor_add_option(
- libvlc_media_descriptor_t * p_md,
+void libvlc_media_add_option(
+ libvlc_media_t * p_md,
const char * ppsz_option,
libvlc_exception_t *p_e )
{
/**************************************************************************
* Delete a media descriptor object
**************************************************************************/
-void libvlc_media_descriptor_release( libvlc_media_descriptor_t *p_md )
+void libvlc_media_release( libvlc_media_t *p_md )
{
if (!p_md)
return;
/* Construct the event */
libvlc_event_t event;
event.type = libvlc_MediaDescriptorFreed;
- event.u.media_descriptor_freed.md = p_md;
+ event.u.media_freed.md = p_md;
/* Send the event */
libvlc_event_send( p_md->p_event_manager, &event );
/**************************************************************************
* Retain a media descriptor object
**************************************************************************/
-void libvlc_media_descriptor_retain( libvlc_media_descriptor_t *p_md )
+void libvlc_media_retain( libvlc_media_t *p_md )
{
if (!p_md)
return;
/**************************************************************************
* Duplicate a media descriptor object
**************************************************************************/
-libvlc_media_descriptor_t *
-libvlc_media_descriptor_duplicate( libvlc_media_descriptor_t *p_md_orig )
+libvlc_media_t *
+libvlc_media_duplicate( libvlc_media_t *p_md_orig )
{
- return libvlc_media_descriptor_new_from_input_item(
+ return libvlc_media_new_from_input_item(
p_md_orig->p_libvlc_instance, p_md_orig->p_input_item, NULL );
}
* Retain a media descriptor object
**************************************************************************/
char *
-libvlc_media_descriptor_get_mrl( libvlc_media_descriptor_t * p_md,
+libvlc_media_get_mrl( libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
(void)p_e;
* Getter for meta information
**************************************************************************/
-char * libvlc_media_descriptor_get_meta( libvlc_media_descriptor_t *p_md,
+char * libvlc_media_get_meta( libvlc_media_t *p_md,
libvlc_meta_t e_meta,
libvlc_exception_t *p_e )
{
**************************************************************************/
libvlc_state_t
-libvlc_media_descriptor_get_state( libvlc_media_descriptor_t *p_md,
+libvlc_media_get_state( libvlc_media_t *p_md,
libvlc_exception_t *p_e )
{
(void)p_e;
**************************************************************************/
void
-libvlc_media_descriptor_set_state( libvlc_media_descriptor_t *p_md,
+libvlc_media_set_state( libvlc_media_t *p_md,
libvlc_state_t state,
libvlc_exception_t *p_e )
{
/* Construct the event */
event.type = libvlc_MediaDescriptorStateChanged;
- event.u.media_descriptor_state_changed.new_state = state;
+ event.u.media_state_changed.new_state = state;
/* Send the event */
libvlc_event_send( p_md->p_event_manager, &event );
* subitems
**************************************************************************/
libvlc_media_list_t *
-libvlc_media_descriptor_subitems( libvlc_media_descriptor_t * p_md,
+libvlc_media_subitems( libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
VLC_UNUSED(p_e);
* event_manager
**************************************************************************/
libvlc_event_manager_t *
-libvlc_media_descriptor_event_manager( libvlc_media_descriptor_t * p_md,
+libvlc_media_event_manager( libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
VLC_UNUSED(p_e);
}
/**************************************************************************
- * Get duration of media_descriptor object.
+ * Get duration of media object.
**************************************************************************/
vlc_int64_t
-libvlc_media_descriptor_get_duration( libvlc_media_descriptor_t * p_md,
+libvlc_media_get_duration( libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
VLC_UNUSED(p_e);
}
/**************************************************************************
- * Get preparsed status for media_descriptor object.
+ * Get preparsed status for media object.
**************************************************************************/
int
-libvlc_media_descriptor_is_preparsed( libvlc_media_descriptor_t * p_md,
+libvlc_media_is_preparsed( libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
VLC_UNUSED(p_e);
/**************************************************************************
* Sets media descriptor's user_data. user_data is specialized data
* accessed by the host application, VLC.framework uses it as a pointer to
- * an native object that references a libvlc_media_descriptor_t pointer
+ * an native object that references a libvlc_media_t pointer
**************************************************************************/
void
-libvlc_media_descriptor_set_user_data( libvlc_media_descriptor_t * p_md,
+libvlc_media_set_user_data( libvlc_media_t * p_md,
void * p_new_user_data,
libvlc_exception_t * p_e )
{
/**************************************************************************
* Get media descriptor's user_data. user_data is specialized data
* accessed by the host application, VLC.framework uses it as a pointer to
- * an native object that references a libvlc_media_descriptor_t pointer
+ * an native object that references a libvlc_media_t pointer
**************************************************************************/
void *
-libvlc_media_descriptor_get_user_data( libvlc_media_descriptor_t * p_md,
+libvlc_media_get_user_data( libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
VLC_UNUSED(p_e);
{
input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item;
const char * psz_cat = p_event->u.services_discovery_item_added.psz_category;
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_discoverer_t * p_mdis = user_data;
libvlc_media_list_t * p_mlist = p_mdis->p_mlist;
- p_md = libvlc_media_descriptor_new_from_input_item(
+ p_md = libvlc_media_new_from_input_item(
p_mdis->p_libvlc_instance,
p_item, NULL );
if( p_mlist == kVLCDictionaryNotFound )
{
- libvlc_media_descriptor_t * p_catmd;
- p_catmd = libvlc_media_descriptor_new_as_node( p_mdis->p_libvlc_instance, psz_cat, NULL );
- p_mlist = libvlc_media_descriptor_subitems( p_catmd, NULL );
+ libvlc_media_t * p_catmd;
+ p_catmd = libvlc_media_new_as_node( p_mdis->p_libvlc_instance, psz_cat, NULL );
+ p_mlist = libvlc_media_subitems( p_catmd, NULL );
p_mlist->b_read_only = VLC_TRUE;
/* Insert the newly created mlist in our dictionary */
/* Insert the md into the root list */
libvlc_media_list_lock( p_mdis->p_mlist );
- _libvlc_media_list_add_media_descriptor( p_mdis->p_mlist, p_catmd, NULL );
+ _libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd, NULL );
libvlc_media_list_unlock( p_mdis->p_mlist );
/* We don't release the mlist cause the dictionary
* doesn't retain the object. But we release the md. */
- libvlc_media_descriptor_release( p_catmd );
+ libvlc_media_release( p_catmd );
}
}
libvlc_media_list_lock( p_mlist );
- _libvlc_media_list_add_media_descriptor( p_mlist, p_md, NULL );
+ _libvlc_media_list_add_media( p_mlist, p_md, NULL );
libvlc_media_list_unlock( p_mlist );
}
void * user_data )
{
input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item;
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
libvlc_media_discoverer_t * p_mdis = user_data;
int i, count = libvlc_media_list_count( p_mdis->p_mlist, NULL );
/*****************************************************************************
* tree.c: libvlc tags tree functions
- * Create a tree of the 'tags' of a media_list's media_descriptors.
+ * Create a tree of the 'tags' of a media_list's medias.
*****************************************************************************
* Copyright (C) 2007 the VideoLAN team
* $Id$
**************************************************************************/
static void
notify_item_addition( libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
int index,
EventPlaceInTime event_status )
{
**************************************************************************/
static void
notify_item_deletion( libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
int index,
EventPlaceInTime event_status )
{
**************************************************************************/
void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
int i;
vlc_mutex_lock( &p_mlist->object_lock );
libvlc_event_manager_release( p_mlist->p_event_manager );
if( p_mlist->p_md )
- libvlc_media_descriptor_release( p_mlist->p_md );
+ libvlc_media_release( p_mlist->p_md );
for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
{
p_md = vlc_array_item_at_index( &p_mlist->items, i );
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
}
vlc_mutex_destroy( &p_mlist->object_lock );
libvlc_exception_t * p_e )
{
input_item_t * p_input_item;
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
p_input_item = input_ItemNewExt( p_mlist->p_libvlc_instance->p_libvlc_int, psz_uri,
_("Media Library"), 0, NULL, -1 );
return;
}
- p_md = libvlc_media_descriptor_new_from_input_item(
+ p_md = libvlc_media_new_from_input_item(
p_mlist->p_libvlc_instance,
p_input_item, p_e );
return;
}
- libvlc_media_list_add_media_descriptor( p_mlist, p_md, p_e );
+ libvlc_media_list_add_media( p_mlist, p_md, p_e );
if( libvlc_exception_raised( p_e ) )
return;
}
/**************************************************************************
- * set_media_descriptor (Public)
+ * set_media (Public)
**************************************************************************/
-void libvlc_media_list_set_media_descriptor( libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+void libvlc_media_list_set_media( libvlc_media_list_t * p_mlist,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e)
{
(void)p_e;
vlc_mutex_lock( &p_mlist->object_lock );
if( p_mlist->p_md )
- libvlc_media_descriptor_release( p_mlist->p_md );
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_release( p_mlist->p_md );
+ libvlc_media_retain( p_md );
p_mlist->p_md = p_md;
vlc_mutex_unlock( &p_mlist->object_lock );
}
/**************************************************************************
- * media_descriptor (Public)
+ * media (Public)
*
- * If this media_list comes is a media_descriptor's subitems,
- * This holds the corresponding media_descriptor.
+ * If this media_list comes is a media's subitems,
+ * This holds the corresponding media.
* This md is also seen as the information holder for the media_list.
* Indeed a media_list can have meta information through this
- * media_descriptor.
+ * media.
**************************************************************************/
-libvlc_media_descriptor_t *
-libvlc_media_list_media_descriptor( libvlc_media_list_t * p_mlist,
+libvlc_media_t *
+libvlc_media_list_media( libvlc_media_list_t * p_mlist,
libvlc_exception_t * p_e)
{
- libvlc_media_descriptor_t *p_md;
+ libvlc_media_t *p_md;
(void)p_e;
vlc_mutex_lock( &p_mlist->object_lock );
p_md = p_mlist->p_md;
if( p_md )
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_retain( p_md );
vlc_mutex_unlock( &p_mlist->object_lock );
return p_md;
}
/**************************************************************************
- * libvlc_media_list_add_media_descriptor (Public)
+ * libvlc_media_list_add_media (Public)
*
* Lock should be hold when entering.
**************************************************************************/
-void libvlc_media_list_add_media_descriptor(
+void libvlc_media_list_add_media(
libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
if( p_mlist->b_read_only )
return;
}
- _libvlc_media_list_add_media_descriptor( p_mlist, p_md, p_e );
+ _libvlc_media_list_add_media( p_mlist, p_md, p_e );
}
/* LibVLC internal version */
-void _libvlc_media_list_add_media_descriptor(
+void _libvlc_media_list_add_media(
libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
(void)p_e;
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_retain( p_md );
notify_item_addition( p_mlist, p_md, vlc_array_count( &p_mlist->items ), EventWillHappen );
vlc_array_append( &p_mlist->items, p_md );
}
/**************************************************************************
- * libvlc_media_list_insert_media_descriptor (Public)
+ * libvlc_media_list_insert_media (Public)
*
* Lock should be hold when entering.
**************************************************************************/
-void libvlc_media_list_insert_media_descriptor(
+void libvlc_media_list_insert_media(
libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
int index,
libvlc_exception_t * p_e )
{
libvlc_exception_raise( p_e, "Trying to write into a read-only media list." );
return;
}
- _libvlc_media_list_insert_media_descriptor( p_mlist, p_md, index, p_e );
+ _libvlc_media_list_insert_media( p_mlist, p_md, index, p_e );
}
/* LibVLC internal version */
-void _libvlc_media_list_insert_media_descriptor(
+void _libvlc_media_list_insert_media(
libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
int index,
libvlc_exception_t * p_e )
{
(void)p_e;
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_retain( p_md );
notify_item_addition( p_mlist, p_md, index, EventWillHappen );
vlc_array_insert( &p_mlist->items, p_md, index );
libvlc_exception_t * p_e )
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
if( index < 0 || index >= vlc_array_count( &p_mlist->items ))
{
vlc_array_remove( &p_mlist->items, index );
notify_item_deletion( p_mlist, p_md, index, EventDidHappen );
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
}
/**************************************************************************
*
* Lock should be hold when entering.
**************************************************************************/
-libvlc_media_descriptor_t *
+libvlc_media_t *
libvlc_media_list_item_at_index( libvlc_media_list_t * p_mlist,
int index,
libvlc_exception_t * p_e )
return NULL;
}
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
p_md = vlc_array_item_at_index( &p_mlist->items, index );
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_retain( p_md );
return p_md;
}
* Warning: this function would return the first matching item
**************************************************************************/
int libvlc_media_list_index_of_item( libvlc_media_list_t * p_mlist,
- libvlc_media_descriptor_t * p_searched_md,
+ libvlc_media_t * p_searched_md,
libvlc_exception_t * p_e )
{
VLC_UNUSED(p_e);
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
int i;
for ( i = 0; i < vlc_array_count( &p_mlist->items ); i++ )
{
* get_path_rec (Media List Player Internal)
**************************************************************************/
static libvlc_media_list_path_t
-get_path_rec( libvlc_media_list_path_t path, libvlc_media_list_t * p_current_mlist, libvlc_media_descriptor_t * p_searched_md )
+get_path_rec( libvlc_media_list_path_t path, libvlc_media_list_t * p_current_mlist, libvlc_media_t * p_searched_md )
{
int i, count;
count = libvlc_media_list_count( p_current_mlist, NULL );
for( i = 0; i < count; i++ )
{
- libvlc_media_descriptor_t * p_md = libvlc_media_list_item_at_index( p_current_mlist, i, NULL );
+ libvlc_media_t * p_md = libvlc_media_list_item_at_index( p_current_mlist, i, NULL );
if( p_md == p_searched_md )
return libvlc_media_list_path_copy_by_appending( path, i ); /* Found! */
- libvlc_media_list_t * p_subitems = libvlc_media_descriptor_subitems( p_md, NULL );
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_list_t * p_subitems = libvlc_media_subitems( p_md, NULL );
+ libvlc_media_release( p_md );
if( p_subitems )
{
libvlc_media_list_path_t new_path = libvlc_media_list_path_copy_by_appending( path, i );
/**************************************************************************
* path_of_item (Media List Player Internal)
**************************************************************************/
-static inline libvlc_media_list_path_t libvlc_media_list_path_of_item( libvlc_media_list_t * p_mlist, libvlc_media_descriptor_t * p_md )
+static inline libvlc_media_list_path_t libvlc_media_list_path_of_item( libvlc_media_list_t * p_mlist, libvlc_media_t * p_md )
{
libvlc_media_list_path_t path = libvlc_media_list_path_empty();
libvlc_media_list_path_t ret;
/**************************************************************************
* item_at_path (Media List Player Internal)
**************************************************************************/
-static libvlc_media_descriptor_t *
+static libvlc_media_t *
libvlc_media_list_item_at_path( libvlc_media_list_t * p_mlist, libvlc_media_list_path_t path )
{
libvlc_media_list_t * p_current_mlist = p_mlist;
- libvlc_media_descriptor_t * p_md = NULL;
+ libvlc_media_t * p_md = NULL;
int i;
for( i = 0; path[i] != -1; i++ )
{
if( path[i+1] == -1 )
return p_md;
- p_current_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
- libvlc_media_descriptor_release( p_md );
+ p_current_mlist = libvlc_media_subitems( p_md, NULL );
+ libvlc_media_release( p_md );
if( !p_current_mlist )
return NULL;
libvlc_media_list_parentlist_at_path( libvlc_media_list_t * p_mlist, libvlc_media_list_path_t path )
{
libvlc_media_list_t * p_current_mlist = p_mlist;
- libvlc_media_descriptor_t * p_md = NULL;
+ libvlc_media_t * p_md = NULL;
int i;
for( i = 0; path[i] != -1; i++ )
{
p_md = libvlc_media_list_item_at_index( p_current_mlist, path[i], NULL );
- p_current_mlist = libvlc_media_descriptor_subitems( p_md, NULL );
- libvlc_media_descriptor_release( p_md );
+ p_current_mlist = libvlc_media_subitems( p_md, NULL );
+ libvlc_media_release( p_md );
if( !p_current_mlist )
return NULL;
libvlc_media_list_sublist_at_path( libvlc_media_list_t * p_mlist, libvlc_media_list_path_t path )
{
libvlc_media_list_t * ret;
- libvlc_media_descriptor_t * p_md = libvlc_media_list_item_at_path( p_mlist, path );
+ libvlc_media_t * p_md = libvlc_media_list_item_at_path( p_mlist, path );
if( !p_md )
return NULL;
- ret = libvlc_media_descriptor_subitems( p_md, NULL );
- libvlc_media_descriptor_release( p_md );
+ ret = libvlc_media_subitems( p_md, NULL );
+ libvlc_media_release( p_md );
return ret;
}
}
/**************************************************************************
- * media_instance_reached_end (private) (Event Callback)
+ * media_player_reached_end (private) (Event Callback)
**************************************************************************/
static void
-media_instance_reached_end( const libvlc_event_t * p_event,
+media_player_reached_end( const libvlc_event_t * p_event,
void * p_user_data )
{
libvlc_media_list_player_t * p_mlp = p_user_data;
- libvlc_media_instance_t * p_mi = p_event->p_obj;
- libvlc_media_descriptor_t *p_md, * p_current_md;
+ libvlc_media_player_t * p_mi = p_event->p_obj;
+ libvlc_media_t *p_md, * p_current_md;
- p_md = libvlc_media_instance_get_media_descriptor( p_mi, NULL );
+ p_md = libvlc_media_player_get_media( p_mi, NULL );
/* XXX: need if p_mlp->p_current_playing_index is beyond */
p_current_md = libvlc_media_list_item_at_path(
p_mlp->p_mlist,
{
msg_Warn( p_mlp->p_libvlc_instance->p_libvlc_int,
"We are not sync-ed with the media instance" );
- libvlc_media_descriptor_release( p_md );
- libvlc_media_descriptor_release( p_current_md );
+ libvlc_media_release( p_md );
+ libvlc_media_release( p_current_md );
return;
}
- libvlc_media_descriptor_release( p_md );
- libvlc_media_descriptor_release( p_current_md );
+ libvlc_media_release( p_md );
+ libvlc_media_release( p_current_md );
libvlc_media_list_player_next( p_mlp, NULL );
}
static void
mlist_item_deleted( const libvlc_event_t * p_event, void * p_user_data )
{
- libvlc_media_descriptor_t * p_current_md;
+ libvlc_media_t * p_current_md;
libvlc_media_list_player_t * p_mlp = p_user_data;
libvlc_media_list_t * p_emitting_mlist = p_event->p_obj;
/* XXX: need if p_mlp->p_current_playing_index is beyond */
}
/**************************************************************************
- * install_media_instance_observer (private)
+ * install_media_player_observer (private)
**************************************************************************/
static void
-install_media_instance_observer( libvlc_media_list_player_t * p_mlp )
+install_media_player_observer( libvlc_media_list_player_t * p_mlp )
{
- libvlc_event_attach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
+ libvlc_event_attach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ),
libvlc_MediaInstanceReachedEnd,
- media_instance_reached_end, p_mlp, NULL );
+ media_player_reached_end, p_mlp, NULL );
}
/**************************************************************************
- * uninstall_media_instance_observer (private)
+ * uninstall_media_player_observer (private)
**************************************************************************/
static void
-uninstall_media_instance_observer( libvlc_media_list_player_t * p_mlp )
+uninstall_media_player_observer( libvlc_media_list_player_t * p_mlp )
{
if ( !p_mlp->p_mi )
{
return;
}
- libvlc_event_detach( libvlc_media_instance_event_manager( p_mlp->p_mi, NULL ),
+ libvlc_event_detach( libvlc_media_player_event_manager( p_mlp->p_mi, NULL ),
libvlc_MediaInstanceReachedEnd,
- media_instance_reached_end, p_mlp, NULL );
+ media_player_reached_end, p_mlp, NULL );
}
/**************************************************************************
{
VLC_UNUSED(p_e);
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
p_md = libvlc_media_list_item_at_path( p_mlp->p_mlist, path );
vlc_mutex_lock( &p_mlp->object_lock );
return;
}
- /* We are not interested in getting media_descriptor stop event now */
- uninstall_media_instance_observer( p_mlp );
+ /* We are not interested in getting media stop event now */
+ uninstall_media_player_observer( p_mlp );
if ( !p_mlp->p_mi )
{
- p_mlp->p_mi = libvlc_media_instance_new_from_media_descriptor(p_md, p_e);
+ p_mlp->p_mi = libvlc_media_player_new_from_media(p_md, p_e);
}
if( p_md->p_subitems && libvlc_media_list_count( p_md->p_subitems, NULL ) > 0 )
{
- libvlc_media_descriptor_t * p_submd;
+ libvlc_media_t * p_submd;
p_submd = libvlc_media_list_item_at_index( p_md->p_subitems, 0, NULL );
- libvlc_media_instance_set_media_descriptor( p_mlp->p_mi, p_submd, NULL );
- libvlc_media_descriptor_release( p_submd );
+ libvlc_media_player_set_media( p_mlp->p_mi, p_submd, NULL );
+ libvlc_media_release( p_submd );
}
else
- libvlc_media_instance_set_media_descriptor( p_mlp->p_mi, p_md, NULL );
+ libvlc_media_player_set_media( p_mlp->p_mi, p_md, NULL );
// wait_playing_state(); /* If we want to be synchronous */
- install_media_instance_observer( p_mlp );
+ install_media_player_observer( p_mlp );
vlc_mutex_unlock( &p_mlp->object_lock );
- libvlc_media_descriptor_release( p_md ); /* for libvlc_media_list_item_at_index */
+ libvlc_media_release( p_md ); /* for libvlc_media_list_item_at_index */
}
/*
}
/**************************************************************************
- * set_media_instance (Public)
+ * set_media_player (Public)
**************************************************************************/
-void libvlc_media_list_player_set_media_instance(
+void libvlc_media_list_player_set_media_player(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_instance_t * p_mi,
+ libvlc_media_player_t * p_mi,
libvlc_exception_t * p_e )
{
VLC_UNUSED(p_e);
if( p_mlp->p_mi )
{
- uninstall_media_instance_observer( p_mlp );
- libvlc_media_instance_release( p_mlp->p_mi );
+ uninstall_media_player_observer( p_mlp );
+ libvlc_media_player_release( p_mlp->p_mi );
}
- libvlc_media_instance_retain( p_mi );
+ libvlc_media_player_retain( p_mi );
p_mlp->p_mi = p_mi;
- install_media_instance_observer( p_mlp );
+ install_media_player_observer( p_mlp );
vlc_mutex_unlock( &p_mlp->object_lock );
}
if( libvlc_media_list_player_is_playing( p_mlp, p_e ) )
{
- libvlc_media_instance_stop( p_mlp->p_mi, p_e );
+ libvlc_media_player_stop( p_mlp->p_mi, p_e );
/* Don't bother if there was an error. */
libvlc_exception_clear( p_e );
}
return; /* Will set to play */
}
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+ libvlc_media_player_play( p_mlp->p_mi, p_e );
}
{
if( !p_mlp->p_mi )
return;
- libvlc_media_instance_pause( p_mlp->p_mi, p_e );
+ libvlc_media_player_pause( p_mlp->p_mi, p_e );
}
/**************************************************************************
libvlc_media_list_player_is_playing( libvlc_media_list_player_t * p_mlp,
libvlc_exception_t * p_e )
{
- libvlc_state_t state = libvlc_media_instance_get_state( p_mlp->p_mi, p_e );
+ libvlc_state_t state = libvlc_media_player_get_state( p_mlp->p_mi, p_e );
return (state == libvlc_Opening) || (state == libvlc_Buffering) ||
(state == libvlc_Playing);
}
{
if( !p_mlp->p_mi )
return libvlc_Stopped;
- return libvlc_media_instance_get_state( p_mlp->p_mi, p_e );
+ return libvlc_media_player_get_state( p_mlp->p_mi, p_e );
}
/**************************************************************************
event.type = libvlc_MediaListPlayerNextItemSet;
libvlc_event_send( p_mlp->p_event_manager, &event );
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+ libvlc_media_player_play( p_mlp->p_mi, p_e );
}
/**************************************************************************
**************************************************************************/
void libvlc_media_list_player_play_item(
libvlc_media_list_player_t * p_mlp,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e )
{
libvlc_media_list_path_t path = libvlc_media_list_path_of_item( p_mlp->p_mlist, p_md );
if( libvlc_exception_raised( p_e ) )
return;
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+ libvlc_media_player_play( p_mlp->p_mi, p_e );
}
/**************************************************************************
{
if ( p_mlp->p_mi )
{
- libvlc_media_instance_stop( p_mlp->p_mi, p_e );
+ libvlc_media_player_stop( p_mlp->p_mi, p_e );
}
vlc_mutex_lock( &p_mlp->object_lock );
set_current_playing_item( p_mlp, path, p_e );
- libvlc_media_instance_play( p_mlp->p_mi, p_e );
+ libvlc_media_player_play( p_mlp->p_mi, p_e );
libvlc_media_list_unlock( p_mlp->p_mlist );
static void
install_md_listener( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_md)
+ libvlc_media_t * p_md)
{
libvlc_media_list_t * p_mlist;
- if((p_mlist = libvlc_media_descriptor_subitems( p_md, NULL )))
+ if((p_mlist = libvlc_media_subitems( p_md, NULL )))
{
libvlc_media_list_lock( p_mlist );
int i, count = libvlc_media_list_count( p_mlist, NULL );
for( i = 0; i < count; i++)
{
libvlc_event_t added_event;
- libvlc_media_descriptor_t * p_submd;
+ libvlc_media_t * p_submd;
p_submd = libvlc_media_list_item_at_index( p_mlist, i, NULL );
/* Install our listeners */
added_event.u.media_list_item_added.item = p_submd;
added_event.u.media_list_item_added.index = 0;
if( p_mlv->pf_ml_item_added ) p_mlv->pf_ml_item_added( &added_event, p_mlv );
- libvlc_media_descriptor_release( p_submd );
+ libvlc_media_release( p_submd );
}
libvlc_event_attach( p_mlist->p_event_manager,
libvlc_MediaListItemAdded,
static void
uninstall_md_listener( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_md)
+ libvlc_media_t * p_md)
{
libvlc_media_list_t * p_mlist;
libvlc_exception_t ignored_exception;
media_list_subitem_added, p_mlv, &ignored_exception );
if( libvlc_exception_raised( &ignored_exception ) )
libvlc_exception_clear( &ignored_exception ); /* We don't care if we encounter an exception */
- if((p_mlist = libvlc_media_descriptor_subitems( p_md, NULL )))
+ if((p_mlist = libvlc_media_subitems( p_md, NULL )))
{
libvlc_media_list_lock( p_mlist );
libvlc_event_detach( p_mlist->p_event_manager,
int i, count = libvlc_media_list_count( p_mlist, NULL );
for( i = 0; i < count; i++)
{
- libvlc_media_descriptor_t * p_submd;
+ libvlc_media_t * p_submd;
p_submd = libvlc_media_list_item_at_index( p_mlist,i, NULL );
uninstall_md_listener( p_mlv, p_submd );
- libvlc_media_descriptor_release( p_submd );
+ libvlc_media_release( p_submd );
}
libvlc_media_list_unlock( p_mlist );
libvlc_media_list_release( p_mlist );
media_list_item_added( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_media_list_view_t * p_mlv = p_user_data;
- libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
+ libvlc_media_t * p_md = p_event->u.media_list_item_added.item;
install_md_listener( p_mlv, p_md );
if( p_mlv->pf_ml_item_added ) p_mlv->pf_ml_item_added( p_event, p_mlv );
}
media_list_item_removed( const libvlc_event_t * p_event, void * p_user_data )
{
libvlc_media_list_view_t * p_mlv = p_user_data;
- libvlc_media_descriptor_t * p_md = p_event->u.media_list_item_added.item;
+ libvlc_media_t * p_md = p_event->u.media_list_item_added.item;
uninstall_md_listener( p_mlv, p_md );
if( p_mlv->pf_ml_item_removed ) p_mlv->pf_ml_item_removed( p_event, p_mlv );
}
libvlc_media_list_t * p_mlist;
libvlc_event_t added_event;
libvlc_media_list_view_t * p_mlv = p_user_data;
- libvlc_media_descriptor_t * p_submd = p_event->u.media_descriptor_subitem_added.new_child;
- libvlc_media_descriptor_t * p_md = p_event->p_obj;
+ libvlc_media_t * p_submd = p_event->u.media_subitem_added.new_child;
+ libvlc_media_t * p_md = p_event->p_obj;
- if((p_mlist = libvlc_media_descriptor_subitems( p_md, NULL )))
+ if((p_mlist = libvlc_media_subitems( p_md, NULL )))
{
/* We have a mlist to which we're going to listen to events
* thus, no need to wait for SubItemAdded events */
int i, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
for( i = 0; i < count; i++)
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, NULL );
install_md_listener( p_mlv, p_md );
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
}
}
void
libvlc_media_list_view_will_delete_item(
libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index )
{
libvlc_event_t event;
void
libvlc_media_list_view_item_deleted(
libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index )
{
libvlc_event_t event;
void
libvlc_media_list_view_will_add_item(
libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index )
{
libvlc_event_t event;
void
libvlc_media_list_view_item_added(
libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_item,
+ libvlc_media_t * p_item,
int index )
{
libvlc_event_t event;
int i, count = libvlc_media_list_count( p_mlv->p_mlist, NULL );
for( i = 0; i < count; i++)
{
- libvlc_media_descriptor_t * p_md;
+ libvlc_media_t * p_md;
p_md = libvlc_media_list_item_at_index( p_mlv->p_mlist, i, NULL );
uninstall_md_listener( p_mlv, p_md );
- libvlc_media_descriptor_release( p_md );
+ libvlc_media_release( p_md );
}
libvlc_media_list_unlock( p_mlv->p_mlist );
**************************************************************************/
libvlc_media_list_view_t *
libvlc_media_list_view_children_for_item( libvlc_media_list_view_t * p_mlv,
- libvlc_media_descriptor_t * p_md,
+ libvlc_media_t * p_md,
libvlc_exception_t * p_e)
{
(void)p_e;
libvlc_media_list_t * p_mlist;
libvlc_media_list_view_t * ret;
- p_mlist = libvlc_media_descriptor_subitems(p_md, p_e);
+ p_mlist = libvlc_media_subitems(p_md, p_e);
if(!p_mlist) return NULL;
ret = p_mlv->pf_constructor( p_mlist, p_e );
MEDIA_LIST_VIEW_FUNCTION( count, int, 0 )
-MEDIA_LIST_VIEW_FUNCTION( item_at_index, libvlc_media_descriptor_t *, NULL, int arg1 )
+MEDIA_LIST_VIEW_FUNCTION( item_at_index, libvlc_media_t *, NULL, int arg1 )
MEDIA_LIST_VIEW_FUNCTION( children_at_index, libvlc_media_list_view_t *, NULL, int arg1 )
/*****************************************************************************
- * media_instance.c: Libvlc API Media Instance management functions
+ * media_player.c: Libvlc API Media Instance management functions
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* $Id$
*
* Object lock is NOT held.
*/
-static void release_input_thread( libvlc_media_instance_t *p_mi )
+static void release_input_thread( libvlc_media_player_t *p_mi )
{
input_thread_t * p_input_thread;
*
* Object lock is held.
*/
-input_thread_t *libvlc_get_input_thread( libvlc_media_instance_t *p_mi,
+input_thread_t *libvlc_get_input_thread( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
VLC_UNUSED(oldval);
VLC_UNUSED(p_this);
VLC_UNUSED(psz_cmd);
- libvlc_media_instance_t * p_mi = p_userdata;
+ libvlc_media_player_t * p_mi = p_userdata;
libvlc_event_t event;
libvlc_event_type_t type = newval.i_int;
switch ( type )
{
case END_S:
- libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
+ libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
event.type = libvlc_MediaInstanceReachedEnd;
break;
case PAUSE_S:
- libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_Playing, NULL);
+ libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL);
event.type = libvlc_MediaInstancePaused;
break;
case PLAYING_S:
- libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_Playing, NULL);
+ libvlc_media_set_state( p_mi->p_md, libvlc_Playing, NULL);
event.type = libvlc_MediaInstancePlayed;
break;
case ERROR_S:
- libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_Error, NULL);
+ libvlc_media_set_state( p_mi->p_md, libvlc_Error, NULL);
event.type = libvlc_MediaInstanceEncounteredError;
break;
default:
VLC_UNUSED(oldval);
VLC_UNUSED(p_this);
VLC_UNUSED(psz_cmd);
- libvlc_media_instance_t * p_mi = p_userdata;
+ libvlc_media_player_t * p_mi = p_userdata;
libvlc_event_t event;
- libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
+ libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
event.type = libvlc_MediaInstanceSeekableChanged;
- event.u.media_instance_seekable_changed.new_seekable = newval.b_bool;
+ event.u.media_player_seekable_changed.new_seekable = newval.b_bool;
libvlc_event_send( p_mi->p_event_manager, &event );
return VLC_SUCCESS;
VLC_UNUSED(oldval);
VLC_UNUSED(p_this);
VLC_UNUSED(psz_cmd);
- libvlc_media_instance_t * p_mi = p_userdata;
+ libvlc_media_player_t * p_mi = p_userdata;
libvlc_event_t event;
- libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
+ libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
event.type = libvlc_MediaInstancePausableChanged;
- event.u.media_instance_pausable_changed.new_pausable = newval.b_bool;
+ event.u.media_player_pausable_changed.new_pausable = newval.b_bool;
libvlc_event_send( p_mi->p_event_manager, &event );
return VLC_SUCCESS;
void * p_userdata )
{
VLC_UNUSED(oldval);
- libvlc_media_instance_t * p_mi = p_userdata;
+ libvlc_media_player_t * p_mi = p_userdata;
vlc_value_t val;
if (!strncmp(psz_cmd, "intf", 4 /* "-change" no need to go further */))
libvlc_event_t event;
event.type = libvlc_MediaInstancePositionChanged;
- event.u.media_instance_position_changed.new_position = val.f_float;
+ event.u.media_player_position_changed.new_position = val.f_float;
libvlc_event_send( p_mi->p_event_manager, &event );
return VLC_SUCCESS;
void * p_userdata )
{
VLC_UNUSED(oldval);
- libvlc_media_instance_t * p_mi = p_userdata;
+ libvlc_media_player_t * p_mi = p_userdata;
vlc_value_t val;
if (!strncmp(psz_cmd, "intf", 4 /* "-change" no need to go further */))
libvlc_event_t event;
event.type = libvlc_MediaInstanceTimeChanged;
- event.u.media_instance_time_changed.new_time = val.i_time;
+ event.u.media_player_time_changed.new_time = val.i_time;
libvlc_event_send( p_mi->p_event_manager, &event );
return VLC_SUCCESS;
}
/**************************************************************************
* Create a Media Instance object
**************************************************************************/
-libvlc_media_instance_t *
-libvlc_media_instance_new( libvlc_instance_t * p_libvlc_instance,
+libvlc_media_player_t *
+libvlc_media_player_new( libvlc_instance_t * p_libvlc_instance,
libvlc_exception_t * p_e )
{
- libvlc_media_instance_t * p_mi;
+ libvlc_media_player_t * p_mi;
if( !p_libvlc_instance )
{
return NULL;
}
- p_mi = malloc( sizeof(libvlc_media_instance_t) );
+ p_mi = malloc( sizeof(libvlc_media_player_t) );
p_mi->p_md = NULL;
p_mi->drawable = 0;
p_mi->p_libvlc_instance = p_libvlc_instance;
/**************************************************************************
* Create a Media Instance object with a media descriptor
**************************************************************************/
-libvlc_media_instance_t *
-libvlc_media_instance_new_from_media_descriptor(
- libvlc_media_descriptor_t * p_md,
+libvlc_media_player_t *
+libvlc_media_player_new_from_media(
+ libvlc_media_t * p_md,
libvlc_exception_t *p_e )
{
- libvlc_media_instance_t * p_mi;
- p_mi = libvlc_media_instance_new( p_md->p_libvlc_instance, p_e );
+ libvlc_media_player_t * p_mi;
+ p_mi = libvlc_media_player_new( p_md->p_libvlc_instance, p_e );
if( !p_mi )
return NULL;
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_retain( p_md );
p_mi->p_md = p_md;
return p_mi;
/**************************************************************************
* Create a new media instance object from an input_thread (Libvlc Internal)
**************************************************************************/
-libvlc_media_instance_t * libvlc_media_instance_new_from_input_thread(
+libvlc_media_player_t * libvlc_media_player_new_from_input_thread(
struct libvlc_instance_t *p_libvlc_instance,
input_thread_t *p_input,
libvlc_exception_t *p_e )
{
- libvlc_media_instance_t * p_mi;
+ libvlc_media_player_t * p_mi;
if( !p_input )
{
return NULL;
}
- p_mi = libvlc_media_instance_new( p_libvlc_instance, p_e );
+ p_mi = libvlc_media_player_new( p_libvlc_instance, p_e );
if( !p_mi )
return NULL;
- p_mi->p_md = libvlc_media_descriptor_new_from_input_item(
+ p_mi->p_md = libvlc_media_new_from_input_item(
p_libvlc_instance,
input_GetItem( p_input ), p_e );
if( !p_mi->p_md )
{
- libvlc_media_instance_destroy( p_mi );
+ libvlc_media_player_destroy( p_mi );
return NULL;
}
- /* will be released in media_instance_release() */
+ /* will be released in media_player_release() */
vlc_object_yield( p_input );
p_mi->p_input_thread = p_input;
*
* Warning: No lock held here, but hey, this is internal.
**************************************************************************/
-void libvlc_media_instance_destroy( libvlc_media_instance_t *p_mi )
+void libvlc_media_player_destroy( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
libvlc_exception_t p_e;
vlc_object_release( p_input_thread );
- libvlc_media_descriptor_release( p_mi->p_md );
+ libvlc_media_release( p_mi->p_md );
free( p_mi );
}
/**************************************************************************
* Release a Media Instance object
**************************************************************************/
-void libvlc_media_instance_release( libvlc_media_instance_t *p_mi )
+void libvlc_media_player_release( libvlc_media_player_t *p_mi )
{
if( !p_mi )
return;
libvlc_event_manager_release( p_mi->p_event_manager );
- libvlc_media_descriptor_release( p_mi->p_md );
+ libvlc_media_release( p_mi->p_md );
free( p_mi );
}
/**************************************************************************
* Retain a Media Instance object
**************************************************************************/
-void libvlc_media_instance_retain( libvlc_media_instance_t *p_mi )
+void libvlc_media_player_retain( libvlc_media_player_t *p_mi )
{
if( !p_mi )
return;
/**************************************************************************
* Set the Media descriptor associated with the instance
**************************************************************************/
-void libvlc_media_instance_set_media_descriptor(
- libvlc_media_instance_t *p_mi,
- libvlc_media_descriptor_t *p_md,
+void libvlc_media_player_set_media(
+ libvlc_media_player_t *p_mi,
+ libvlc_media_t *p_md,
libvlc_exception_t *p_e )
{
(void)p_e;
release_input_thread( p_mi );
if( p_mi->p_md )
- libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL );
+ libvlc_media_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL );
- libvlc_media_descriptor_release( p_mi->p_md );
+ libvlc_media_release( p_mi->p_md );
if( !p_md )
{
return; /* It is ok to pass a NULL md */
}
- libvlc_media_descriptor_retain( p_md );
+ libvlc_media_retain( p_md );
p_mi->p_md = p_md;
/* The policy here is to ignore that we were created using a different
/**************************************************************************
* Get the Media descriptor associated with the instance
**************************************************************************/
-libvlc_media_descriptor_t *
-libvlc_media_instance_get_media_descriptor(
- libvlc_media_instance_t *p_mi,
+libvlc_media_t *
+libvlc_media_player_get_media(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
(void)p_e;
if( !p_mi->p_md )
return NULL;
- libvlc_media_descriptor_retain( p_mi->p_md );
+ libvlc_media_retain( p_mi->p_md );
return p_mi->p_md;
}
* Get the event Manager
**************************************************************************/
libvlc_event_manager_t *
-libvlc_media_instance_event_manager(
- libvlc_media_instance_t *p_mi,
+libvlc_media_player_event_manager(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
(void)p_e;
/**************************************************************************
* Play
**************************************************************************/
-void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
+void libvlc_media_player_play( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t * p_input_thread;
/**************************************************************************
* Pause
**************************************************************************/
-void libvlc_media_instance_pause( libvlc_media_instance_t *p_mi,
+void libvlc_media_player_pause( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e );
if( state == PLAYING_S )
{
- if( libvlc_media_instance_can_pause( p_mi, p_e ) )
+ if( libvlc_media_player_can_pause( p_mi, p_e ) )
input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S );
else
- libvlc_media_instance_stop( p_mi, p_e );
+ libvlc_media_player_stop( p_mi, p_e );
}
else
input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
/**************************************************************************
* Stop
**************************************************************************/
-void libvlc_media_instance_stop( libvlc_media_instance_t *p_mi,
+void libvlc_media_player_stop( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
if( p_mi->b_own_its_input_thread )
/**************************************************************************
* Set Drawable
**************************************************************************/
-void libvlc_media_instance_set_drawable( libvlc_media_instance_t *p_mi,
+void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi,
libvlc_drawable_t drawable,
libvlc_exception_t *p_e )
{
* Get Drawable
**************************************************************************/
libvlc_drawable_t
-libvlc_media_instance_get_drawable ( libvlc_media_instance_t *p_mi, libvlc_exception_t *p_e )
+libvlc_media_player_get_drawable ( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e )
{
(void)p_e;
return p_mi->drawable;
/**************************************************************************
* Getters for stream information
**************************************************************************/
-libvlc_time_t libvlc_media_instance_get_length(
- libvlc_media_instance_t *p_mi,
+libvlc_time_t libvlc_media_player_get_length(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return (val.i_time+500LL)/1000LL;
}
-libvlc_time_t libvlc_media_instance_get_time(
- libvlc_media_instance_t *p_mi,
+libvlc_time_t libvlc_media_player_get_time(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return (val.i_time+500LL)/1000LL;
}
-void libvlc_media_instance_set_time(
- libvlc_media_instance_t *p_mi,
+void libvlc_media_player_set_time(
+ libvlc_media_player_t *p_mi,
libvlc_time_t time,
libvlc_exception_t *p_e )
{
vlc_object_release( p_input_thread );
}
-void libvlc_media_instance_set_position(
- libvlc_media_instance_t *p_mi,
+void libvlc_media_player_set_position(
+ libvlc_media_player_t *p_mi,
float position,
libvlc_exception_t *p_e )
{
vlc_object_release( p_input_thread );
}
-float libvlc_media_instance_get_position(
- libvlc_media_instance_t *p_mi,
+float libvlc_media_player_get_position(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return val.f_float;
}
-void libvlc_media_instance_set_chapter(
- libvlc_media_instance_t *p_mi,
+void libvlc_media_player_set_chapter(
+ libvlc_media_player_t *p_mi,
int chapter,
libvlc_exception_t *p_e )
{
vlc_object_release( p_input_thread );
}
-int libvlc_media_instance_get_chapter(
- libvlc_media_instance_t *p_mi,
+int libvlc_media_player_get_chapter(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return val.i_int;
}
-int libvlc_media_instance_get_chapter_count(
- libvlc_media_instance_t *p_mi,
+int libvlc_media_player_get_chapter_count(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return val.i_int;
}
-float libvlc_media_instance_get_fps(
- libvlc_media_instance_t *p_mi,
+float libvlc_media_player_get_fps(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e)
{
input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
return f_fps;
}
-int libvlc_media_instance_will_play( libvlc_media_instance_t *p_mi,
+int libvlc_media_player_will_play( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e)
{
input_thread_t *p_input_thread =
return VLC_FALSE;
}
-void libvlc_media_instance_set_rate(
- libvlc_media_instance_t *p_mi,
+void libvlc_media_player_set_rate(
+ libvlc_media_player_t *p_mi,
float rate,
libvlc_exception_t *p_e )
{
vlc_object_release( p_input_thread );
}
-float libvlc_media_instance_get_rate(
- libvlc_media_instance_t *p_mi,
+float libvlc_media_player_get_rate(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return (float)1000.0f/val.i_int;
}
-libvlc_state_t libvlc_media_instance_get_state(
- libvlc_media_instance_t *p_mi,
+libvlc_state_t libvlc_media_player_get_state(
+ libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return vlc_to_libvlc_state(val.i_int);
}
-int libvlc_media_instance_is_seekable( libvlc_media_instance_t *p_mi,
+int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
return val.b_bool;
}
-int libvlc_media_instance_can_pause( libvlc_media_instance_t *p_mi,
+int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread;
mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
- libvlc_media_instance_t* p_mi;
+ libvlc_media_player_t* p_mi;
int i_ret;
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex );
+ p_mi = libvlc_playlist_get_media_player( self->p_instance, &ex );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
- i_ret = libvlc_media_instance_get_rate( p_mi, &ex );
- libvlc_media_instance_release( p_mi );
+ i_ret = libvlc_media_player_get_rate( p_mi, &ex );
+ libvlc_media_player_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
return i_ret / 10;
mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
- libvlc_media_instance_t* p_mi;
+ libvlc_media_player_t* p_mi;
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex );
+ p_mi = libvlc_playlist_get_media_player( self->p_instance, &ex );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
- libvlc_media_instance_set_rate( p_mi, rate * 10, &ex );
- libvlc_media_instance_release( p_mi );
+ libvlc_media_player_set_rate( p_mi, rate * 10, &ex );
+ libvlc_media_player_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
- libvlc_media_instance_t* p_mi;
+ libvlc_media_player_t* p_mi;
int i_ret;
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex );
+ p_mi = libvlc_playlist_get_media_player( self->p_instance, &ex );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
i_ret = libvlc_get_fullscreen( p_mi, &ex );
- libvlc_media_instance_release( p_mi );
+ libvlc_media_player_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
return i_ret;
mediacontrol_Exception *exception )
{
libvlc_exception_t ex;
- libvlc_media_instance_t* p_mi;
+ libvlc_media_player_t* p_mi;
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex );
+ p_mi = libvlc_playlist_get_media_player( self->p_instance, &ex );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
libvlc_set_fullscreen( p_mi, b_fullscreen, &ex );
- libvlc_media_instance_release( p_mi );
+ libvlc_media_player_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
mediacontrol_Position* retval = NULL;
libvlc_exception_t ex;
vlc_int64_t pos;
- libvlc_media_instance_t * p_mi;
+ libvlc_media_player_t * p_mi;
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
retval->origin = an_origin;
retval->key = a_key;
- p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex);
+ p_mi = libvlc_playlist_get_media_player( self->p_instance, &ex);
HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
if( an_origin != mediacontrol_AbsolutePosition )
{
- libvlc_media_instance_release( p_mi );
+ libvlc_media_player_release( p_mi );
/* Relative or ModuloPosition make no sense */
RAISE_NULL( mediacontrol_PositionOriginNotSupported,
"Only absolute position is valid." );
}
/* We are asked for an AbsolutePosition. */
- pos = libvlc_media_instance_get_time( p_mi, &ex );
+ pos = libvlc_media_player_get_time( p_mi, &ex );
if( a_key == mediacontrol_MediaTime )
{
{
if( ! self->p_playlist->p_input )
{
- libvlc_media_instance_release( p_mi );
+ libvlc_media_player_release( p_mi );
RAISE_NULL( mediacontrol_InternalException,
"No input" );
}
a_key,
pos );
}
- libvlc_media_instance_release( p_mi );
+ libvlc_media_player_release( p_mi );
return retval;
}
const mediacontrol_Position * a_position,
mediacontrol_Exception *exception )
{
- libvlc_media_instance_t * p_mi;
+ libvlc_media_player_t * p_mi;
libvlc_exception_t ex;
vlc_int64_t i_pos;
libvlc_exception_init( &ex );
mediacontrol_exception_init( exception );
- p_mi = libvlc_playlist_get_media_instance( self->p_instance, &ex);
+ p_mi = libvlc_playlist_get_media_player( self->p_instance, &ex);
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
i_pos = private_mediacontrol_position2microsecond( self->p_playlist->p_input, a_position );
- libvlc_media_instance_set_time( p_mi, i_pos / 1000, &ex );
- libvlc_media_instance_release( p_mi );
+ libvlc_media_player_set_time( p_mi, i_pos / 1000, &ex );
+ libvlc_media_player_release( p_mi );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
vlc_mutex_unlock( &PL->object_lock );
}
-libvlc_media_instance_t * libvlc_playlist_get_media_instance(
+libvlc_media_player_t * libvlc_playlist_get_media_player(
libvlc_instance_t *p_instance,
libvlc_exception_t *p_e )
{
- libvlc_media_instance_t *p_mi;
+ libvlc_media_player_t *p_mi;
assert( PL );
vlc_mutex_lock( &PL->object_lock );
if( PL->p_input )
{
- p_mi = libvlc_media_instance_new_from_input_thread(
+ p_mi = libvlc_media_player_new_from_input_thread(
p_instance, PL->p_input, p_e );
}
else
static void test_media_list (const char ** argv, int argc)
{
libvlc_instance_t *vlc;
- libvlc_media_descriptor_t *md1, *md2, *md3, *md4;
+ libvlc_media_t *md1, *md2, *md3, *md4;
libvlc_media_list_t *ml;
log ("Testing media_list\n");
ml = libvlc_media_list_new (vlc, &ex);
catch ();
- md1 = libvlc_media_descriptor_new (vlc, "/dev/null", &ex);
+ md1 = libvlc_media_new (vlc, "/dev/null", &ex);
catch ();
- md2 = libvlc_media_descriptor_new (vlc, "/dev/null", &ex);
+ md2 = libvlc_media_new (vlc, "/dev/null", &ex);
catch ();
- md3 = libvlc_media_descriptor_new (vlc, "/dev/null", &ex);
+ md3 = libvlc_media_new (vlc, "/dev/null", &ex);
catch ();
- libvlc_media_list_add_media_descriptor (ml, md1, &ex);
+ libvlc_media_list_add_media (ml, md1, &ex);
catch ();
- libvlc_media_list_add_media_descriptor (ml, md2, &ex);
+ libvlc_media_list_add_media (ml, md2, &ex);
catch ();
assert( libvlc_media_list_count (ml, &ex) == 2 );
assert( libvlc_media_list_index_of_item (ml, md2, &ex) == 0 );
catch ();
- libvlc_media_list_add_media_descriptor (ml, md1, &ex); /* add 2 items */
+ libvlc_media_list_add_media (ml, md1, &ex); /* add 2 items */
catch ();
- libvlc_media_list_add_media_descriptor (ml, md1, &ex);
+ libvlc_media_list_add_media (ml, md1, &ex);
catch ();
/* there should be 3 pieces */
assert( libvlc_media_list_count (ml, &ex) == 3 );
catch ();
- libvlc_media_list_insert_media_descriptor (ml, md3, 2, &ex);
+ libvlc_media_list_insert_media (ml, md3, 2, &ex);
catch ();
/* there should be 4 pieces */
assert (have_exception ());
/* getting non valid items */
- libvlc_media_descriptor_t * p_non_exist =
+ libvlc_media_t * p_non_exist =
libvlc_media_list_item_at_index (ml, 4, &ex);
assert (have_exception ());
p_non_exist = libvlc_media_list_item_at_index (ml, -1, &ex);
assert (have_exception ());
- md4 = libvlc_media_descriptor_new (vlc, "/dev/dsp", &ex);
+ md4 = libvlc_media_new (vlc, "/dev/dsp", &ex);
catch ();
/* try to find non inserted item */
i_non_exist = libvlc_media_list_index_of_item (ml, md4, &ex);
assert ( i_non_exist == -1 );
- libvlc_media_descriptor_release (md1);
- libvlc_media_descriptor_release (md2);
- libvlc_media_descriptor_release (md3);
- libvlc_media_descriptor_release (md4);
+ libvlc_media_release (md1);
+ libvlc_media_release (md2);
+ libvlc_media_release (md3);
+ libvlc_media_release (md4);
libvlc_media_list_release (ml);
vlc_bool_t * callback_was_called = user_data;
libvlc_event_manager_t *em;
- em = libvlc_media_instance_event_manager (event->p_obj, &ex);
+ em = libvlc_media_player_event_manager (event->p_obj, &ex);
catch();
libvlc_event_detach (em, event->type, test_events_callback_and_detach, user_data, &ex);
static void test_events (const char ** argv, int argc)
{
libvlc_instance_t *vlc;
- libvlc_media_instance_t *mi;
+ libvlc_media_player_t *mi;
libvlc_event_manager_t *em;
vlc_bool_t callback_was_called;
libvlc_exception_t ex;
vlc = libvlc_new (argc, argv, &ex);
catch ();
- mi = libvlc_media_instance_new (vlc, &ex);
+ mi = libvlc_media_player_new (vlc, &ex);
catch ();
- em = libvlc_media_instance_event_manager (mi, &ex);
+ em = libvlc_media_player_event_manager (mi, &ex);
log ("+ Testing attaching to Media Instance\n");
catch ();
}
- libvlc_media_instance_release (mi);
+ libvlc_media_player_release (mi);
catch ();
libvlc_release (vlc);
static void test_media_player_play_stop(const char** argv, int argc)
{
libvlc_instance_t *vlc;
- libvlc_media_descriptor_t *md;
- libvlc_media_instance_t *mi;
+ libvlc_media_t *md;
+ libvlc_media_player_t *mi;
const char * file = "file://../bindings/java/core/src/test/resources/raffa_voice.ogg";
log ("Testing play and pause of %s\n", file);
vlc = libvlc_new (argc, argv, &ex);
catch ();
- md = libvlc_media_descriptor_new (vlc, file, &ex);
+ md = libvlc_media_new (vlc, file, &ex);
catch ();
- mi = libvlc_media_instance_new_from_media_descriptor (md, &ex);
+ mi = libvlc_media_player_new_from_media (md, &ex);
catch ();
- libvlc_media_descriptor_release (md);
+ libvlc_media_release (md);
- libvlc_media_instance_play (mi, &ex);
+ libvlc_media_player_play (mi, &ex);
catch ();
/* FIXME: Do something clever */
sleep(1);
- assert( libvlc_media_instance_get_state (mi, &ex) != libvlc_Error );
+ assert( libvlc_media_player_get_state (mi, &ex) != libvlc_Error );
catch ();
- libvlc_media_instance_stop (mi, &ex);
+ libvlc_media_player_stop (mi, &ex);
catch ();
- libvlc_media_instance_release (mi);
+ libvlc_media_player_release (mi);
catch ();
libvlc_release (vlc);
* Remember to release the returned vout_thread_t since it is locked at
* the end of this function.
*/
-static vout_thread_t *GetVout( libvlc_media_instance_t *p_mi,
+static vout_thread_t *GetVout( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_exception )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_exception );
* Exported functions
**********************************************************************/
-void libvlc_set_fullscreen( libvlc_media_instance_t *p_mi, int b_fullscreen,
+void libvlc_set_fullscreen( libvlc_media_player_t *p_mi, int b_fullscreen,
libvlc_exception_t *p_e )
{
/* We only work on the first vout */
vlc_object_release( p_vout1 );
}
-int libvlc_get_fullscreen( libvlc_media_instance_t *p_mi,
+int libvlc_get_fullscreen( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
/* We only work on the first vout */
return val.b_bool == VLC_TRUE ? 1 : 0;
}
-void libvlc_toggle_fullscreen( libvlc_media_instance_t *p_mi,
+void libvlc_toggle_fullscreen( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
/* We only work on the first vout */
}
void
-libvlc_video_take_snapshot( libvlc_media_instance_t *p_mi, char *psz_filepath,
+libvlc_video_take_snapshot( libvlc_media_player_t *p_mi, char *psz_filepath,
unsigned int i_width, unsigned int i_height, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
vlc_object_release( p_vout );
}
-int libvlc_video_get_height( libvlc_media_instance_t *p_mi,
+int libvlc_video_get_height( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
return p_vout1->i_window_height;
}
-int libvlc_video_get_width( libvlc_media_instance_t *p_mi,
+int libvlc_video_get_width( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout1 = GetVout( p_mi, p_e );
return p_vout1->i_window_width;
}
-int libvlc_media_instance_has_vout( libvlc_media_instance_t *p_mi,
+int libvlc_media_player_has_vout( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread(p_mi, p_e);
return has_vout;
}
-int libvlc_video_reparent( libvlc_media_instance_t *p_mi, libvlc_drawable_t d,
+int libvlc_video_reparent( libvlc_media_player_t *p_mi, libvlc_drawable_t d,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
return 0;
}
-void libvlc_video_resize( libvlc_media_instance_t *p_mi, int width, int height, libvlc_exception_t *p_e )
+void libvlc_video_resize( libvlc_media_player_t *p_mi, int width, int height, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
if( p_vout )
}
}
-void libvlc_video_redraw_rectangle( libvlc_media_instance_t *p_mi,
+void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi,
const libvlc_rectangle_t *area,
libvlc_exception_t *p_e )
{
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
- libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e);
+ libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
if( p_mi )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
vout_Control( p_vout , VOUT_REPARENT, d);
vlc_object_release( p_vout );
}
- libvlc_media_instance_release(p_mi);
+ libvlc_media_player_release(p_mi);
}
}
}
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
- libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e);
+ libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
if( p_mi )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
vout_Control( p_vout , VOUT_SET_SIZE, width, height);
vlc_object_release( p_vout );
}
- libvlc_media_instance_release(p_mi);
+ libvlc_media_player_release(p_mi);
}
}
}
if( libvlc_playlist_isplaying(p_instance, p_e) )
{
- libvlc_media_instance_t *p_mi = libvlc_playlist_get_media_instance(p_instance, p_e);
+ libvlc_media_player_t *p_mi = libvlc_playlist_get_media_player(p_instance, p_e);
if( p_mi )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
clip->top, clip->left, clip->bottom, clip->right );
vlc_object_release( p_vout );
}
- libvlc_media_instance_release(p_mi);
+ libvlc_media_player_release(p_mi);
}
}
}
-char *libvlc_video_get_aspect_ratio( libvlc_media_instance_t *p_mi,
+char *libvlc_video_get_aspect_ratio( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
char *psz_aspect = 0;
return psz_aspect ? psz_aspect : strdup("");
}
-void libvlc_video_set_aspect_ratio( libvlc_media_instance_t *p_mi,
+void libvlc_video_set_aspect_ratio( libvlc_media_player_t *p_mi,
char *psz_aspect, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
vlc_object_release( p_vout );
}
-int libvlc_video_get_spu( libvlc_media_instance_t *p_mi,
+int libvlc_video_get_spu( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
return i_spu;
}
-void libvlc_video_set_spu( libvlc_media_instance_t *p_mi, int i_spu,
+void libvlc_video_set_spu( libvlc_media_player_t *p_mi, int i_spu,
libvlc_exception_t *p_e )
{
input_thread_t *p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_object_release( p_input_thread );
}
-char *libvlc_video_get_crop_geometry( libvlc_media_instance_t *p_mi,
+char *libvlc_video_get_crop_geometry( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
char *psz_geometry = 0;
return psz_geometry ? psz_geometry : strdup("");
}
-void libvlc_video_set_crop_geometry( libvlc_media_instance_t *p_mi,
+void libvlc_video_set_crop_geometry( libvlc_media_player_t *p_mi,
char *psz_geometry, libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
vlc_object_release( p_vout );
}
-int libvlc_video_get_teletext( libvlc_media_instance_t *p_mi,
+int libvlc_video_get_teletext( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
return i_ret;
}
-void libvlc_video_set_teletext( libvlc_media_instance_t *p_mi, int i_page,
+void libvlc_video_set_teletext( libvlc_media_player_t *p_mi, int i_page,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
vlc_object_release( p_vout );
}
-void libvlc_toggle_teletext( libvlc_media_instance_t *p_mi,
+void libvlc_toggle_teletext( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
/* We only work on the first vout */
vlc_object_release( p_vout );
}
-int libvlc_video_destroy( libvlc_media_instance_t *p_mi,
+int libvlc_video_destroy( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
{
vout_thread_t *p_vout = GetVout( p_mi, p_e );
projects / vlc / commitdiff