X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdc1394.c;h=381e14a73050a0d080798d276b1164ad543e170a;hb=0d8adc76dbf01e54ef043a07a623982a7fa9a426;hp=26445d6bde42538fe88aa21f44e8316fb7325017;hpb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;p=vlc diff --git a/modules/access/dc1394.c b/modules/access/dc1394.c index 26445d6bde..381e14a730 100644 --- a/modules/access/dc1394.c +++ b/modules/access/dc1394.c @@ -8,7 +8,7 @@ ***************************************************************************** * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; + * License as published by the Free Software Foundation; * version 2 of the License. * * This library is distributed in the hope that it will be useful, @@ -26,13 +26,16 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include -#include -#include #ifdef HAVE_FCNTL_H # include @@ -61,7 +64,7 @@ static void OpenAudioDev( demux_t *p_demux ); static inline void CloseAudioDev( demux_t *p_demux ); vlc_module_begin(); - set_description( _("dc1394 input") ); + set_description( N_("dc1394 input") ); set_capability( "access_demux", 10 ); add_shortcut( "dc1394" ); set_callbacks( Open, Close ); @@ -224,10 +227,7 @@ static int Open( vlc_object_t *p_this ) p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); if( !p_sys ) - { - msg_Err( p_demux, "not enough memory available" ); return VLC_ENOMEM; - } memset( p_sys, 0, sizeof( demux_sys_t ) ); memset( &fmt, 0, sizeof( es_format_t ) ); @@ -574,7 +574,7 @@ static void OpenAudioDev( demux_t *p_demux ) CloseAudioDev( p_demux ); } - msg_Dbg( p_demux, "openened adev=`%s' %s %dHz", + msg_Dbg( p_demux, "opened adev=`%s' %s %dHz", psz_device, (p_sys->channels > 1) ? "stereo" : "mono", p_sys->i_sample_rate ); @@ -626,10 +626,8 @@ static void Close( vlc_object_t *p_this ) dc1394_destroy_handle( p_sys->fd_video ); CloseAudioDev( p_demux ); - if( p_sys->camera_nodes ) - free( p_sys->camera_nodes ); - if( p_sys->audio_device ) - free( p_sys->audio_device ); + free( p_sys->camera_nodes ); + free( p_sys->audio_device ); free( p_sys ); } @@ -750,7 +748,7 @@ static block_t *GrabAudio( demux_t *p_demux ) i_correct += buf_info.bytes; p_block->i_pts = p_block->i_dts = - mdate() - I64C(1000000) * (mtime_t)i_correct / + mdate() - INT64_C(1000000) * (mtime_t)i_correct / 2 / p_sys->channels / p_sys->i_sample_rate; return p_block; } @@ -797,17 +795,18 @@ static int Demux( demux_t *p_demux ) *****************************************************************************/ static int Control( demux_t *p_demux, int i_query, va_list args ) { - vlc_bool_t *pb; + bool *pb; int64_t *pi64; switch( i_query ) { /* Special for access_demux */ case DEMUX_CAN_PAUSE: + case DEMUX_CAN_SEEK: case DEMUX_SET_PAUSE_STATE: case DEMUX_CAN_CONTROL_PACE: - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb = VLC_FALSE; + pb = (bool*)va_arg( args, bool * ); + *pb = false; return VLC_SUCCESS; case DEMUX_GET_PTS_DELAY: @@ -830,7 +829,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) static int process_options( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; - char *psz_dup; + char *psz_dup; char *psz_parser; char *token = NULL; char *state = NULL; @@ -856,7 +855,7 @@ static int process_options( demux_t *p_demux ) "video size of 160x120 is actually disabled for lack of chroma " "support. It will relased ASAP, until then try an higher size " "(320x240 and 640x480 are fully supported)" ); - free(psz_dup); + free( psz_dup ); return VLC_EGENERIC; #if 0 p_sys->frame_size = MODE_160x120_YUV444; @@ -883,7 +882,7 @@ static int process_options( demux_t *p_demux ) " 160x120, 320x240, and 640x480. " "Please specify one of them. You have specified %s.", token ); - free(psz_dup); + free( psz_dup ); return VLC_EGENERIC; } msg_Dbg( p_demux, "Requested video size : %s",token ); @@ -911,7 +910,7 @@ static int process_options( demux_t *p_demux ) " 1.875, 3.75, 7.5, 15, 30, 60. " "Please specify one of them. You have specified %s.", token); - free(psz_dup); + free( psz_dup ); return VLC_EGENERIC; } msg_Dbg( p_demux, "Requested frame rate : %s",token ); @@ -926,7 +925,7 @@ static int process_options( demux_t *p_demux ) msg_Err( p_demux, "Bad brightness value '%s', " "must be an unsigned integer.", token ); - free(psz_dup); + free( psz_dup ); return VLC_EGENERIC; } } @@ -955,7 +954,7 @@ static int process_options( demux_t *p_demux ) msg_Err( p_demux, "Bad camera number '%s', " "must be an unsigned integer.", token ); - free(psz_dup); + free( psz_dup ); return VLC_EGENERIC; } } @@ -977,7 +976,7 @@ static int process_options( demux_t *p_demux ) msg_Err(p_demux, "Bad capture method value '%s', " "it can be 'raw1394' or 'video1394'.", token ); - free(psz_dup); + free( psz_dup ); return VLC_EGENERIC; } } @@ -1008,7 +1007,7 @@ static int process_options( demux_t *p_demux ) sscanf( token, "0x%llx", &p_sys->selected_uid ); } } - if( psz_dup ) free( psz_dup ); + free( psz_dup ); return VLC_SUCCESS; }