* modules/access/*: strings review + coding style fixes.

[vlc] / modules / access / dvb / qpsk.c

diff --git a/modules/access/dvb/qpsk.c b/modules/access/dvb/qpsk.c
index 98ece85065b08e0a4be1cc0f3a1c436e7f8d76bf..909f666448315eca2fb3d947aec8b88790f29451 100644 (file)
--- a/modules/access/dvb/qpsk.c
+++ b/modules/access/dvb/qpsk.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * qpsk.c : Satellite input module for vlc
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003-2004 VideoLAN
  *
  * Authors: Sam Hocevar <sam@zoy.org>
  *          Jean-Paul Saman <jpsaman@wxs.nl>
@@ -41,84 +41,97 @@ void E_(Close)   ( vlc_object_t * );
  *****************************************************************************/
 
 /* Satellite options */
-#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 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_TEXT N_("Device number to use on adapter")
 #define DEVICE_LONGTEXT ""
 
-#define FREQ_TEXT N_("satellite default transponder frequency in kHz")
+#define FREQ_TEXT N_("Satellite transponder frequency in kHz")
 #define FREQ_LONGTEXT ""
 
-#define POL_TEXT N_("satellite default transponder polarization")
+#define POL_TEXT N_("Satellite transponder polarization")
 #define POL_LONGTEXT ""
 
-#define FEC_TEXT N_("satellite default transponder FEC")
-#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode")
+#define FEC_TEXT N_("Satellite transponder FEC")
+#define FEC_LONGTEXT N_("FEC=Forward Error Correction mode.")
 
-#define SRATE_TEXT N_("satellite default transponder symbol rate in kHz")
+#define SRATE_TEXT N_("Satellite transponder symbol rate in kHz")
 #define SRATE_LONGTEXT ""
 
-#define DISEQC_TEXT N_("use diseqc with antenna")
+#define DISEQC_TEXT N_("Use diseqc with antenna")
 #define DISEQC_LONGTEXT ""
 
-#define LNB_LOF1_TEXT N_("antenna lnb_lof1 (kHz)")
+#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_TEXT N_("Antenna lnb_lof2 (kHz)")
 #define LNB_LOF2_LONGTEXT ""
 
-#define LNB_SLOF_TEXT N_("antenna lnb_slof (kHz)")
+#define LNB_SLOF_TEXT N_("Antenna lnb_slof (kHz)")
 #define LNB_SLOF_LONGTEXT ""
 
-#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")
+#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.")
 
 /* Cable */
-#define MODULATION_TEXT N_("modulation type")
-#define MODULATION_LONGTEXT N_("modulation type for frontend device ")
+#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_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_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 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_TEXT N_("Terrestrial guard interval")
 #define GUARD_LONGTEXT ""
 
-#define TRANSMISSION_TEXT N_("terrestrial transmission mode")
+#define TRANSMISSION_TEXT N_("Terrestrial transmission mode")
 #define TRANSMISSION_LONGTEXT ""
 
-#define HIERARCHY_TEXT N_("terrestrial hierarchy mode")
+#define HIERARCHY_TEXT N_("Terrestrial hierarchy mode")
 #define HIERARCHY_LONGTEXT ""
 
 vlc_module_begin();
-    set_description( _("DVB input module with v4l2 support") );
+    set_description( _("DVB input with v4l2 support") );
+
+    add_integer( "adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
+                 VLC_FALSE );
+    add_integer( "device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, VLC_FALSE );
+    add_integer( "frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT,
+                 VLC_FALSE );
+    add_integer( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT, VLC_FALSE );
+    add_integer( "fec", 3, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_FALSE );
+    add_integer( "symbol-rate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT,
+                 VLC_FALSE );
+    add_bool( "diseqc", 0, NULL, DISEQC_TEXT, DISEQC_LONGTEXT, VLC_TRUE );
+    add_integer( "lnb-lof1",  9750000, NULL, LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT,
+                 VLC_TRUE );
+    add_integer( "lnb-lof2", 12999000, NULL, LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT,
+                 VLC_TRUE );
+    add_integer( "lnb-slof", 11700000, NULL, LNB_SLOF_TEXT, LNB_SLOF_LONGTEXT,
+                 VLC_TRUE );
+    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_TRUE );
+    add_integer( "code-rate-lp", 9, NULL, CODE_RATE_LP_TEXT,
+                 CODE_RATE_LP_LONGTEXT, VLC_TRUE );
+    add_integer( "bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
+                 VLC_TRUE );
+    add_integer( "modulation", 0, NULL, MODULATION_TEXT, MODULATION_LONGTEXT,
+                 VLC_TRUE );
+    add_integer( "guard", 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_capability( "access", 0 );
-    add_category_hint( N_("Input"), NULL, VLC_FALSE );
-        add_integer( "adapter", 0, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT, VLC_FALSE );
-        add_integer( "device", 0, NULL, DEVICE_TEXT, DEVICE_LONGTEXT, VLC_FALSE );
-        add_integer( "frequency", 11954000, NULL, FREQ_TEXT, FREQ_LONGTEXT, VLC_FALSE );
-        add_integer( "polarization", 0, NULL, POL_TEXT, POL_LONGTEXT, VLC_FALSE );
-        add_integer( "fec", 3, NULL, FEC_TEXT, FEC_LONGTEXT, VLC_FALSE );
-        add_integer( "symbol-rate", 27500000, NULL, SRATE_TEXT, SRATE_LONGTEXT, VLC_FALSE );
-        add_bool( "diseqc", 0, NULL, DISEQC_TEXT, DISEQC_LONGTEXT, VLC_FALSE );
-        add_integer( "lnb-lof1",  9750000, NULL, LNB_LOF1_TEXT, LNB_LOF1_LONGTEXT, VLC_FALSE );
-        add_integer( "lnb-lof2", 12999000, NULL, LNB_LOF2_TEXT, LNB_LOF2_LONGTEXT, VLC_FALSE );
-        add_integer( "lnb-slof", 11700000, 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( "guard", 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 );
     add_shortcut( "qpsk" );
     add_shortcut( "cable" );
     add_shortcut( "terrestrial" );
@@ -126,4 +139,3 @@ vlc_module_begin();
     add_shortcut( "satellite" );
     set_callbacks( E_(Open), E_(Close) );
 vlc_module_end();
-