# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_access.h>
#include <errno.h>
"value should be set in milliseconds." )
vlc_module_begin();
- set_description( _("Digital Video (Firewire/ieee1394) input") );
- set_shortname( _("dv") );
+ set_description( N_("Digital Video (Firewire/ieee1394) input") );
+ set_shortname( N_("dv") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true );
p_sys->p_frame = NULL;
p_sys->p_ev = NULL;
- vlc_mutex_init( p_access, &p_sys->lock );
+ vlc_mutex_init( &p_sys->lock );
p_sys->i_node = DiscoverAVC( p_access, &p_sys->i_port, p_sys->i_guid );
if( p_sys->i_node < 0 )
p_sys->p_ev->p_frame = NULL;
p_sys->p_ev->pp_last = &p_sys->p_ev->p_frame;
p_sys->p_ev->p_access = p_access;
- vlc_mutex_init( p_access, &p_sys->p_ev->lock );
+ vlc_mutex_init( &p_sys->p_ev->lock );
vlc_thread_create( p_sys->p_ev, "dv event thread handler", Raw1394EventThread,
VLC_THREAD_PRIORITY_OUTPUT, false );
access_sys_t *p_sys = p_access->p_sys;
block_t *p_block = NULL;
-// if( !p_access->psz_demux )
-// p_access->psz_demux = strdup( "rawdv" );
+#if 0
+ if( !p_access->psz_demux )
+ {
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "rawdv" );
+ }
+#endif
vlc_mutex_lock( &p_sys->lock );
p_block = p_sys->p_frame;
vlc_thread_ready( p_this );
- while( !p_sys->p_ev->b_die )
+ while( vlc_object_alive (p_sys->p_ev) )
{
while( ( result = poll( &(p_sys->raw1394_poll), 1, 200 ) ) < 0 )
{
perror( "error: raw1394 poll" );
msg_Err( p_access, "retrying device raw1394" );
}
- if( p_sys->p_ev->b_die )
- break;
}
- if( p_sys->p_ev->b_die )
+ if( !vlc_object_alive (p_sys->p_ev) )
break;
if( result > 0 && ( ( p_sys->raw1394_poll.revents & POLLIN )
|| ( p_sys->raw1394_poll.revents & POLLPRI ) ) )