/*****************************************************************************
* access.c: DVB card input v4l2 only
*****************************************************************************
- * Copyright (C) 1998-2005 the VideoLAN team
+ * Copyright (C) 1998-2010 the VideoLAN team
*
* Authors: Johan Bilien <jobi@via.ecp.fr>
* Jean-Paul Saman <jpsaman _at_ videolan _dot_ org>
* Christophe Massiot <massiot@via.ecp.fr>
* Laurent Aimar <fenrir@via.ecp.fr>
+ * David Kaplan <david@2of1.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_input.h>
-#include <vlc_interface.h>
-#include <vlc_dialog.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#include <fcntl.h>
#include <sys/types.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <errno.h>
-/* Include dvbpsi headers */
-#ifdef HAVE_DVBPSI_DR_H
-# include <dvbpsi/dvbpsi.h>
-# include <dvbpsi/descriptor.h>
-# include <dvbpsi/pat.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/pat.h"
-# include "tables/pmt.h"
-# include "descriptors/dr.h"
-# include "psi.h"
-# include "demux.h"
-# include "tables/sdt.h"
-#endif
-
-#ifdef ENABLE_HTTPD
-# include "vlc_httpd.h"
-#endif
-
#include "dvb.h"
+#include "scan.h"
/*****************************************************************************
* Module descriptor
static int Open( vlc_object_t *p_this );
static void Close( vlc_object_t *p_this );
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
- "Caching value for DVB streams. This " \
- "value should be set in milliseconds." )
-
-#define ADAPTER_TEXT N_("Adapter card to tune")
-#define ADAPTER_LONGTEXT N_("Adapter cards have a device file in directory named /dev/dvb/adapter[n] with n>=0.")
-
-#define DEVICE_TEXT N_("Device number to use on adapter")
-#define DEVICE_LONGTEXT ""
-
-#define FREQ_TEXT N_("Transponder/multiplex frequency")
-#define FREQ_LONGTEXT N_("In kHz for DVB-S or Hz for DVB-C/T")
-
-#define INVERSION_TEXT N_("Inversion mode")
-#define INVERSION_LONGTEXT N_("Inversion mode [0=off, 1=on, 2=auto]")
-
#define PROBE_TEXT N_("Probe DVB card for capabilities")
#define PROBE_LONGTEXT N_("Some DVB cards do not like to be probed for their capabilities, you can disable this feature if you experience some trouble.")
-#define BUDGET_TEXT N_("Budget mode")
-#define BUDGET_LONGTEXT N_("This allows you to stream an entire transponder with a \"budget\" card.")
-
/* Satellite */
-#define SATNO_TEXT N_("Satellite number in the Diseqc system")
-#define SATNO_LONGTEXT N_("[0=no diseqc, 1-4=satellite number].")
-
-#define VOLTAGE_TEXT N_("LNB voltage")
-#define VOLTAGE_LONGTEXT N_("In Volts [0, 13=vertical, 18=horizontal].")
-
-#define HIGH_VOLTAGE_TEXT N_("High LNB voltage")
-#define HIGH_VOLTAGE_LONGTEXT N_("Enable high voltage if your cables are " \
- "particularly long. This is not supported by all frontends.")
-
-#define TONE_TEXT N_("22 kHz tone")
-#define TONE_LONGTEXT N_("[0=off, 1=on, -1=auto].")
-
-#define FEC_TEXT N_("Transponder FEC")
-#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode [9=auto].")
-
-#define SRATE_TEXT N_("Transponder symbol rate in kHz")
-#define SRATE_LONGTEXT ""
-
-#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (kHz)")
-#define LNB_LOF1_LONGTEXT ""
-
-#define LNB_LOF2_TEXT N_("Antenna lnb_lof2 (kHz)")
-#define LNB_LOF2_LONGTEXT ""
-
-#define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
-#define LNB_SLOF_LONGTEXT ""
-
-/* Cable */
-#define MODULATION_TEXT N_("Modulation type")
-#define MODULATION_LONGTEXT N_("Modulation type for front-end device.")
-
-/* Terrestrial */
-#define CODE_RATE_HP_TEXT N_("Terrestrial high priority stream code rate (FEC)")
-#define CODE_RATE_HP_LONGTEXT ""
-
-#define CODE_RATE_LP_TEXT N_("Terrestrial low priority stream code rate (FEC)")
-#define CODE_RATE_LP_LONGTEXT ""
-
-#define BANDWIDTH_TEXT N_("Terrestrial bandwidth")
-#define BANDWIDTH_LONGTEXT N_("Terrestrial bandwidth [0=auto,6,7,8 in MHz]")
-
-#define GUARD_TEXT N_("Terrestrial guard interval")
-#define GUARD_LONGTEXT ""
-
-#define TRANSMISSION_TEXT N_("Terrestrial transmission mode")
-#define TRANSMISSION_LONGTEXT ""
-
-#define HIERARCHY_TEXT N_("Terrestrial hierarchy mode")
-#define HIERARCHY_LONGTEXT ""
-
-#define HOST_TEXT N_( "HTTP Host address" )
-#define HOST_LONGTEXT N_( \
- "To enable the internal HTTP server, set its address and port here." )
-
-#define USER_TEXT N_( "HTTP user name" )
-#define USER_LONGTEXT N_( \
- "User name the administrator will use to log into " \
- "the internal HTTP server." )
-
-#define PASSWORD_TEXT N_( "HTTP password" )
-#define PASSWORD_LONGTEXT N_( \
- "Password the administrator will use to log into " \
- "the internal HTTP server." )
-
-#define ACL_TEXT N_( "HTTP ACL" )
-#define ACL_LONGTEXT N_( \
- "Access control list (equivalent to .hosts) file path, " \
- "which will limit the range of IPs entitled to log into the internal " \
- "HTTP server." )
-
-#define CERT_TEXT N_( "Certificate file" )
-#define CERT_LONGTEXT N_( "HTTP interface x509 PEM certificate file " \
- "(enables SSL)" )
-
-#define KEY_TEXT N_( "Private key file" )
-#define KEY_LONGTEXT N_( "HTTP interface x509 PEM private key file" )
-
-#define CA_TEXT N_( "Root CA file" )
-#define CA_LONGTEXT N_( "HTTP interface x509 PEM trusted root CA " \
- "certificates file" )
-
-#define CRL_TEXT N_( "CRL file" )
-#define CRL_LONGTEXT N_( "HTTP interface Certificates Revocation List file" )
+#define SATELLITE_TEXT N_("Satellite scanning config")
+#define SATELLITE_LONGTEXT N_("filename of config file in share/dvb/dvb-s")
vlc_module_begin ()
set_shortname( N_("DVB") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
- add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
- CACHING_LONGTEXT, true )
- add_integer( "dvb-adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
- false )
- add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
- true )
- add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT,
- false )
- add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT, INVERSION_LONGTEXT,
- true )
- add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
- add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
- true )
+ add_bool( "dvb-probe", true, PROBE_TEXT, PROBE_LONGTEXT, true )
/* DVB-S (satellite) */
- add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
- true )
- add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
- true )
- add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
- HIGH_VOLTAGE_LONGTEXT, true )
- add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
- true )
- add_integer( "dvb-fec", 9, NULL, FEC_TEXT, FEC_LONGTEXT, true )
- add_integer( "dvb-srate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
- false )
- add_integer( "dvb-lnb-lof1", 0, NULL, LNB_LOF1_TEXT,
- LNB_LOF1_LONGTEXT, true )
- add_integer( "dvb-lnb-lof2", 0, NULL, LNB_LOF2_TEXT,
- LNB_LOF2_LONGTEXT, true )
- add_integer( "dvb-lnb-slof", 0, NULL, LNB_SLOF_TEXT,
- LNB_SLOF_LONGTEXT, true )
- /* DVB-C (cable) */
- add_integer( "dvb-modulation", 0, NULL, MODULATION_TEXT,
- MODULATION_LONGTEXT, true )
- /* DVB-T (terrestrial) */
- add_integer( "dvb-code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT,
- CODE_RATE_HP_LONGTEXT, true )
- add_integer( "dvb-code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT,
- CODE_RATE_LP_LONGTEXT, true )
- add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
- true )
- add_integer( "dvb-guard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, true )
- add_integer( "dvb-transmission", 0, NULL, TRANSMISSION_TEXT,
- TRANSMISSION_LONGTEXT, true )
- add_integer( "dvb-hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
- true )
-#ifdef ENABLE_HTTPD
- /* MMI HTTP interface */
- set_section( N_("HTTP server" ), 0 )
- add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT,
- true )
- add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
- true )
- add_string( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
- PASSWORD_LONGTEXT, true )
- add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT,
- true )
- add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT,
- true )
- add_string( "dvb-http-intf-key", NULL, NULL, KEY_TEXT, KEY_LONGTEXT,
+ add_string( "dvb-satellite", NULL, SATELLITE_TEXT, SATELLITE_LONGTEXT,
true )
- add_string( "dvb-http-intf-ca", NULL, NULL, CA_TEXT, CA_LONGTEXT,
- true )
- add_string( "dvb-http-intf-crl", NULL, NULL, CRL_TEXT, CRL_LONGTEXT,
- true )
-#endif
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" )
+ add_shortcut( "dvb", /* Generic name */
+ "dvb-s", "qpsk", "satellite", /* Satellite */
+ "dvb-c", "cable", /* Cable */
+ "dvb-t", "terrestrial" ) /* Terrestrial */
set_callbacks( Open, Close )
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static block_t *Block( access_t * );
static int Control( access_t *, int, va_list );
static block_t *BlockScan( access_t * );
#define DVB_READ_ONCE_SCAN 1
#define TS_PACKET_SIZE 188
-#define DVB_SCAN_MAX_SIGNAL_TIME (300*1000)
+#define DVB_SCAN_MAX_SIGNAL_TIME (1000*1000)
#define DVB_SCAN_MAX_LOCK_TIME (5000*1000)
-#define DVB_SCAN_MAX_PROBE_TIME (30000*1000)
+#define DVB_SCAN_MAX_PROBE_TIME (45000*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 * );
if( *p_access->psz_access == '\0' )
return VLC_EGENERIC;
- /* Set up access */
- p_access->pf_read = NULL;
- p_access->pf_block = Block;
- p_access->pf_control = Control;
- p_access->pf_seek = NULL;
-
- access_InitFields( p_access );
-
p_access->p_sys = p_sys = calloc( 1, sizeof( access_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
if( ParseMRL( p_access ) )
{
free( p_sys );
+ var_Destroy( p_access, "dvb-modulation" );
+ var_Destroy( p_access, "dvb-fec" );
+ var_Destroy( p_access, "dvb-code-rate-hp" );
+ var_Destroy( p_access, "dvb-code-rate-lp" );
+ var_Destroy( p_access, "dvb-guard" );
return VLC_EGENERIC;
}
- /* Getting frontend info */
- if( FrontendOpen( p_access) )
- {
- free( p_sys );
- return VLC_EGENERIC;
- }
-
- /* */
- p_sys->b_scan_mode = var_GetInteger( p_access, "dvb-frequency" ) == 0;
- if( p_sys->b_scan_mode )
+ bool b_scan_mode = var_GetInteger( p_access, "dvb-frequency" ) == 0;
+ if( b_scan_mode )
{
msg_Dbg( p_access, "DVB scan mode selected" );
p_access->pf_block = BlockScan;
}
else
+ return VLC_EGENERIC; /* let the DTV plugin do the work */
+
+ /* Getting frontend info */
+ if( FrontendOpen( p_access) )
{
- /* 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;
- }
+ free( p_sys );
+ return VLC_EGENERIC;
}
/* Opening DVR device */
return VLC_EGENERIC;
}
- if( p_sys->b_scan_mode )
{
scan_parameter_t parameter;
+ scan_t *p_scan;
msg_Dbg( p_access, "setting filter on PAT/NIT/SDT (DVB only)" );
FilterSet( p_access, 0x00, OTHER_TYPE ); // PAT
FilterSet( p_access, 0x11, OTHER_TYPE ); // SDT
if( FrontendGetScanParameter( p_access, ¶meter ) ||
- scan_Init( VLC_OBJECT(p_access), &p_sys->scan, ¶meter ) )
+ (p_scan = scan_New( VLC_OBJECT(p_access), ¶meter )) == NULL )
{
Close( VLC_OBJECT(p_access) );
return VLC_EGENERIC;
}
- }
- else
- {
- 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 );
- }
-
- CAMOpen( p_access );
-
-#ifdef ENABLE_HTTPD
- HTTPOpen( p_access );
-#endif
+ p_sys->scan = p_scan;
+ p_sys->i_read_once = DVB_READ_ONCE_SCAN;
}
- 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;
+ /* Set up access */
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "m3u8" );
+ p_access->pf_read = NULL;
+ p_access->pf_control = Control;
+ p_access->pf_seek = NULL;
+ access_InitFields( p_access );
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 && !p_sys->b_scan_mode ? 1 : MAX_DEMUX );
+ FilterUnset( p_access, MAX_DEMUX );
DVRClose( p_access );
FrontendClose( p_access );
- if( p_sys->b_scan_mode )
- scan_Clean( &p_sys->scan );
- else
- CAMClose( p_access );
-
-#ifdef ENABLE_HTTPD
- if( !p_sys->b_scan_mode )
- HTTPClose( p_access );
-#endif
+ scan_Destroy( p_sys->scan );
free( p_sys );
}
-/*****************************************************************************
- * Block:
- *****************************************************************************/
-static block_t *Block( access_t *p_access )
-{
- access_sys_t *p_sys = p_access->p_sys;
- block_t *p_block;
-
- 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.5 second if nothing happens */
- /* Find if some data is available */
- i_ret = poll( ufds, 2, 500 );
-
- if ( !vlc_object_alive (p_access) )
- return NULL;
-
- if ( i_ret < 0 )
- {
- if( errno == EINTR )
- continue;
-
- msg_Err( p_access, "poll error: %m" );
- return NULL;
- }
-
- if ( p_sys->i_ca_handle && mdate() > p_sys->i_ca_next_event )
- {
- CAMPoll( p_access );
- p_sys->i_ca_next_event = mdate() + p_sys->i_ca_timeout;
- }
-
- if ( ufds[1].revents )
- {
- FrontendPoll( p_access );
- }
-
-#ifdef ENABLE_HTTPD
- if ( p_sys->i_httpd_timeout && mdate() > p_sys->i_httpd_timeout )
- {
- vlc_mutex_lock( &p_sys->httpd_mutex );
- if ( p_sys->b_request_frontend_info )
- {
- msg_Warn( p_access, "frontend timeout for HTTP interface" );
- 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 = false;
- p_sys->psz_mmi_info = strdup( "Timeout getting info\n" );
- }
- vlc_cond_signal( &p_sys->httpd_cond );
- vlc_mutex_unlock( &p_sys->httpd_mutex );
- }
-
- if ( p_sys->b_request_frontend_info )
- {
- FrontendStatus( p_access );
- }
-
- if ( p_sys->b_request_mmi_info )
- {
- CAMStatus( p_access );
- }
-#endif
-
- 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 )
- {
- p_block = block_New( p_access,
- p_sys->i_read_once * TS_PACKET_SIZE );
- 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 (%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_t *p_scan = p_sys->scan;
scan_configuration_t cfg;
- scan_session_t session;
/* */
if( scan_Next( p_scan, &cfg ) )
}
/* */
-
- if( scan_session_Init( VLC_OBJECT(p_access), &session, &cfg ) )
+ scan_session_t *session = scan_session_New( VLC_OBJECT(p_access), &cfg );
+ if( session == NULL )
return NULL;
/* */
msg_Dbg( p_access, "Scanning frequency %d", cfg.i_frequency );
var_SetInteger( p_access, "dvb-frequency", cfg.i_frequency );
+ msg_Dbg( p_access, " bandwidth %d", cfg.i_bandwidth );
var_SetInteger( p_access, "dvb-bandwidth", cfg.i_bandwidth );
+ if ( cfg.i_fec )
+ {
+ msg_Dbg( p_access, " FEC %d", cfg.i_fec );
+ var_SetInteger( p_access, "dvb-fec", cfg.i_fec );
+ }
+ if ( cfg.c_polarization )
+ var_SetInteger( p_access, "dvb-voltage", cfg.c_polarization == 'H' ? 18 : 13 );
+
+ if ( cfg.i_modulation )
+ var_SetInteger( p_access, "dvb-modulation", cfg.i_modulation );
+
+ if ( cfg.i_symbolrate )
+ var_SetInteger( p_access, "dvb-srate", cfg.i_symbolrate );
/* 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;
+ scan_session_Destroy( p_scan, session );
return NULL;
}
continue;
msg_Err( p_access, "poll error: %m" );
- scan_session_Clean( p_scan, &session );
+ scan_session_Destroy( p_scan, session );
p_access->info.b_eof = true;
return NULL;
p_block->i_buffer = i_ret;
/* */
- if( scan_session_Push( &session, p_block ) )
+ 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_service_SetSNR( session, i_best_snr );
- scan_session_Clean( p_scan, &session );
+ scan_session_Destroy( p_scan, session );
return NULL;
}
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
- access_sys_t *p_sys = p_access->p_sys;
- bool *pb_bool, b_bool;
- int i_int;
+ bool *pb_bool;
int64_t *pi_64;
double *pf1, *pf2;
- dvbpsi_pmt_t *p_pmt;
frontend_statistic_t stat;
switch( i_query )
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;
+ *pi_64 = DEFAULT_PTS_DELAY;
break;
/* */
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 = (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 ;) */
- if( b_bool )
- FilterSet( p_access, i_int, OTHER_TYPE );
- else
- FilterUnsetPID( p_access, i_int );
- }
- break;
-
case ACCESS_SET_PRIVATE_ID_CA:
- if( p_sys->b_scan_mode )
- return VLC_EGENERIC;
-
- p_pmt = (dvbpsi_pmt_t *)va_arg( args, dvbpsi_pmt_t * );
-
- CAMSet( p_access, p_pmt );
- break;
+ return VLC_EGENERIC;
default:
msg_Warn( p_access, "unimplemented query in control" );
}
}
-static void FilterUnsetPID( access_t *p_access, int i_pid )
-{
- access_sys_t *p_sys = p_access->p_sys;
- int i;
-
- for( i = 0; i < MAX_DEMUX; i++ )
- {
- if( p_sys->p_demux_handles[i].i_type &&
- p_sys->p_demux_handles[i].i_pid == i_pid )
- {
- DMXUnsetFilter( p_access, p_sys->p_demux_handles[i].i_handle );
- p_sys->p_demux_handles[i].i_type = 0;
- }
- }
-}
-
/*****************************************************************************
* VarInit/ParseMRL:
*****************************************************************************/
static void VarInit( access_t *p_access )
{
- /* */
- var_Create( p_access, "dvb-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Destroy( p_access, "dvb-modulation" );
+ var_Destroy( p_access, "dvb-fec" );
+ var_Destroy( p_access, "dvb-code-rate-hp" );
+ var_Destroy( p_access, "dvb-code-rate-lp" );
+ var_Destroy( p_access, "dvb-guard" );
/* */
var_Create( p_access, "dvb-adapter", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-frequency", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-inversion", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-probe", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-budget-mode", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
/* */
+ var_Create( p_access, "dvb-satellite", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-satno", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-voltage", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-high-voltage", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-tone", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-fec", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-fec", VLC_VAR_INTEGER );
var_Create( p_access, "dvb-srate", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-lnb-lof1", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-lnb-lof2", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-lnb-slof", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-lnb-lof1", VLC_VAR_INTEGER );
+ var_Create( p_access, "dvb-lnb-lof2", VLC_VAR_INTEGER );
+ var_Create( p_access, "dvb-lnb-slof", VLC_VAR_INTEGER );
/* */
- var_Create( p_access, "dvb-modulation", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-modulation", VLC_VAR_INTEGER );
/* */
- var_Create( p_access, "dvb-code-rate-hp", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-code-rate-lp", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-code-rate-hp", VLC_VAR_INTEGER );
+ var_Create( p_access, "dvb-code-rate-lp", VLC_VAR_INTEGER );
var_Create( p_access, "dvb-bandwidth", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Create( p_access, "dvb-transmission", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-guard", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_access, "dvb-guard", VLC_VAR_INTEGER );
var_Create( p_access, "dvb-hierarchy", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
-
-#ifdef ENABLE_HTTPD
- var_Create( p_access, "dvb-http-host", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-http-user", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-http-password", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-http-acl", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-http-intf-cert", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-http-intf-key", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-http-intf-ca", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_access, "dvb-http-intf-crl", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
-#endif
}
/* */
static int ParseMRL( access_t *p_access )
{
- char *psz_dup = strdup( p_access->psz_path );
+ char *psz_dup = strdup( p_access->psz_location );
char *psz_parser = psz_dup;
- char *psz_next;
vlc_value_t val;
#define GET_OPTION_INT( option ) \
var_Set( p_access, "dvb-" option, val ); \
}
- /* Test for old syntax */
- strtol( psz_parser, &psz_next, 10 );
- if( psz_next != psz_parser )
- {
- msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc "
- "-p dvb to see an explanation of the new syntax" );
- dialog_FatalWait( p_access, _("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;
+#define GET_OPTION_STRING( option ) \
+ if ( !strncmp( psz_parser, option "=", strlen( option "=" ) ) ) \
+ { \
+ psz_parser += strlen( option "=" ); \
+ val.psz_string = psz_parser; \
+ char *p_save; \
+ char *tok = strtok_r(val.psz_string, ":", &p_save); \
+ val.psz_string[tok - val.psz_string - 1] = 0; \
+ var_Set( p_access, "dvb-" option, val ); \
+ psz_parser += strlen( val.psz_string ); \
}
while( *psz_parser )
else GET_OPTION_BOOL("probe")
else GET_OPTION_BOOL("budget-mode")
+ else GET_OPTION_STRING("satellite")
else GET_OPTION_INT("voltage")
else GET_OPTION_BOOL("high-voltage")
else GET_OPTION_INT("tone")
else
{
msg_Err( p_access, "illegal polarization %c", *psz_parser );
- dialog_Fatal( p_access, _("Invalid polarization"),
- _("The provided polarization \"%c\" is not valid."),
- *psz_parser );
free( psz_dup );
return VLC_EGENERIC;
}
}
#undef GET_OPTION_INT
#undef GET_OPTION_BOOL
+#undef GET_OPTION_STRING
free( psz_dup );
return VLC_SUCCESS;
projects / vlc / blobdiff