Commit a875b83c authored by Jean-Paul Saman's avatar Jean-Paul Saman

Tuning succeeds, but have no audio yet. Major cleanup of code.

parent f853698b
This diff is collapsed.
This diff is collapsed.
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
/***************************************************************************** /*****************************************************************************
* Devices location * Devices location
*****************************************************************************/ *****************************************************************************/
/*
#define DMX "/dev/dvb/adapter1/demux0"
#define FRONTEND "/dev/dvb/adapter1/frontend0"
#define DVR "/dev/dvb/adapter1/dvr0"
*/
#define DMX "/dev/dvb/adapter%d/demux%d" #define DMX "/dev/dvb/adapter%d/demux%d"
#define FRONTEND "/dev/dvb/adapter%d/frontend%d" #define FRONTEND "/dev/dvb/adapter%d/frontend%d"
#define DVR "/dev/dvb/adapter%d/dvr%d" #define DVR "/dev/dvb/adapter%d/dvr%d"
...@@ -38,8 +33,9 @@ ...@@ -38,8 +33,9 @@
/***************************************************************************** /*****************************************************************************
* Prototypes * Prototypes
*****************************************************************************/ *****************************************************************************/
int ioctl_FrontendControl( int freq, int pol, int lnb_slof, int diseqc, unsigned int u_adapter, unsigned int u_device ); int ioctl_FrontendControl(input_thread_t *p_input, int freq, int pol, int lnb_slof, int diseqc, unsigned int u_adapter, unsigned int u_device );
int ioctl_SetQPSKFrontend ( struct dvb_frontend_parameters fep, int b_polarisation, unsigned int u_adapter, unsigned int u_device ); int ioctl_SetQPSKFrontend (input_thread_t * p_input, struct dvb_frontend_parameters fep, int b_polarisation, unsigned int u_adapter, unsigned int u_device );
int ioctl_SetDMXFilter( int i_pid, int *pi_fd, int i_type, unsigned int u_adapter, unsigned int u_device ); int ioctl_SetDMXFilter(input_thread_t * p_input, int i_pid, int *pi_fd, int i_type, unsigned int u_adapter, unsigned int u_device );
int ioctl_UnsetDMXFilter( int ); int ioctl_UnsetDMXFilter(input_thread_t * p_input, int );
int ioctl_InfoFrontend(struct dvb_frontend_info *info, unsigned int u_adapter, unsigned int u_device ); int ioctl_InfoFrontend(input_thread_t * p_input, struct dvb_frontend_info *info, unsigned int u_adapter, unsigned int u_device );
...@@ -70,8 +70,8 @@ void E_(Close) ( vlc_object_t * ); ...@@ -70,8 +70,8 @@ void E_(Close) ( vlc_object_t * );
#define LNB_SLOF_TEXT N_("antenna lnb_slof (kHz)") #define LNB_SLOF_TEXT N_("antenna lnb_slof (kHz)")
#define LNB_SLOF_LONGTEXT "" #define LNB_SLOF_LONGTEXT ""
#define NO_PROBE_TEXT N_("do not probe the dvb card for capabilities") #define PROBE_TEXT N_("probe the dvb card for capabilities (default disabled)")
#define NO_PROBE_LONGTEXT N_("some dvb cards do not like to be probed for their capabilities") #define PROBE_LONGTEXT N_("some dvb cards do not like to be probed for their capabilities")
vlc_module_begin(); vlc_module_begin();
add_category_hint( N_("Input"), NULL, VLC_FALSE ); add_category_hint( N_("Input"), NULL, VLC_FALSE );
...@@ -88,10 +88,9 @@ vlc_module_begin(); ...@@ -88,10 +88,9 @@ vlc_module_begin();
LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT, VLC_FALSE ); LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT, VLC_FALSE );
add_integer( "lnb-slof", 11700, NULL, add_integer( "lnb-slof", 11700, NULL,
LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, VLC_FALSE ); LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, VLC_FALSE );
add_bool( "no-probe", 1, NULL, NO_PROBE_TEXT, NO_PROBE_LONGTEXT, VLC_FALSE ); add_bool( "probe", 0, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_FALSE );
set_description( _("DVB input module with v4l2 support") ); set_description( _("DVB input module with v4l2 support") );
set_capability( "access", 0 ); set_capability( "access", 0 );
// add_shortcut( "satellite" );
add_shortcut( "qpsk" ); add_shortcut( "qpsk" );
// add_shortcut( "cable" ); // add_shortcut( "cable" );
// add_shortcut( "terrestrial" ); // add_shortcut( "terrestrial" );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment