- Enabled tuning for DVB-C and DVB-T cards.

- Syncing with old satellite plugin.
- Cleanup of code.

modules/access/dvb/dvb.h

@@ -34,8 +34,18 @@
  * Prototypes
  *****************************************************************************/
 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 (input_thread_t * p_input, struct dvb_frontend_parameters fep, int b_polarisation, unsigned int u_adapter, unsigned int u_device );
+int ioctl_SetFrontend (input_thread_t * p_input, struct dvb_frontend_parameters fep, int b_polarisation, 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(input_thread_t * p_input, int );
 int ioctl_InfoFrontend(input_thread_t * p_input, struct dvb_frontend_info *info, unsigned int u_adapter, unsigned int u_device );
 
+/*****************************************************************************
+ * dvb argument helper functions 
+ *****************************************************************************/
+fe_bandwidth_t dvb_DecodeBandwidth(input_thread_t * p_input, int bandwidth);
+fe_code_rate_t dvb_DecodeFEC(input_thread_t * p_input, int fec);
+fe_modulation_t dvb_DecodeModulation(input_thread_t * p_input, int modulation);
+fe_transmit_mode_t dvb_DecodeTransmission(input_thread_t * p_input, int transmission);
+fe_guard_interval_t dvb_DecodeGuardInterval(input_thread_t * p_input, int guard);
+fe_hierarchy_t dvb_DecodeHierarchy(input_thread_t * p_input, int hierarchy);
+fe_spectral_inversion_t dvb_DecodeInversion(input_thread_t * p_input, int inversion);

modules/access/dvb/qpsk.c

@@ -40,8 +40,9 @@ void E_(Close)   ( vlc_object_t * );
  * Module descriptor
  *****************************************************************************/
 
+/* Satellite options */
 #define ADAPTER_TEXT N_("adapter card to tune")
-#define ADAPTER_LONGTEXT ""
+#define ADAPTER_LONGTEXT N_("adapter cards have a device file named /dev/dvb/adapter[n] with n>=0")
 
 #define DEVICE_TEXT N_("device nummer to use on adapter")
 #define DEVICE_LONGTEXT ""
@@ -53,7 +54,7 @@ void E_(Close)   ( vlc_object_t * );
 #define POL_LONGTEXT ""
 
 #define FEC_TEXT N_("satellite default transponder FEC")
-#define FEC_LONGTEXT ""
+#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode")
 
 #define SRATE_TEXT N_("satellite default transponder symbol rate")
 #define SRATE_LONGTEXT ""
@@ -73,6 +74,29 @@ void E_(Close)   ( vlc_object_t * );
 #define PROBE_TEXT	N_("probe the dvb card for capabilities (default disabled)")
 #define PROBE_LONGTEXT N_("some dvb cards do not like to be probed for their capabilities")
 
+/* Cable */
+#define MODULATION_TEXT N_("modulation type")
+#define MODULATION_LONGTEXT N_("modulation type for frontend 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 ""
+
 vlc_module_begin();
     add_category_hint( N_("Input"), NULL, VLC_FALSE );
 			  add_integer( "adapter", 1, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, VLC_FALSE );
@@ -89,12 +113,20 @@ vlc_module_begin();
         add_integer( "lnb-slof", 11700, NULL,
                      LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT, VLC_FALSE );
 			  add_bool( "probe", 0, NULL, PROBE_TEXT, PROBE_LONGTEXT, VLC_FALSE );
+	      add_integer( "code-rate-hp", 9, NULL, CODE_RATE_HP_TEXT, CODE_RATE_HP_LONGTEXT, VLC_FALSE );
+	      add_integer( "code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT, CODE_RATE_LP_LONGTEXT, VLC_FALSE );
+			  add_integer( "bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT, VLC_FALSE );
+			  add_integer( "modulation", 0, NULL, MODULATION_TEXT, MODULATION_LONGTEXT, VLC_FALSE );
+			  add_integer( "quard", 0, NULL, GUARD_TEXT, GUARD_LONGTEXT, VLC_TRUE );
+			  add_integer( "transmission", 0, NULL, TRANSMISSION_TEXT, TRANSMISSION_LONGTEXT, VLC_TRUE );
+			  add_integer( "hierarchy", 0, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT, VLC_TRUE );
     set_description( _("DVB input module with v4l2 support") );
     set_capability( "access", 0 );
 		add_shortcut( "qpsk" );
-//    add_shortcut( "cable" );
-//    add_shortcut( "terrestrial" );
+    add_shortcut( "cable" );
+    add_shortcut( "terrestrial" );
     add_shortcut( "dvb" );
+    add_shortcut( "satellite" );
     set_callbacks( E_(Open), E_(Close) );
 vlc_module_end();