/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
-#include <vlc/input.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_access.h>
+#include <vlc_input.h>
+#include <vlc_interface.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
# include <dvbpsi/pmt.h>
# include <dvbpsi/dr.h>
# include <dvbpsi/psi.h>
+# include <dvbpsi/demux.h>
+# include <dvbpsi/sdt.h>
#else
# include "dvbpsi.h"
# include "descriptor.h"
# include "tables/pmt.h"
# include "descriptors/dr.h"
# include "psi.h"
+# include "demux.h"
+# include "tables/sdt.h"
#endif
#ifdef ENABLE_HTTPD
#define CRL_TEXT N_( "CRL file" )
#define CRL_LONGTEXT N_( "HTTP interface Certificates Revocation List file" )
-vlc_module_begin();
- set_shortname( _("DVB") );
- set_description( N_("DVB input with v4l2 support") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
+vlc_module_begin ()
+ set_shortname( N_("DVB") )
+ set_description( N_("DVB input with v4l2 support") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
- CACHING_LONGTEXT, VLC_TRUE );
+ CACHING_LONGTEXT, true )
add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
- VLC_FALSE );
+ false )
add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
- VLC_TRUE );
- add_integer( "dvb-frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT,
- VLC_FALSE );
+ true )
+ add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT,
+ false )
add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT,
- VLC_TRUE );
- add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_TRUE );
+ true )
+ add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
- VLC_TRUE );
+ true )
/* DVB-S (satellite) */
add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
- VLC_TRUE );
+ true )
add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
- VLC_TRUE );
+ true )
add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
- HIGH_VOLTAGE_LONGTEXT, VLC_TRUE );
+ HIGH_VOLTAGE_LONGTEXT, true )
add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
- VLC_TRUE );
- add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_TRUE );
+ true )
+ add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true )
add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
- VLC_FALSE );
+ false )
add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
- LNB_LOF1_LONGTEXT, VLC_TRUE );
+ LNB_LOF1_LONGTEXT, true )
add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
- LNB_LOF2_LONGTEXT, VLC_TRUE );
+ LNB_LOF2_LONGTEXT, true )
add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
- LNB_SLOF_LONGTEXT, VLC_TRUE );
+ LNB_SLOF_LONGTEXT, true )
/* DVB-C (cable) */
add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT,
- MODULATION_LONGTEXT, VLC_TRUE );
+ MODULATION_LONGTEXT, true )
/* DVB-T (terrestrial) */
add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT,
- CODE_RATE_HP_LONGTEXT, VLC_TRUE );
+ CODE_RATE_HP_LONGTEXT, true )
add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT,
- CODE_RATE_LP_LONGTEXT, VLC_TRUE );
+ CODE_RATE_LP_LONGTEXT, true )
add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
- VLC_TRUE );
- add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE );
+ true )
+ add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, true )
add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT,
- TRANSMISSION_LONGTEXT, VLC_TRUE );
+ TRANSMISSION_LONGTEXT, true )
add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
- VLC_TRUE );
+ true )
#ifdef ENABLE_HTTPD
/* MMI HTTP interface */
- set_section( N_("HTTP server" ), 0 );
+ set_section( N_("HTTP server" ), 0 )
add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT,
- VLC_TRUE );
+ true )
add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
- VLC_TRUE );
+ true )
add_string( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
- PASSWORD_LONGTEXT, VLC_TRUE );
+ PASSWORD_LONGTEXT, true )
add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT,
- VLC_TRUE );
+ true )
add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT,
- VLC_TRUE );
+ true )
add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT,
- VLC_TRUE );
+ true )
add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT,
- VLC_TRUE );
+ true )
add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT,
- VLC_TRUE );
+ true )
#endif
- set_capability( "access2", 0 );
- add_shortcut( "dvb" );
- add_shortcut( "dvb-s" );
- add_shortcut( "qpsk" );
- add_shortcut( "dvb-c" );
- add_shortcut( "cable" );
- add_shortcut( "dvb-t" );
- add_shortcut( "terrestrial" );
- add_shortcut( "satellite" ); /* compatibility with the interface. */
- set_callbacks( Open, Close );
-vlc_module_end();
+ set_capability( "access", 0 )
+ add_shortcut( "dvb" ) /* Generic name */
+
+ add_shortcut( "dvb-s" ) /* Satellite */
+ add_shortcut( "qpsk" )
+ add_shortcut( "satellite" )
+
+ add_shortcut( "dvb-c" ) /* Cable */
+ add_shortcut( "cable" )
+
+ add_shortcut( "dvb-t" ) /* Terrestrial */
+ add_shortcut( "terrestrial" )
+
+ add_shortcut( "atsc" ) /* Atsc */
+ add_shortcut( "usdigital" )
+
+ set_callbacks( Open, Close )
+
+vlc_module_end ()
/*****************************************************************************
static block_t *Block( access_t * );
static int Control( access_t *, int, va_list );
+static block_t *BlockScan( access_t * );
+
#define DVB_READ_ONCE 20
#define DVB_READ_ONCE_START 2
+#define DVB_READ_ONCE_SCAN 1
#define TS_PACKET_SIZE 188
+#define DVB_SCAN_MAX_SIGNAL_TIME (300*1000)
+#define DVB_SCAN_MAX_LOCK_TIME (5000*1000)
+#define DVB_SCAN_MAX_PROBE_TIME (30000*1000)
+
static void FilterUnset( access_t *, int i_max );
static void FilterUnsetPID( access_t *, int i_pid );
static void FilterSet( access_t *, int i_pid, int i_type );
static void VarInit( access_t * );
static int ParseMRL( access_t * );
-
/*****************************************************************************
* Open: open the frontend device
*****************************************************************************/
p_access->pf_block = Block;
p_access->pf_control = Control;
p_access->pf_seek = NULL;
- p_access->info.i_update = 0;
- p_access->info.i_size = 0;
- p_access->info.i_pos = 0;
- p_access->info.b_eof = VLC_FALSE;
- p_access->info.i_title = 0;
- p_access->info.i_seekpoint = 0;
- p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
- memset( p_sys, 0, sizeof( access_sys_t ) );
+ access_InitFields( p_access );
+
+ p_access->p_sys = p_sys = calloc( 1, sizeof( access_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
/* Create all variables */
VarInit( p_access );
}
/* Getting frontend info */
- if( E_(FrontendOpen)( p_access) )
+ if( FrontendOpen( p_access) )
{
free( p_sys );
return VLC_EGENERIC;
}
- /* Setting frontend parameters for tuning the hardware */
- msg_Dbg( p_access, "trying to tune the frontend...");
- if( E_(FrontendSet)( p_access ) < 0 )
+ /* */
+ p_sys->b_scan_mode = var_GetInteger( p_access, "dvb-frequency" ) == 0;
+ if( p_sys->b_scan_mode )
{
- E_(FrontendClose)( p_access );
- free( p_sys );
- return VLC_EGENERIC;
+ msg_Dbg( p_access, "DVB scan mode selected" );
+ p_access->pf_block = BlockScan;
+ }
+ else
+ {
+ /* Setting frontend parameters for tuning the hardware */
+ msg_Dbg( p_access, "trying to tune the frontend...");
+ if( FrontendSet( p_access ) < 0 )
+ {
+ FrontendClose( p_access );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
}
/* Opening DVR device */
- if( E_(DVROpen)( p_access ) < 0 )
+ if( DVROpen( p_access ) < 0 )
{
- E_(FrontendClose)( p_access );
+ FrontendClose( p_access );
free( p_sys );
return VLC_EGENERIC;
}
- p_sys->b_budget_mode = var_GetBool( p_access, "dvb-budget-mode" );
- if( p_sys->b_budget_mode )
+ if( p_sys->b_scan_mode )
{
- msg_Dbg( p_access, "setting filter on all PIDs" );
- FilterSet( p_access, 0x2000, OTHER_TYPE );
+ scan_parameter_t parameter;
+
+ msg_Dbg( p_access, "setting filter on PAT/NIT/SDT (DVB only)" );
+ FilterSet( p_access, 0x00, OTHER_TYPE ); // PAT
+ FilterSet( p_access, 0x10, OTHER_TYPE ); // NIT
+ FilterSet( p_access, 0x11, OTHER_TYPE ); // SDT
+
+ if( FrontendGetScanParameter( p_access, ¶meter ) ||
+ scan_Init( VLC_OBJECT(p_access), &p_sys->scan, ¶meter ) )
+ {
+ Close( VLC_OBJECT(p_access) );
+ return VLC_EGENERIC;
+ }
}
else
{
- msg_Dbg( p_access, "setting filter on PAT" );
- FilterSet( p_access, 0x0, OTHER_TYPE );
- }
+ p_sys->b_budget_mode = var_GetBool( p_access, "dvb-budget-mode" );
+ if( p_sys->b_budget_mode )
+ {
+ msg_Dbg( p_access, "setting filter on all PIDs" );
+ FilterSet( p_access, 0x2000, OTHER_TYPE );
+ }
+ else
+ {
+ msg_Dbg( p_access, "setting filter on PAT" );
+ FilterSet( p_access, 0x0, OTHER_TYPE );
+ }
- E_(CAMOpen)( p_access );
+ CAMOpen( p_access );
- if( p_sys->b_budget_mode )
+#ifdef ENABLE_HTTPD
+ HTTPOpen( p_access );
+#endif
+ }
+
+ if( p_sys->b_scan_mode )
+ p_sys->i_read_once = DVB_READ_ONCE_SCAN;
+ else if( p_sys->b_budget_mode )
p_sys->i_read_once = DVB_READ_ONCE;
else
p_sys->i_read_once = DVB_READ_ONCE_START;
-#ifdef ENABLE_HTTPD
- E_(HTTPOpen)( p_access );
-#endif
-
return VLC_SUCCESS;
}
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys = p_access->p_sys;
- FilterUnset( p_access, p_sys->b_budget_mode ? 1 : MAX_DEMUX );
+ FilterUnset( p_access, p_sys->b_budget_mode && !p_sys->b_scan_mode ? 1 : MAX_DEMUX );
- E_(DVRClose)( p_access );
- E_(FrontendClose)( p_access );
- E_(CAMClose)( p_access );
+ DVRClose( p_access );
+ FrontendClose( p_access );
+ if( p_sys->b_scan_mode )
+ scan_Clean( &p_sys->scan );
+ else
+ CAMClose( p_access );
#ifdef ENABLE_HTTPD
- E_(HTTPClose)( p_access );
+ if( !p_sys->b_scan_mode )
+ HTTPClose( p_access );
#endif
free( p_sys );
ufds[0].fd = p_sys->i_handle;
ufds[0].events = POLLIN;
ufds[1].fd = p_sys->i_frontend_handle;
- ufds[1].events = POLLOUT;
+ ufds[1].events = POLLPRI;
/* We'll wait 0.5 second if nothing happens */
/* Find if some data is available */
i_ret = poll( ufds, 2, 500 );
- if ( p_access->b_die )
+ if ( !vlc_object_alive (p_access) )
return NULL;
if ( i_ret < 0 )
if( errno == EINTR )
continue;
- msg_Err( p_access, "poll error: %s", strerror(errno) );
+ msg_Err( p_access, "poll error: %m" );
return NULL;
}
if ( p_sys->i_ca_handle && mdate() > p_sys->i_ca_next_event )
{
- E_(CAMPoll)( p_access );
+ CAMPoll( p_access );
p_sys->i_ca_next_event = mdate() + p_sys->i_ca_timeout;
}
if ( ufds[1].revents )
{
- E_(FrontendPoll)( p_access );
+ FrontendPoll( p_access );
}
#ifdef ENABLE_HTTPD
if ( p_sys->b_request_frontend_info )
{
msg_Warn( p_access, "frontend timeout for HTTP interface" );
- p_sys->b_request_frontend_info = VLC_FALSE;
+ p_sys->b_request_frontend_info = false;
p_sys->psz_frontend_info = strdup( "Timeout getting info\n" );
}
if ( p_sys->b_request_mmi_info )
{
msg_Warn( p_access, "MMI timeout for HTTP interface" );
- p_sys->b_request_mmi_info = VLC_FALSE;
+ p_sys->b_request_mmi_info = false;
p_sys->psz_mmi_info = strdup( "Timeout getting info\n" );
}
vlc_cond_signal( &p_sys->httpd_cond );
if ( p_sys->b_request_frontend_info )
{
- E_(FrontendStatus)( p_access );
+ FrontendStatus( p_access );
}
if ( p_sys->b_request_mmi_info )
{
- E_(CAMStatus)( p_access );
+ CAMStatus( p_access );
}
#endif
if ( p_sys->i_frontend_timeout && mdate() > p_sys->i_frontend_timeout )
{
msg_Warn( p_access, "no lock, tuning again" );
- E_(FrontendSet)( p_access );
+ FrontendSet( p_access );
}
if ( ufds[0].revents )
{
p_block = block_New( p_access,
p_sys->i_read_once * TS_PACKET_SIZE );
- if( ( p_block->i_buffer = read( p_sys->i_handle, p_block->p_buffer,
+ if( ( i_ret = read( p_sys->i_handle, p_block->p_buffer,
p_sys->i_read_once * TS_PACKET_SIZE ) ) <= 0 )
{
- msg_Warn( p_access, "read failed (%s)", strerror(errno) );
+ msg_Warn( p_access, "read failed (%m)" );
block_Release( p_block );
continue;
}
+ p_block->i_buffer = i_ret;
break;
}
}
if( p_sys->i_read_once < DVB_READ_ONCE )
p_sys->i_read_once++;
+ /* Update moderatly the signal properties */
+ if( (p_sys->i_stat_counter++ % 100) == 0 )
+ p_access->info.i_update |= INPUT_UPDATE_SIGNAL;
+
return p_block;
}
+/*****************************************************************************
+ * BlockScan:
+ *****************************************************************************/
+static block_t *BlockScan( access_t *p_access )
+{
+ access_sys_t *p_sys = p_access->p_sys;
+ scan_t *p_scan = &p_sys->scan;
+ scan_configuration_t cfg;
+ scan_session_t session;
+
+ /* */
+ if( scan_Next( p_scan, &cfg ) )
+ {
+ const bool b_first_eof = !p_access->info.b_eof;
+
+ if( b_first_eof )
+ msg_Warn( p_access, "Scanning finished" );
+
+ /* */
+ p_access->info.b_eof = true;
+ return b_first_eof ? scan_GetM3U( p_scan ) : NULL;
+ }
+
+ /* */
+
+ if( scan_session_Init( VLC_OBJECT(p_access), &session, &cfg ) )
+ return NULL;
+
+ /* */
+ msg_Dbg( p_access, "Scanning frequency %d", cfg.i_frequency );
+ var_SetInteger( p_access, "dvb-frequency", cfg.i_frequency );
+ var_SetInteger( p_access, "dvb-bandwidth", cfg.i_bandwidth );
+
+ /* Setting frontend parameters for tuning the hardware */
+ if( FrontendSet( p_access ) < 0 )
+ {
+ msg_Err( p_access, "Failed to tune the frontend" );
+ p_access->info.b_eof = true;
+ return NULL;
+ }
+
+ /* */
+ int64_t i_scan_start = mdate();
+
+ bool b_has_dvb_signal = false;
+ bool b_has_lock = false;
+ int i_best_snr = -1;
+
+ for ( ; ; )
+ {
+ struct pollfd ufds[2];
+ int i_ret;
+
+ /* Initialize file descriptor sets */
+ memset (ufds, 0, sizeof (ufds));
+ ufds[0].fd = p_sys->i_handle;
+ ufds[0].events = POLLIN;
+ ufds[1].fd = p_sys->i_frontend_handle;
+ ufds[1].events = POLLPRI;
+
+ /* We'll wait 0.1 second if nothing happens */
+ /* Find if some data is available */
+ i_ret = poll( ufds, 2, 100 );
+
+ if( !vlc_object_alive (p_access) || scan_IsCancelled( p_scan ) )
+ break;
+
+ if( i_ret <= 0 )
+ {
+ const mtime_t i_scan_time = mdate() - i_scan_start;
+ frontend_status_t status;
+
+ FrontendGetStatus( p_access, &status );
+
+ b_has_dvb_signal |= status.b_has_carrier;
+ b_has_lock |= status.b_has_lock;
+
+ if( ( !b_has_dvb_signal && i_scan_time > DVB_SCAN_MAX_SIGNAL_TIME ) ||
+ ( !b_has_lock && i_scan_time > DVB_SCAN_MAX_LOCK_TIME ) ||
+ ( i_scan_time > DVB_SCAN_MAX_PROBE_TIME ) )
+ {
+ msg_Dbg( p_access, "timed out scanning current frequency (s=%d l=%d)", b_has_dvb_signal, b_has_lock );
+ break;
+ }
+ }
+
+ if( i_ret < 0 )
+ {
+ if( errno == EINTR )
+ continue;
+
+ msg_Err( p_access, "poll error: %m" );
+ scan_session_Clean( p_scan, &session );
+
+ p_access->info.b_eof = true;
+ return NULL;
+ }
+
+ if( ufds[1].revents )
+ {
+ frontend_statistic_t stat;
+
+ FrontendPoll( p_access );
+
+ if( !FrontendGetStatistic( p_access, &stat ) )
+ {
+ if( stat.i_snr > i_best_snr )
+ i_best_snr = stat.i_snr;
+ }
+ }
+
+ if ( p_sys->i_frontend_timeout && mdate() > p_sys->i_frontend_timeout )
+ {
+ msg_Warn( p_access, "no lock, tuning again" );
+ FrontendSet( p_access );
+ }
+
+ if ( ufds[0].revents )
+ {
+ const int i_read_once = 1;
+ block_t *p_block = block_New( p_access, i_read_once * TS_PACKET_SIZE );
+
+ if( ( i_ret = read( p_sys->i_handle, p_block->p_buffer,
+ i_read_once * TS_PACKET_SIZE ) ) <= 0 )
+ {
+ msg_Warn( p_access, "read failed (%m)" );
+ block_Release( p_block );
+ continue;
+ }
+ p_block->i_buffer = i_ret;
+
+ /* */
+ if( scan_session_Push( &session, p_block ) )
+ {
+ msg_Dbg( p_access, "finished scanning current frequency" );
+ break;
+ }
+ }
+ }
+
+ /* */
+ if( i_best_snr > 0 )
+ scan_service_SetSNR( &session, i_best_snr );
+
+ scan_session_Clean( p_scan, &session );
+ return NULL;
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
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, b_bool;
- int *pi_int, i_int;
+ bool *pb_bool, b_bool;
+ int i_int;
int64_t *pi_64;
+ double *pf1, *pf2;
+ dvbpsi_pmt_t *p_pmt;
+ frontend_statistic_t stat;
switch( i_query )
{
case ACCESS_CAN_FASTSEEK:
case ACCESS_CAN_PAUSE:
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_MTU:
- pi_int = (int*)va_arg( args, int * );
- *pi_int = DVB_READ_ONCE * TS_PACKET_SIZE;
- break;
-
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
+ case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
+ case ACCESS_GET_SIGNAL:
+ pf1 = (double*)va_arg( args, double * );
+ pf2 = (double*)va_arg( args, double * );
+
+ *pf1 = *pf2 = 0;
+ if( !FrontendGetStatistic( p_access, &stat ) )
+ {
+ *pf1 = (double)stat.i_snr / 65535.0;
+ *pf2 = (double)stat.i_signal_strenth / 65535.0;
+ }
+ return VLC_SUCCESS;
+
case ACCESS_SET_PRIVATE_ID_STATE:
+ if( p_sys->b_scan_mode )
+ return VLC_EGENERIC;
+
i_int = (int)va_arg( args, int ); /* Private data (pid for now)*/
- b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t ); /* b_selected */
+ b_bool = (bool)va_arg( args, int ); /* b_selected */
if( !p_sys->b_budget_mode )
{
/* FIXME we may want to give the real type (me ?, I don't ;) */
break;
case ACCESS_SET_PRIVATE_ID_CA:
- {
- dvbpsi_pmt_t *p_pmt;
+ if( p_sys->b_scan_mode )
+ return VLC_EGENERIC;
p_pmt = (dvbpsi_pmt_t *)va_arg( args, dvbpsi_pmt_t * );
- E_(CAMSet)( p_access, p_pmt );
+ CAMSet( p_access, p_pmt );
break;
- }
default:
msg_Warn( p_access, "unimplemented query in control" );
return;
}
- if( E_(DMXSetFilter)( p_access, i_pid,
+ if( DMXSetFilter( p_access, i_pid,
&p_sys->p_demux_handles[i].i_handle, i_type ) )
{
msg_Err( p_access, "DMXSetFilter failed" );
{
if( p_sys->p_demux_handles[i].i_type )
{
- E_(DMXUnsetFilter)( p_access, p_sys->p_demux_handles[i].i_handle );
+ DMXUnsetFilter( p_access, p_sys->p_demux_handles[i].i_handle );
p_sys->p_demux_handles[i].i_type = 0;
}
}
if( p_sys->p_demux_handles[i].i_type &&
p_sys->p_demux_handles[i].i_pid == i_pid )
{
- E_(DMXUnsetFilter)( p_access, p_sys->p_demux_handles[i].i_handle );
+ DMXUnsetFilter( p_access, p_sys->p_demux_handles[i].i_handle );
p_sys->p_demux_handles[i].i_type = 0;
}
}
{
msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc "
"-p dvb to see an explanation of the new syntax" );
+ intf_UserFatal( p_access, true, _("Input syntax is deprecated"),
+ _("The given syntax is deprecated. Run \"vlc -p dvb\" to see an " \
+ "explanation of the new syntax.") );
free( psz_dup );
return VLC_EGENERIC;
}
else
{
msg_Err( p_access, "illegal polarization %c", *psz_parser );
+ intf_UserFatal( p_access, false, _("Illegal Polarization"),
+ _("The provided polarization \"%c\" is not valid."),
+ *psz_parser );
free( psz_dup );
return VLC_EGENERIC;
}
projects / vlc / blobdiff