videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

good

pull/2/head
Rémi Denis-Courmont 17 years ago
parent
8f9c3647cc
commit
8d875234ec
5 changed files with 130 additions and 212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      include/vlc/libvlc_media_list_player.h
  2. 135
      include/vlc/libvlc_media_player.h
  3. 5
      src/control/media_list_player.c
  4. 184
      src/control/media_player.c
  5. 13
      src/control/mediacontrol_core.c

5
include/vlc/libvlc_media_list_player.h
View File

@ -60,11 +60,10 @@ typedef enum libvlc_playback_mode_t
*
* \param p_instance libvlc instance
* \param p_e initialized exception instance
* \return media list player instance
* \return media list player instance or NULL on error
*/
VLC_PUBLIC_API libvlc_media_list_player_t *
libvlc_media_list_player_new( libvlc_instance_t * p_instance,
libvlc_exception_t * p_e );
libvlc_media_list_player_new( libvlc_instance_t * p_instance );
/**
* Release media_list_player.

135
include/vlc/libvlc_media_player.h
View File

@ -101,18 +101,18 @@ typedef enum libvlc_video_marquee_option_t {
*
* \param p_libvlc_instance the libvlc instance in which the Media Player
* should be created.
* \param p_e an initialized exception pointer
* \return a new media player object, or NULL on error.
*/
VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t *, libvlc_exception_t * );
VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new( libvlc_instance_t * );
/**
* Create a Media Player object from a Media
*
* \param p_md the media. Afterwards the p_md can be safely
* destroyed.
* \param p_e an initialized exception pointer
* \return a new media player object, or NULL on error.
*/
VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_media_t *, libvlc_exception_t * );
VLC_PUBLIC_API libvlc_media_player_t * libvlc_media_player_new_from_media( libvlc_media_t * );
/**
* Release a media_player after use
@ -172,23 +172,21 @@ VLC_PUBLIC_API int libvlc_media_player_is_playing ( libvlc_media_player_t * );
* Play
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return 0 if playback started (and was already started), or -1 on error.
*/
VLC_PUBLIC_API void libvlc_media_player_play ( libvlc_media_player_t *, libvlc_exception_t * );
VLC_PUBLIC_API int libvlc_media_player_play ( libvlc_media_player_t * );
/**
* Pause
* Toggle pause (no effect if there is no media)
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_pause ( libvlc_media_player_t *, libvlc_exception_t * );
VLC_PUBLIC_API void libvlc_media_player_pause ( libvlc_media_player_t * );
/**
* Stop
* Stop (no effect if there is no media)
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t * );
@ -292,160 +290,146 @@ VLC_PUBLIC_API void *libvlc_media_player_get_hwnd ( libvlc_media_player_t *p_mi
* Get the current movie length (in ms).
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return the movie length (in ms).
* \return the movie length (in ms), or -1 if there is no media.
*/
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_length( libvlc_media_player_t * );
/**
* Get the current movie time (in ms).
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return the movie time (in ms).
* \return the movie time (in ms), or -1 if there is no media.
*/
VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t * );
/**
* Set the movie time (in ms).
* Set the movie time (in ms). This has no effect if no media is being played.
* Not all formats and protocols support this.
*
* \param p_mi the Media Player
* \param the movie time (in ms).
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_set_time( libvlc_media_player_t *, libvlc_time_t, libvlc_exception_t *);
VLC_PUBLIC_API void libvlc_media_player_set_time( libvlc_media_player_t *, libvlc_time_t );
/**
* Get movie position.
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return movie position
* \return movie position, or -1. in case of error
*/
VLC_PUBLIC_API float libvlc_media_player_get_position( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API float libvlc_media_player_get_position( libvlc_media_player_t * );
/**
* Set movie position.
* Set movie position. This has no effect if playback is not enabled.
* This might not work depending on the underlying input format and protocol.
*
* \param p_mi the Media Player
* \param f_pos the position
* \param p_e an initialized exception pointer
*/
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_position( libvlc_media_player_t *, float );
/**
* Set movie chapter
* Set movie chapter (if applicable).
*
* \param p_mi the Media Player
* \param i_chapter chapter number to play
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_set_chapter( libvlc_media_player_t *, int, libvlc_exception_t *);
VLC_PUBLIC_API void libvlc_media_player_set_chapter( libvlc_media_player_t *, int );
/**
* Get movie chapter
* Get movie chapter.
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return chapter number currently playing
* \return chapter number currently playing, or -1 if there is no media.
*/
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( libvlc_media_player_t * );
/**
* Get movie chapter count
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return number of chapters in movie
* \return number of chapters in movie, or -1.
*/
VLC_PUBLIC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API int libvlc_media_player_get_chapter_count( libvlc_media_player_t * );
/**
* Will the player play
* Is the player able to play
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return boolean
*/
VLC_PUBLIC_API int libvlc_media_player_will_play ( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API int libvlc_media_player_will_play( libvlc_media_player_t * );
/**
* Get title chapter count
*
* \param p_mi the Media Player
* \param i_title title
* \param p_e an initialized exception pointer
* \return number of chapters in title
* \return number of chapters in title, or -1
*/
VLC_PUBLIC_API int libvlc_media_player_get_chapter_count_for_title(
libvlc_media_player_t *, int, libvlc_exception_t *);
libvlc_media_player_t *, int );
/**
* Set movie title
*
* \param p_mi the Media Player
* \param i_title title number to play
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_set_title( libvlc_media_player_t *, int, libvlc_exception_t *);
VLC_PUBLIC_API void libvlc_media_player_set_title( libvlc_media_player_t *, int );
/**
* Get movie title
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return title number currently playing
* \return title number currently playing, or -1
*/
VLC_PUBLIC_API int libvlc_media_player_get_title( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API int libvlc_media_player_get_title( libvlc_media_player_t * );
/**
* Get movie title count
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return title number count
* \return title number count, or -1
*/
VLC_PUBLIC_API int libvlc_media_player_get_title_count( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API int libvlc_media_player_get_title_count( libvlc_media_player_t * );
/**
* Set previous chapter
* Set previous chapter (if applicable)
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_previous_chapter( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API void libvlc_media_player_previous_chapter( libvlc_media_player_t * );
/**
* Set next chapter
* Set next chapter (if applicable)
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_next_chapter( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API void libvlc_media_player_next_chapter( libvlc_media_player_t * );
/**
* Get movie play rate
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return movie play rate
* \return movie play rate, or zero in case of error
*/
VLC_PUBLIC_API float libvlc_media_player_get_rate( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API float libvlc_media_player_get_rate( libvlc_media_player_t * );
/**
* Set movie play rate
*
* \param p_mi the Media Player
* \param movie play rate to set
* \param p_e an initialized exception pointer
* \return -1 if an error was detected, 0 otherwise (but even then, it might
* not actually work depending on the underlying media protocol)
*/
VLC_PUBLIC_API void libvlc_media_player_set_rate( libvlc_media_player_t *, float, libvlc_exception_t *);
VLC_PUBLIC_API int libvlc_media_player_set_rate( libvlc_media_player_t *, float );
/**
* Get current movie state
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *);
@ -453,10 +437,9 @@ VLC_PUBLIC_API libvlc_state_t libvlc_media_player_get_state( libvlc_media_player
* Get movie fps rate
*
* \param p_mi the Media Player
* \param p_e an initialized exception pointer
* \return frames per second (fps) for this playing movie
* \return frames per second (fps) for this playing movie, or 0 if unspecified
*/
VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t * );
/** end bug */
@ -464,35 +447,30 @@ VLC_PUBLIC_API float libvlc_media_player_get_fps( libvlc_media_player_t *, libvl
* Does this media player have a video output?
*
* \param p_md the media player
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API int libvlc_media_player_has_vout( libvlc_media_player_t *, libvlc_exception_t *);
VLC_PUBLIC_API int libvlc_media_player_has_vout( libvlc_media_player_t *, libvlc_exception_t * );
/**
* Is this media player seekable?
*
* \param p_input the input
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e );
VLC_PUBLIC_API int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi );
/**
* Can this media player be paused?
*
* \param p_input the input
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e );
VLC_PUBLIC_API int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi );
/**
* Display the next frame
* Display the next frame (if supported)
*
* \param p_input the libvlc_media_player_t instance
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_media_player_next_frame( libvlc_media_player_t *p_input,
libvlc_exception_t *p_e );
VLC_PUBLIC_API void libvlc_media_player_next_frame( libvlc_media_player_t *p_input );
@ -740,20 +718,19 @@ VLC_PUBLIC_API void libvlc_toggle_teletext( libvlc_media_player_t *, libvlc_exce
* Get number of available video tracks.
*
* \param p_mi media player
* \param p_e an initialized exception
* \return the number of available video tracks (int)
*/
VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t *, libvlc_exception_t * );
VLC_PUBLIC_API int libvlc_video_get_track_count( libvlc_media_player_t *, libvlc_exceptio_t * );
/**
* Get the description of available video tracks.
*
* \param p_mi media player
* \param p_e an initialized exception
* \return list with description of available video tracks
* \return list with description of available video tracks, or NULL on error
*/
VLC_PUBLIC_API libvlc_track_description_t *
libvlc_video_get_track_description( libvlc_media_player_t *, libvlc_exception_t * );
libvlc_video_get_track_description( libvlc_media_player_t * );
/**
* Get current video track.

5
src/control/media_list_player.c
View File

@ -438,7 +438,7 @@ set_current_playing_item(libvlc_media_list_player_t * p_mlp, libvlc_media_list_p
/* Create a new media_player if there is none */
if (!p_mlp->p_mi)
p_mlp->p_mi = libvlc_media_player_new_from_media(p_md, NULL);
p_mlp->p_mi = libvlc_media_player_new_from_media(p_md);
libvlc_media_player_set_media(p_mlp->p_mi, p_md);
@ -454,9 +454,8 @@ set_current_playing_item(libvlc_media_list_player_t * p_mlp, libvlc_media_list_p
* new (Public)
**************************************************************************/
libvlc_media_list_player_t *
libvlc_media_list_player_new(libvlc_instance_t * p_instance, libvlc_exception_t * p_e)
libvlc_media_list_player_new(libvlc_instance_t * p_instance)
{
(void)p_e;
libvlc_media_list_player_t * p_mlp;
p_mlp = calloc( 1, sizeof(libvlc_media_list_player_t) );
if (unlikely(p_mlp == NULL))

184
src/control/media_player.c
View File

@ -333,7 +333,7 @@ static void libvlc_media_player_destroy( libvlc_media_player_t * );
* - When attempting to destroy the object the lock is also held.
**************************************************************************/
libvlc_media_player_t *
libvlc_media_player_new( libvlc_instance_t *instance, libvlc_exception_t *e )
libvlc_media_player_new( libvlc_instance_t *instance )
{
libvlc_media_player_t * mp;
@ -415,13 +415,11 @@ libvlc_media_player_new( libvlc_instance_t *instance, libvlc_exception_t *e )
* Create a Media Instance object with a media descriptor.
**************************************************************************/
libvlc_media_player_t *
libvlc_media_player_new_from_media(
libvlc_media_t * p_md,
libvlc_exception_t *p_e )
libvlc_media_player_new_from_media( libvlc_media_t * p_md )
{
libvlc_media_player_t * p_mi;
p_mi = libvlc_media_player_new( p_md->p_libvlc_instance, p_e );
p_mi = libvlc_media_player_new( p_md->p_libvlc_instance );
if( !p_mi )
return NULL;
@ -570,30 +568,26 @@ libvlc_media_player_event_manager( libvlc_media_player_t *p_mi )
/**************************************************************************
* Tell media player to start playing.
**************************************************************************/
void libvlc_media_player_play( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
int libvlc_media_player_play( libvlc_media_player_t *p_mi )
{
input_thread_t * p_input_thread;
if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) )
if( (p_input_thread = libvlc_get_input_thread( p_mi, NULL )) )
{
/* A thread already exists, send it a play message */
input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
vlc_object_release( p_input_thread );
return;
return 0;
}
/* Ignore previous exception */
libvlc_exception_clear( p_e );
lock(p_mi);
if( !p_mi->p_md )
{
unlock(p_mi);
libvlc_exception_raise( p_e );
libvlc_printerr( "No associated media descriptor" );
return;
return -1;
}
p_mi->p_input_thread = input_Create( p_mi,
@ -602,7 +596,8 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi,
if( !p_mi->p_input_thread )
{
unlock(p_mi);
return;
libvlc_printerr( "Not enough memory" );
return -1;
}
p_mi->p_input_resource = NULL;
@ -619,22 +614,22 @@ void libvlc_media_player_play( libvlc_media_player_t *p_mi,
}
unlock(p_mi);
return 0;
}
/**************************************************************************
* Pause.
**************************************************************************/
void libvlc_media_player_pause( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
void libvlc_media_player_pause( libvlc_media_player_t *p_mi )
{
input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e );
input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, NULL );
if( !p_input_thread )
return;
libvlc_state_t state = libvlc_media_player_get_state( p_mi );
if( state == libvlc_Playing || state == libvlc_Buffering )
{
if( libvlc_media_player_can_pause( p_mi, p_e ) )
if( libvlc_media_player_can_pause( p_mi ) )
input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S );
else
libvlc_media_player_stop( p_mi );
@ -782,13 +777,12 @@ void *libvlc_media_player_get_hwnd( libvlc_media_player_t *p_mi )
* Getters for stream information
**************************************************************************/
libvlc_time_t libvlc_media_player_get_length(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
libvlc_time_t i_time;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1;
@ -798,14 +792,12 @@ libvlc_time_t libvlc_media_player_get_length(
return i_time;
}
libvlc_time_t libvlc_media_player_get_time(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
libvlc_time_t libvlc_media_player_get_time( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
libvlc_time_t i_time;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1;
@ -814,14 +806,12 @@ libvlc_time_t libvlc_media_player_get_time(
return i_time;
}
void libvlc_media_player_set_time(
libvlc_media_player_t *p_mi,
libvlc_time_t i_time,
libvlc_exception_t *p_e )
void libvlc_media_player_set_time( libvlc_media_player_t *p_mi,
libvlc_time_t i_time )
{
input_thread_t *p_input_thread;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return;
@ -829,14 +819,12 @@ void libvlc_media_player_set_time(
vlc_object_release( p_input_thread );
}
void libvlc_media_player_set_position(
libvlc_media_player_t *p_mi,
float position,
libvlc_exception_t *p_e )
void libvlc_media_player_set_position( libvlc_media_player_t *p_mi,
float position )
{
input_thread_t *p_input_thread;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return;
@ -844,14 +832,12 @@ void libvlc_media_player_set_position(
vlc_object_release( p_input_thread );
}
float libvlc_media_player_get_position(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
float libvlc_media_player_get_position( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
float f_position;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1.0;
@ -861,14 +847,12 @@ float libvlc_media_player_get_position(
return f_position;
}
void libvlc_media_player_set_chapter(
libvlc_media_player_t *p_mi,
int chapter,
libvlc_exception_t *p_e )
void libvlc_media_player_set_chapter( libvlc_media_player_t *p_mi,
int chapter )
{
input_thread_t *p_input_thread;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return;
@ -876,14 +860,12 @@ void libvlc_media_player_set_chapter(
vlc_object_release( p_input_thread );
}
int libvlc_media_player_get_chapter(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
int libvlc_media_player_get_chapter( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
int i_chapter;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1;
@ -893,14 +875,12 @@ int libvlc_media_player_get_chapter(
return i_chapter;
}
int libvlc_media_player_get_chapter_count(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
int libvlc_media_player_get_chapter_count( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
vlc_value_t val;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1;
@ -912,13 +892,12 @@ int libvlc_media_player_get_chapter_count(
int libvlc_media_player_get_chapter_count_for_title(
libvlc_media_player_t *p_mi,
int i_title,
libvlc_exception_t *p_e )
int i_title )
{
input_thread_t *p_input_thread;
vlc_value_t val;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1;
@ -935,14 +914,12 @@ int libvlc_media_player_get_chapter_count_for_title(
return val.i_int;
}
void libvlc_media_player_set_title(
libvlc_media_player_t *p_mi,
int i_title,
libvlc_exception_t *p_e )
void libvlc_media_player_set_title( libvlc_media_player_t *p_mi,
int i_title )
{
input_thread_t *p_input_thread;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return;
@ -956,14 +933,12 @@ void libvlc_media_player_set_title(
libvlc_event_send( p_mi->p_event_manager, &event );
}
int libvlc_media_player_get_title(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
int libvlc_media_player_get_title( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
int i_title;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1;
@ -973,14 +948,12 @@ int libvlc_media_player_get_title(
return i_title;
}
int libvlc_media_player_get_title_count(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
int libvlc_media_player_get_title_count( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
vlc_value_t val;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return -1;
@ -990,13 +963,11 @@ int libvlc_media_player_get_title_count(
return val.i_int;
}
void libvlc_media_player_next_chapter(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
void libvlc_media_player_next_chapter( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return;
@ -1007,13 +978,11 @@ void libvlc_media_player_next_chapter(
vlc_object_release( p_input_thread );
}
void libvlc_media_player_previous_chapter(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
void libvlc_media_player_previous_chapter( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e);
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return;
@ -1024,11 +993,9 @@ void libvlc_media_player_previous_chapter(
vlc_object_release( p_input_thread );
}
float libvlc_media_player_get_fps(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e)
float libvlc_media_player_get_fps( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
double f_fps = 0.0;
if( p_input_thread )
@ -1040,12 +1007,11 @@ float libvlc_media_player_get_fps(
return f_fps;
}
int libvlc_media_player_will_play( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e)
int libvlc_media_player_will_play( libvlc_media_player_t *p_mi )
{
bool b_will_play;
input_thread_t *p_input_thread =
libvlc_get_input_thread ( p_mi, p_e);
libvlc_get_input_thread ( p_mi, NULL );
if ( !p_input_thread )
return false;
@ -1055,40 +1021,35 @@ int libvlc_media_player_will_play( libvlc_media_player_t *p_mi,
return b_will_play;
}
void libvlc_media_player_set_rate(
libvlc_media_player_t *p_mi,
float rate,
libvlc_exception_t *p_e )
int libvlc_media_player_set_rate( libvlc_media_player_t *p_mi, float rate )
{
input_thread_t *p_input_thread;
bool b_can_rewind;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return;
return -1;
b_can_rewind = var_GetBool( p_input_thread, "can-rewind" );
if( (rate < 0.0) && !b_can_rewind )
{
vlc_object_release( p_input_thread );
libvlc_exception_raise( p_e );
libvlc_printerr( "Invalid playback rate" );
return;
return -1;
}
var_SetFloat( p_input_thread, "rate", rate );
vlc_object_release( p_input_thread );
return 0;
}
float libvlc_media_player_get_rate(
libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
float libvlc_media_player_get_rate( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
float f_rate;
bool b_can_rewind;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( !p_input_thread )
return 0.0; /* rate < 0 indicates rewind */
@ -1113,19 +1074,14 @@ libvlc_state_t libvlc_media_player_get_state( libvlc_media_player_t *p_mi )
return state;
}
int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
bool b_seekable;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if ( !p_input_thread )
{
/* We do return the right value, no need to throw an exception */
clear_if_needed(p_e);
return false;
}
b_seekable = var_GetBool( p_input_thread, "can-seek" );
vlc_object_release( p_input_thread );
@ -1135,10 +1091,9 @@ int libvlc_media_player_is_seekable( libvlc_media_player_t *p_mi,
/* internal function, used by audio, video */
libvlc_track_description_t *
libvlc_get_track_description( libvlc_media_player_t *p_mi,
const char *psz_variable,
libvlc_exception_t *p_e )
const char *psz_variable )
{
input_thread_t *p_input = libvlc_get_input_thread( p_mi, p_e );
input_thread_t *p_input = libvlc_get_input_thread( p_mi, NULL );
libvlc_track_description_t *p_track_description = NULL,
*p_actual, *p_previous;
@ -1156,7 +1111,6 @@ libvlc_track_description_t *
malloc( sizeof( libvlc_track_description_t ) );
if ( !p_track_description )
{
libvlc_exception_raise( p_e );
libvlc_printerr( "Not enough memory" );
goto end;
}
@ -1206,36 +1160,26 @@ void libvlc_track_description_release( libvlc_track_description_t *p_td )
}
}
int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi,
libvlc_exception_t *p_e )
int libvlc_media_player_can_pause( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread;
bool b_can_pause;
p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if ( !p_input_thread )
{
/* We do return the right value, no need to throw an exception */
clear_if_needed(p_e);
return false;
}
b_can_pause = var_GetBool( p_input_thread, "can-pause" );
vlc_object_release( p_input_thread );
return b_can_pause;
}
void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi, libvlc_exception_t *p_e )
void libvlc_media_player_next_frame( libvlc_media_player_t *p_mi )
{
input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, p_e );
input_thread_t *p_input_thread = libvlc_get_input_thread ( p_mi, NULL );
if( p_input_thread != NULL )
{
var_TriggerCallback( p_input_thread, "frame-next" );
vlc_object_release( p_input_thread );
}
else
{
libvlc_exception_raise( p_e );
libvlc_printerr( "No active input" );
}
}

13
src/control/mediacontrol_core.c
View File

@ -62,8 +62,9 @@ mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exc
retval->p_instance = libvlc_new( argc, (const char**)argv, &ex );
HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
retval->p_media_player = libvlc_media_player_new( retval->p_instance, &ex );
HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
retval->p_media_player = libvlc_media_player_new( retval->p_instance );
if( !retval->p_media_player )
RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
return retval;
}
@ -90,9 +91,6 @@ mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
mediacontrol_Exception *exception )
{
mediacontrol_Instance* retval;
libvlc_exception_t ex;
libvlc_exception_init( &ex );
retval = ( mediacontrol_Instance* )malloc( sizeof( mediacontrol_Instance ) );
if( ! retval )
@ -100,8 +98,9 @@ mediacontrol_new_from_instance( libvlc_instance_t* p_instance,
RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
}
retval->p_instance = p_instance;
retval->p_media_player = libvlc_media_player_new( retval->p_instance, &ex );
HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
retval->p_media_player = libvlc_media_player_new( retval->p_instance );
if( ! retval->p_media_player )
RAISE_NULL( mediacontrol_InternalException, "Out of memory" );
return retval;
}

Write Preview
Loading…
Cancel
Save