* 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.
*****************************************************************************/
/*****************************************************************************
"named /dev/dvb/adapter[n] with n>=0.")
#define DEVICE_TEXT N_("Device number to use on adapter")
-#define DEVICE_LONGTEXT ""
+#define DEVICE_LONGTEXT NULL
#define FREQ_TEXT N_("Transponder/multiplex frequency")
#if defined(WIN32) || defined(WINCE)
/* Satellite */
#if defined(WIN32) || defined(WINCE)
# define NETID_TEXT N_("Network Identifier")
-# define NETID_LONGTEXT ""
+# define NETID_LONGTEXT NULL
#else
# define SATNO_TEXT N_("Satellite number in the Diseqc system")
# define SATNO_LONGTEXT N_("[0=no diseqc, 1-4=satellite number].")
#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode [9=auto].")
#define SRATE_TEXT N_("Transponder symbol rate in kHz")
-#define SRATE_LONGTEXT ""
+#define SRATE_LONGTEXT NULL
#define LNB_LOF1_TEXT N_("Antenna lnb_lof1 (kHz)")
#define LNB_LOF1_LONGTEXT N_("Low Band Local Osc Freq in kHz (usually 9.75GHz)")
add_integer( "dvb-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
CACHING_LONGTEXT, true )
+ change_safe()
add_integer( "dvb-frequency", 0, NULL, FREQ_TEXT, FREQ_LONGTEXT,
false )
+ change_safe()
# if defined(WIN32) || defined(WINCE)
add_string( "dvb-network-name", NULL, NULL, NAME_TEXT, NAME_LONGTEXT,
true )
/* dvb-device refers to a frontend within an adapter */
add_integer( "dvb-device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
true )
- add_bool( "dvb-probe", 1, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
- add_bool( "dvb-budget-mode", 0, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
+ add_bool( "dvb-probe", true, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
+ add_bool( "dvb-budget-mode", false, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
true )
# endif
true )
add_integer( "dvb-voltage", 13, NULL, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
true )
- add_bool( "dvb-high-voltage", 0, NULL, HIGH_VOLTAGE_TEXT,
+ add_bool( "dvb-high-voltage", false, NULL, HIGH_VOLTAGE_TEXT,
HIGH_VOLTAGE_LONGTEXT, true )
add_integer( "dvb-tone", -1, NULL, TONE_TEXT, TONE_LONGTEXT,
true )
add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
false )
change_integer_list( i_band_list, ppsz_band_text, NULL )
+ change_safe()
add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true )
change_integer_list( i_guard_list, ppsz_guard_text, NULL )
add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT,
change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL )
set_capability( "access", 0 )
- add_shortcut( "dvb" ) /* Generic name */
-
- add_shortcut( "dvb-s" ) /* Satellite */
- add_shortcut( "dvbs" )
- add_shortcut( "qpsk" )
- add_shortcut( "satellite" )
-
- add_shortcut( "dvb-c" ) /* Cable */
- add_shortcut( "dvbc" )
- add_shortcut( "qam" )
- add_shortcut( "cable" )
-
- add_shortcut( "dvbt" ) /* Terrestrial */
- add_shortcut( "dvb-t" )
- add_shortcut( "ofdm" )
- add_shortcut( "terrestrial" )
-
- add_shortcut( "atsc" ) /* Atsc */
- add_shortcut( "usdigital" )
+ add_shortcut( "dvb", /* Generic name */
+ "dvb-s", "dvbs", /* Satellite */
+ "dvb-c", "dvbc", /* Cable */
+ "dvb-t", "dvbt", /* Terrestrial */
+ "atsc", /* Atsc */
+ "cqam",) /* Clear QAM */
set_callbacks( Open, Close )
vlc_module_end ()
for( int i = 0; i < i_param_count; i++ )
{
- snprintf( psz_full_name, 128, "%s-%s\0", psz_module,
+ snprintf( psz_full_name, 128, "%s-%s", psz_module,
psz_param[i] );
var_Create( p_access, psz_full_name, i_type[i] | VLC_VAR_DOINHERIT );
}
i_ret = VLC_EGENERIC;
- if( strncmp( p_access->psz_access, "qpsk", 4 ) == 0 ||
- strncmp( p_access->psz_access, "dvb-s", 5 ) == 0 ||
- strncmp( p_access->psz_access, "dvbs", 4 ) == 0 ||
- strncmp( p_access->psz_access, "satellite", 9 ) == 0 )
+ if( strncmp( p_access->psz_access, "dvb-s", 5 ) == 0 ||
+ strncmp( p_access->psz_access, "dvbs", 4 ) == 0 )
{
i_ret = dvb_SubmitDVBSTuneRequest( p_access );
}
- if( strncmp( p_access->psz_access, "cable", 5 ) == 0 ||
- strncmp( p_access->psz_access, "dvb-c", 5 ) == 0 ||
- strncmp( p_access->psz_access, "dvbc", 4 ) == 0 ||
- strncmp( p_access->psz_access, "qam", 3 ) == 0 )
+ if( strncmp( p_access->psz_access, "dvb-c", 5 ) == 0 ||
+ strncmp( p_access->psz_access, "dvbc", 4 ) == 0 )
{
i_ret = dvb_SubmitDVBCTuneRequest( p_access );
}
- if( strncmp( p_access->psz_access, "terrestrial", 11 ) == 0 ||
- strncmp( p_access->psz_access, "dvb-t", 5 ) == 0 ||
- strncmp( p_access->psz_access, "ofdm", 4 ) == 0 ||
+ if( strncmp( p_access->psz_access, "dvb-t", 5 ) == 0 ||
strncmp( p_access->psz_access, "dvbt", 4 ) == 0 )
{
i_ret = dvb_SubmitDVBTTuneRequest( p_access );
}
- if( strncmp( p_access->psz_access, "usdigital", 9 ) == 0 ||
- strncmp( p_access->psz_access, "atsc", 4 ) == 0 )
+ if( strncmp( p_access->psz_access, "atsc", 4 ) == 0 )
{
i_ret = dvb_SubmitATSCTuneRequest( p_access );
}
+ if( strncmp( p_access->psz_access, "cqam", 4 ) == 0 )
+ {
+ i_ret = dvb_SubmitCQAMTuneRequest( p_access );
+ }
if( !strcmp( p_access->psz_access, "dvb" ) )
{
/* Try to auto detect */
i_ret = dvb_SubmitDVBTTuneRequest( p_access );
if( i_ret )
i_ret = dvb_SubmitATSCTuneRequest( p_access );
+ if( i_ret )
+ i_ret = dvb_SubmitCQAMTuneRequest( p_access );
}
if( !i_ret )
+ {
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "ts" );
+ }
else
+ {
msg_Warn( p_access, "DVB_Open: Unsupported Network %s",
p_access->psz_access);
+ }
return i_ret;
}
}
for( int i = 0; i < i_param_count; i++ )
b_used[i] = false;
- psz_parser = p_access->psz_path;
+ psz_parser = p_access->psz_location;
if( strlen( psz_parser ) <= 0 )
return VLC_SUCCESS;
v_value.psz_string = strdup( psz_value );
if( i_type[i_this_param] == VLC_VAR_INTEGER )
v_value.i_int = atol( psz_value );
- snprintf( psz_full_name, 128, "%s-%s\0", psz_module,
+ snprintf( psz_full_name, 128, "%s-%s", psz_module,
psz_param[i_this_param] );
var_Set( p_access, psz_full_name, v_value );
static int Control( access_t *p_access, int i_query, va_list args )
{
bool *pb_bool, b_bool;
- int *pi_int, i_int;
+ int i_int;
int64_t *pi_64;
switch( i_query )
break;
case ACCESS_GET_PTS_DELAY: /* 5 */
pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = var_GetInteger( p_access, "dvb-caching" ) * 1000;
+ *pi_64 = (int64_t)var_GetInteger( p_access, "dvb-caching" ) * 1000;
break;
/* */
case ACCESS_GET_TITLE_INFO: /* 6 */
b_bool = (bool)va_arg( args, int );
break;
case ACCESS_SET_PRIVATE_ID_CA: /* 12 -From Demux */
- break;
+ return VLC_EGENERIC;
default:
msg_Warn( p_access,
"DVB_Control: Unimplemented query in control %d", i_query );
projects / vlc / blobdiff