#include <string.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/vout.h>
-#include <vlc_interaction.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+#include <vlc_demux.h>
+#include <vlc_vout.h>
+#include <vlc_interface.h>
#include "common.h"
#include "filter.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static char *ppsz_vdev[] = { "", "none" };
-static char *ppsz_vdev_text[] = { N_("Default"), N_("None") };
-static char *ppsz_adev[] = { "", "none" };
-static char *ppsz_adev_text[] = { N_("Default"), N_("None") };
+static const char *ppsz_vdev[] = { "", "none" };
+static const char *ppsz_vdev_text[] = { N_("Default"), N_("None") };
+static const char *ppsz_adev[] = { "", "none" };
+static const char *ppsz_adev_text[] = { N_("Default"), N_("None") };
static int pi_tuner_input[] = { 0, 1, 2 };
-static char *ppsz_tuner_input_text[] =
+static const char *ppsz_tuner_input_text[] =
{N_("Default"), N_("Cable"), N_("Antenna")};
-static int pi_amtuner_mode[] = { AMTUNER_MODE_DEFAULT,
+static const int pi_amtuner_mode[] = { AMTUNER_MODE_DEFAULT,
AMTUNER_MODE_TV,
AMTUNER_MODE_FM_RADIO,
AMTUNER_MODE_AM_RADIO,
AMTUNER_MODE_DSS };
-static char *ppsz_amtuner_mode_text[] = { N_("Default"),
+static const char *ppsz_amtuner_mode_text[] = { N_("Default"),
N_("TV"),
N_("FM radio"),
N_("AM radio"),
#define VIDEO_IN_TEXT N_("Video input pin")
#define VIDEO_IN_LONGTEXT N_( \
"Select the video input source, such as composite, s-video, " \
- "or tuner. Since these settings are hardware-specfic, you should find good " \
+ "or tuner. Since these settings are hardware-specific, you should find good " \
"settings in the \"Device config\" area, and use those numbers here. -1 " \
"means that settings will not be changed.")
#define AUDIO_IN_TEXT N_("Audio input pin")
{
msg_Err( p_this, "can't use device: %s, unsupported device type",
devicename.c_str() );
- intf_UserFatal( p_vout, VLC_FALSE, _("Capturing failed"),
+ intf_UserFatal( p_this, VLC_FALSE, _("Capturing failed"),
_("VLC cannot use the device \"%s\", because its device "
"type is not supported.") );
return VLC_EGENERIC;
}
sample.p_sample->GetPointer( &p_data );
- p_access->p_vlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
+ p_access->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
sample.p_sample->Release();
/* The caller got what he wanted */
#endif
p_block = block_New( p_demux, i_data_size );
- p_demux->p_vlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
+ p_demux->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
p_block->i_pts = p_block->i_dts = i_pts;
sample.p_sample->Release();
/* Keep the 2 first entries */
for( i = 2; i < p_item->i_list; i++ )
{
- free( p_item->ppsz_list[i] );
- free( p_item->ppsz_list_text[i] );
+ free( const_cast<char *>(p_item->ppsz_list[i]) );
+ free( const_cast<char *>(p_item->ppsz_list_text[i]) );
}
/* TODO: Remove when no more needed */
p_item->ppsz_list[i] = NULL;
if( !list_devices.size() ) return VLC_SUCCESS;
p_item->ppsz_list =
- (char **)realloc( p_item->ppsz_list,
+ (const char **)realloc( p_item->ppsz_list,
(list_devices.size()+3) * sizeof(char *) );
p_item->ppsz_list_text =
- (char **)realloc( p_item->ppsz_list_text,
+ (const char **)realloc( p_item->ppsz_list_text,
(list_devices.size()+3) * sizeof(char *) );
list<string>::iterator iter;