#include <vlc_es.h>
#include <vlc_input.h>
#include <vlc_vlm.h>
+#include <assert.h>
#include "libvlc_internal.h"
if( !p_instance->libvlc_vlm.p_event_manager )
{
p_instance->libvlc_vlm.p_event_manager =
- libvlc_event_manager_new( p_instance->libvlc_vlm.p_vlm,
- p_instance, p_exception );
+ libvlc_event_manager_new( p_instance->libvlc_vlm.p_vlm, p_instance );
+ if( unlikely(p_instance->libvlc_vlm.p_event_manager == NULL) )
+ return VLC_ENOMEM;
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaAdded, NULL );
+ libvlc_VlmMediaAdded );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaRemoved, NULL );
+ libvlc_VlmMediaRemoved );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaChanged, NULL );
+ libvlc_VlmMediaChanged );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStarted, NULL );
+ libvlc_VlmMediaInstanceStarted );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStopped, NULL );
+ libvlc_VlmMediaInstanceStopped );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStatusInit, NULL );
+ libvlc_VlmMediaInstanceStatusInit );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStatusOpening, NULL );
+ libvlc_VlmMediaInstanceStatusOpening );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStatusPlaying, NULL );
+ libvlc_VlmMediaInstanceStatusPlaying );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStatusPause, NULL );
+ libvlc_VlmMediaInstanceStatusPause );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStatusEnd, NULL );
+ libvlc_VlmMediaInstanceStatusEnd );
libvlc_event_manager_register_event_type(
p_instance->libvlc_vlm.p_event_manager,
- libvlc_VlmMediaInstanceStatusError, NULL );
+ libvlc_VlmMediaInstanceStatusError );
}
if( !p_instance->libvlc_vlm.p_vlm )
p_instance->libvlc_vlm.p_vlm = vlm_New( p_instance->p_libvlc_int );
if( !p_instance->libvlc_vlm.p_vlm )
{
- libvlc_exception_raise( p_exception,
- "Unable to create VLM." );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "VLM not supported or out of memory" );
return VLC_EGENERIC;
}
var_AddCallback( (vlc_object_t *)p_instance->libvlc_vlm.p_vlm,
vlm_Control( p_vlm, VLM_GET_MEDIA_INSTANCES, id, &pp_minstance,
&i_minstance ) )
{
- libvlc_exception_raise( p_exception, "Unable to get %s instances",
- psz_name );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "%s: media instances not found", psz_name );
return NULL;
}
p_minstance = NULL;
VLM_RET(p_vlm, NULL);
- if( psz_name == NULL )
+ assert( psz_name );
+
+ if( asprintf( &psz_message, "show %s", psz_name ) == -1 )
{
- libvlc_exception_raise( p_exception, "No media name supplied" );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Not enough memory" );
+ return NULL;
}
- else if( asprintf( &psz_message, "show %s", psz_name ) == -1 )
+
+ vlm_ExecuteCommand( p_vlm, psz_message, &answer );
+ if( answer->psz_value )
{
- libvlc_exception_raise( p_exception, "Unable to call show %s",
- psz_name );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Unable to call show %s: %s",
+ psz_name, answer->psz_value );
}
- else
- {
- vlm_ExecuteCommand( p_vlm, psz_message, &answer );
- if( answer->psz_value )
+ else if ( answer->child )
+ { /* in case everything was requested */
+ if ( strcmp( psz_name, "" ) == 0 )
{
- libvlc_exception_raise( p_exception, "Unable to call show %s: %s",
- psz_name, answer->psz_value );
+ psz_fmt = "{\n\t%s\n}\n";
+ psz_delimiter = "\n\t";
+ i_list = 0;
}
- else if ( answer->child ) {
- /* in case everything was requested */
- if ( strcmp( psz_name, "" ) == 0 )
- {
- psz_fmt = "{\n\t%s\n}\n";
- psz_delimiter = "\n\t";
- i_list = 0;
- }
- else
- {
- psz_fmt = "%s\n";
- psz_delimiter = "\n";
- i_list = 1;
- }
- if( asprintf( &psz_response, psz_fmt,
- recurse_answer( answer, psz_delimiter, i_list ) )
- == -1 )
- {
- libvlc_exception_raise( p_exception, "Error in show %s",
- psz_name );
- }
+ else
+ {
+ psz_fmt = "%s\n";
+ psz_delimiter = "\n";
+ i_list = 1;
+ }
+ if( asprintf( &psz_response, psz_fmt,
+ recurse_answer( answer, psz_delimiter, i_list ) ) == -1 )
+ {
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Out of memory" );
}
}
free( psz_message );
n = vlm_Control( p_vlm, VLM_ADD_MEDIA, &m, NULL );
vlm_media_Clean( &m );
if( n )
- libvlc_exception_raise( p_exception, "Media %s creation failed",
- psz_name );
+ {
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Media %s creation failed", psz_name );
+ }
}
void libvlc_vlm_add_vod( libvlc_instance_t *p_instance, const char *psz_name,
n = vlm_Control( p_vlm, VLM_ADD_MEDIA, &m, NULL );
vlm_media_Clean( &m );
if( n )
- libvlc_exception_raise( p_exception, "Media %s creation failed",
- psz_name );
+ {
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Media %s creation failed", psz_name );
+ }
}
void libvlc_vlm_del_media( libvlc_instance_t *p_instance, const char *psz_name,
if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
vlm_Control( p_vlm, VLM_DEL_MEDIA, id ) )
{
- libvlc_exception_raise( p_exception, "Unable to delete %s", psz_name );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Unable to delete %s", psz_name );
}
}
VLM(p_vlm); \
if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) || \
vlm_Control( p_vlm, VLM_GET_MEDIA, id, &p_media ) ) { \
- libvlc_exception_raise( p_exception, psz_error, psz_name ); \
+ libvlc_exception_raise( p_exception ); \
+ libvlc_printerr( psz_error, psz_name ); \
return; \
} \
if( !p_media ) goto error; \
vlm_media_Delete( p_media ); \
return; \
error: \
- libvlc_exception_raise( p_exception, psz_error, psz_name );\
+ libvlc_exception_raise( p_exception ); \
+ libvlc_printerr( psz_error, psz_name ); \
} while(0)
void libvlc_vlm_set_enabled( libvlc_instance_t *p_instance,
if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
vlm_Control( p_vlm, VLM_START_MEDIA_BROADCAST_INSTANCE, id, NULL, 0 ) )
{
- libvlc_exception_raise( p_exception, "Unable to play %s", psz_name );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Unable to play %s", psz_name );
}
}
if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
vlm_Control( p_vlm, VLM_STOP_MEDIA_INSTANCE, id, NULL ) )
{
- libvlc_exception_raise( p_exception, "Unable to stop %s", psz_name );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Unable to stop %s", psz_name );
}
}
if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
vlm_Control( p_vlm, VLM_PAUSE_MEDIA_INSTANCE, id, NULL ) )
{
- libvlc_exception_raise( p_exception, "Unable to pause %s", psz_name );
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Unable to pause %s", psz_name );
}
}
if( vlm_Control( p_vlm, VLM_GET_MEDIA_ID, psz_name, &id ) ||
vlm_Control( p_vlm, VLM_SET_MEDIA_INSTANCE_POSITION, id, NULL,
f_percentage ) )
- libvlc_exception_raise( p_exception, "Unable to seek %s to %f",
- psz_name, f_percentage );
+ {
+ libvlc_exception_raise( p_exception );
+ libvlc_printerr( "Unable to seek %s to %f%%", psz_name, f_percentage );
+ }
}
float libvlc_vlm_get_media_instance_position( libvlc_instance_t *p_instance,
projects / vlc / blobdiff