#include "vlm_internal.h"
#include "vlm_event.h"
#include <vlc_vod.h>
-#include <vlc_charset.h>
#include <vlc_sout.h>
#include "../stream_output/stream_output.h"
#include "../libvlc.h"
}
}
vlm_SendEventMediaInstanceState( p_vlm, p_media->cfg.id, p_media->cfg.psz_name, psz_instance_name, var_GetInteger( p_input, "state" ) );
+
+ vlc_mutex_lock( &p_vlm->lock );
+ vlc_cond_signal( &p_vlm->wait );
+ vlc_mutex_unlock( &p_vlm->lock );
}
return VLC_SUCCESS;
}
+static vlc_mutex_t vlm_mutex = VLC_STATIC_MUTEX;
+
+#undef vlm_New
/*****************************************************************************
* vlm_New:
*****************************************************************************/
-static vlc_mutex_t vlm_mutex = VLC_STATIC_MUTEX;
-
-vlm_t *__vlm_New ( vlc_object_t *p_this )
+vlm_t *vlm_New ( vlc_object_t *p_this )
{
vlm_t *p_vlm = NULL, **pp_vlm = &(libvlc_priv (p_this->p_libvlc)->p_vlm);
char *psz_vlmconf;
}
vlc_mutex_init( &p_vlm->lock );
+ vlc_cond_init_daytime( &p_vlm->wait );
p_vlm->i_id = 1;
TAB_INIT( p_vlm->i_media, p_vlm->media );
TAB_INIT( p_vlm->i_schedule, p_vlm->schedule );
if( vlc_clone( &p_vlm->thread, Manage, p_vlm, VLC_THREAD_PRIORITY_LOW ) )
{
+ vlc_cond_destroy( &p_vlm->wait );
vlc_mutex_destroy( &p_vlm->lock );
vlc_object_release( p_vlm );
vlc_mutex_unlock( &vlm_mutex );
vlm_ControlInternal( p_vlm, VLM_CLEAR_SCHEDULES );
TAB_CLEAN( p_vlm->schedule, p_vlm->schedule );
+ vlc_mutex_lock( &p_vlm->lock );
+ vlc_cond_signal( &p_vlm->wait );
+ vlc_mutex_unlock( &p_vlm->lock );
+
libvlc_priv(p_vlm->p_libvlc)->p_vlm = NULL;
vlc_object_kill( p_vlm );
/*vlc_cancel( p_vlm->thread ); */
vlc_join( p_vlm->thread, NULL );
+
+ vlc_cond_destroy( &p_vlm->wait );
vlc_mutex_destroy( &p_vlm->lock );
}
int i, j;
mtime_t i_lastcheck;
mtime_t i_time;
+ mtime_t i_nextschedule = 0;
int canc = vlc_savecancel ();
i_lastcheck = vlm_Date();
int i_scheduled_commands = 0;
vlc_mutex_lock( &vlm->lock );
+ if( i_nextschedule )
+ vlc_cond_timedwait( &vlm->wait, &vlm->lock, i_nextschedule );
+ else
+ vlc_cond_wait( &vlm->wait, &vlm->lock );
/* destroy the inputs that wants to die, and launch the next input */
for( i = 0; i < vlm->i_media; i++ )
/* scheduling */
i_time = vlm_Date();
+ i_nextschedule = 0;
for( i = 0; i < vlm->i_schedule; i++ )
{
vlm->schedule[i]->i_period;
}
- if( i_real_date <= i_time && i_real_date > i_lastcheck )
+ if( i_real_date <= i_time )
{
- for( j = 0; j < vlm->schedule[i]->i_command; j++ )
+ if( i_real_date > i_lastcheck )
{
- TAB_APPEND( i_scheduled_commands,
- ppsz_scheduled_commands,
- strdup(vlm->schedule[i]->command[j] ) );
+ for( j = 0; j < vlm->schedule[i]->i_command; j++ )
+ {
+ TAB_APPEND( i_scheduled_commands,
+ ppsz_scheduled_commands,
+ strdup(vlm->schedule[i]->command[j] ) );
+ }
}
}
+ else
+ {
+ i_nextschedule = i_real_date;
+ }
}
}
+
while( i_scheduled_commands )
{
vlm_message_t *message = NULL;
i_lastcheck = i_time;
vlc_mutex_unlock( &vlm->lock );
-
- msleep( 100000 );
}
vlc_restorecancel (canc);
var_DelCallback( p_input, "intf-event", InputEventPreparse, &sem_preparse );
vlc_sem_destroy( &sem_preparse );
- input_Stop( p_input, false );
+ input_Stop( p_input, true );
vlc_thread_join( p_input );
vlc_object_release( p_input );
}
{
input_resource_t *p_resource;
+ var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
+
input_Stop( p_input, true );
vlc_thread_join( p_input );
p_resource = input_DetachResource( p_input );
input_resource_Delete( p_resource );
- var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
vlc_object_release( p_input );
vlm_SendEventMediaInstanceStopped( p_vlm, id, p_media->cfg.psz_name );
return VLC_SUCCESS;
}
- input_Stop( p_input, !p_input->b_eof && !p_input->b_error );
+ var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
+
+ input_Stop( p_input, true );
vlc_thread_join( p_input );
p_instance->p_input_resource = input_DetachResource( p_input );
- var_DelCallback( p_instance->p_input, "intf-event", InputEvent, p_media );
vlc_object_release( p_input );
if( !p_instance->b_sout_keep )