*****************************************************************************
* 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,
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_vout.h>
#include <vlc_demux.h>
-#include <stdio.h>
-#include <string.h>
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
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 );
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 );
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 );
}
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;
}
*****************************************************************************/
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:
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;
"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;
" 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 );
" 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 );
msg_Err( p_demux, "Bad brightness value '%s', "
"must be an unsigned integer.",
token );
- free(psz_dup);
+ free( psz_dup );
return VLC_EGENERIC;
}
}
msg_Err( p_demux, "Bad camera number '%s', "
"must be an unsigned integer.",
token );
- free(psz_dup);
+ free( psz_dup );
return VLC_EGENERIC;
}
}
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;
}
}
sscanf( token, "0x%llx", &p_sys->selected_uid );
}
}
- if( psz_dup ) free( psz_dup );
+ free( psz_dup );
return VLC_SUCCESS;
}