X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdv.c;h=911a7f8673522035da130fed4800c6d219627cf2;hb=053b0208a015e79df412b4dcdd08fe0b58e291d1;hp=3f94f8d839256cf06032470195db9e8e65f1f4e1;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/modules/access/dv.c b/modules/access/dv.c index 3f94f8d839..911a7f8673 100644 --- a/modules/access/dv.c +++ b/modules/access/dv.c @@ -24,7 +24,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include @@ -69,12 +74,12 @@ static int Control( access_t *, int, va_list ); "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, VLC_TRUE ); - set_capability( "access2", 0 ); + add_integer( "dv-caching", 60000 / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true ); + set_capability( "access", 0 ); add_shortcut( "dv" ); add_shortcut( "dv1394" ); add_shortcut( "raw1394" ); @@ -142,7 +147,7 @@ static int Open( vlc_object_t *p_this ) /* Set up p_access */ access_InitFields( p_access ); ACCESS_SET_CALLBACKS( NULL, Block, Control, NULL ); - p_access->info.b_prebuffered = VLC_FALSE; + p_access->info.b_prebuffered = false; p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) ); if( !p_sys ) @@ -161,7 +166,7 @@ static int Open( vlc_object_t *p_this ) 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 ) @@ -231,9 +236,9 @@ static int Open( vlc_object_t *p_this ) 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, VLC_FALSE ); + VLC_THREAD_PRIORITY_OUTPUT, false ); free( psz_name ); return VLC_SUCCESS; @@ -267,7 +272,7 @@ static void Close( vlc_object_t *p_this ) p_sys->p_ev->pp_last = &p_sys->p_frame; vlc_mutex_unlock( &p_sys->p_ev->lock ); } - vlc_object_destroy( p_sys->p_ev ); + vlc_object_release( p_sys->p_ev ); } if( p_sys->p_frame ) @@ -287,22 +292,22 @@ static void Close( vlc_object_t *p_this ) static int Control( access_t *p_access, int i_query, va_list args ) { access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; + bool *pb_bool; int64_t *pi_64; switch( i_query ) { /* */ case ACCESS_CAN_PAUSE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_TRUE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; break; case ACCESS_CAN_SEEK: case ACCESS_CAN_FASTSEEK: case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; break; case ACCESS_GET_PTS_DELAY: @@ -319,6 +324,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) case ACCESS_SET_TITLE: case ACCESS_SET_SEEKPOINT: case ACCESS_SET_PRIVATE_ID_STATE: + case ACCESS_GET_CONTENT_TYPE: return VLC_EGENERIC; default: @@ -334,8 +340,13 @@ static block_t *Block( access_t *p_access ) 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; @@ -357,7 +368,7 @@ static int Raw1394EventThread( vlc_object_t *p_this ) 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 ) { @@ -366,10 +377,8 @@ static int Raw1394EventThread( vlc_object_t *p_this ) 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 ) ) ) @@ -469,13 +478,13 @@ static int Raw1394GetNumPorts( access_t *p_access ) /* get a raw1394 handle */ if ( !( handle = raw1394_new_handle() ) ) { - msg_Err( p_access, "raw1394 - failed to get handle: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get handle: %m." ); return VLC_EGENERIC; } if ( ( n_ports = raw1394_get_port_info( handle, pinf, 16 ) ) < 0 ) { - msg_Err( p_access, "raw1394 - failed to get port info: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get port info: %m.\n" ); raw1394_destroy_handle( handle ); return VLC_EGENERIC; } @@ -501,13 +510,13 @@ static raw1394handle_t Raw1394Open( access_t *p_access, int port ) if ( !handle ) { - msg_Err( p_access, "raw1394 - failed to get handle: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get handle: %m." ); return NULL; } if ( ( n_ports = raw1394_get_port_info( handle, pinf, 16 ) ) < 0 ) { - msg_Err( p_access, "raw1394 - failed to get port info: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to get port info: %m." ); raw1394_destroy_handle( handle ); return NULL; } @@ -515,7 +524,7 @@ static raw1394handle_t Raw1394Open( access_t *p_access, int port ) /* tell raw1394 which host adapter to use */ if ( raw1394_set_port( handle, port ) < 0 ) { - msg_Err( p_access, "raw1394 - failed to set set port: %s.\n", strerror( errno ) ); + msg_Err( p_access, "raw1394 - failed to set set port: %m." ); return NULL; }