#include <stdlib.h> /* malloc(), free() */
#include <string.h>
-#include <errno.h> /* ENOMEM */
#include <stdio.h>
-#include <ctype.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
+#include <sys/types.h>
mediacontrol_Instance* mediacontrol_new( int argc, char** argv, mediacontrol_Exception *exception )
{
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ p_media = libvlc_media_player_get_media( self->p_media_player );
if ( ! p_media )
{
{
/* A media was defined. Get its mrl to reuse it, but reset the options
(because start-time may have been set on the previous invocation */
- psz_name = libvlc_media_get_mrl( p_media, &ex );
+ psz_name = libvlc_media_get_mrl( p_media );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
/* Create a new media */
psz_from = ( char * )malloc( 20 * sizeof( char ) );
i_from = private_mediacontrol_position2microsecond( self->p_media_player, a_position ) / 1000000;
snprintf( psz_from, 20, "start-time=%"PRId64, i_from );
- libvlc_media_add_option( p_media, psz_from, &ex );
+ libvlc_media_add_option( p_media, psz_from );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
}
- libvlc_media_player_set_media( self->p_media_player, p_media, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ libvlc_media_player_set_media( self->p_media_player, p_media );
libvlc_media_player_play( self->p_media_player, &ex );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- libvlc_media_player_stop( self->p_media_player, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ libvlc_media_player_stop( self->p_media_player );
}
/**************************************************************************
p_media = libvlc_media_new( self->p_instance, psz_file, &ex );
HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
- libvlc_media_player_set_media( self->p_media_player, p_media, &ex );
- HANDLE_LIBVLC_EXCEPTION_VOID( &ex );
+ libvlc_media_player_set_media( self->p_media_player, p_media );
}
char *
mediacontrol_exception_init( exception );
libvlc_exception_init( &ex );
- p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
- HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
+ p_media = libvlc_media_player_get_media( self->p_media_player );
if ( ! p_media )
{
{
char * psz_mrl;
- psz_mrl = libvlc_media_get_mrl( p_media, &ex );
+ psz_mrl = libvlc_media_get_mrl( p_media );
HANDLE_LIBVLC_EXCEPTION_NULL( &ex );
return psz_mrl;
}
return NULL;
}
- p_media = libvlc_media_player_get_media( self->p_media_player, &ex );
- if( libvlc_exception_raised( &ex ) )
- {
- free( retval );
- RAISE( mediacontrol_InternalException,
- libvlc_exception_get_message( &ex ) );
- libvlc_exception_clear( &ex );
- return NULL;
- }
-
+ p_media = libvlc_media_player_get_media( self->p_media_player );
if( ! p_media )
{
/* No p_media defined */
{
libvlc_state_t state;
- state = libvlc_media_player_get_state( self->p_media_player, &ex );
- if( libvlc_exception_raised( &ex ) )
- {
- free( retval );
- RAISE( mediacontrol_InternalException,
- libvlc_exception_get_message( &ex ) );
- libvlc_exception_clear( &ex );
- return NULL;
- }
-
+ state = libvlc_media_player_get_state( self->p_media_player );
switch( state )
{
case libvlc_NothingSpecial:
break;
}
- retval->url = libvlc_media_get_mrl( p_media, &ex );
-
+ retval->url = libvlc_media_get_mrl( p_media );
+
retval->position = libvlc_media_player_get_time( self->p_media_player, &ex );
if( libvlc_exception_raised( &ex ) )
{