X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Fdvb%2Faccess.c;h=d08a7a2dedfd530eca44e4af136b0076acc245d9;hb=6ee1e193fd896ab9a4729fde14f009d9ce629815;hp=f861ee23fcbd7657ed9b8a537951afc3c28bc824;hpb=dc8b128a9f34d9eb75d3158566cbb95df8bae61b;p=vlc

diff --git a/modules/access/dvb/access.c b/modules/access/dvb/access.c
index f861ee23fc..d08a7a2ded 100644
--- a/modules/access/dvb/access.c
+++ b/modules/access/dvb/access.c
@@ -28,8 +28,8 @@
  * Preamble
  *****************************************************************************/
 #include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc_interaction.h>
+#include <vlc_access.h>
+#include <vlc_interface.h>
 
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
@@ -181,7 +181,7 @@ static void Close( vlc_object_t *p_this );
 
 vlc_module_begin();
     set_shortname( _("DVB") );
-    set_shortname( _("DVB input with v4l2 support") );
+    set_description( _("DVB input with v4l2 support") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_ACCESS );
 
@@ -253,14 +253,21 @@ vlc_module_begin();
 #endif
 
     set_capability( "access2", 0 );
-    add_shortcut( "dvb" );
-    add_shortcut( "dvb-s" );
+    add_shortcut( "dvb" );      /* Generic name */
+
+    add_shortcut( "dvb-s" );    /* Satellite */
     add_shortcut( "qpsk" );
-    add_shortcut( "dvb-c" );
+    add_shortcut( "satellite" );
+
+    add_shortcut( "dvb-c" );    /* Cable */
     add_shortcut( "cable" );
-    add_shortcut( "dvb-t" );
+
+    add_shortcut( "dvb-t" );    /* Terrestrial */
     add_shortcut( "terrestrial" );
-    add_shortcut( "satellite" );    /* compatibility with the interface. */
+
+    add_shortcut( "atsc" );     /* Atsc */
+    add_shortcut( "usdigital" );
+
     set_callbacks( Open, Close );
 vlc_module_end();
 
@@ -308,6 +315,9 @@ static int Open( vlc_object_t *p_this )
     p_access->info.i_seekpoint = 0;
 
     p_access->p_sys = p_sys = malloc( sizeof( access_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
+
     memset( p_sys, 0, sizeof( access_sys_t ) );
 
     /* Create all variables */
@@ -713,7 +723,7 @@ static int ParseMRL( access_t *p_access )
     {
         msg_Err( p_access, "the DVB input old syntax is deprecated, use vlc "
                           "-p dvb to see an explanation of the new syntax" );
-        intf_UserFatal( p_access, VLC_TRUE, _("Input syntax is deprecated"), 
+        intf_UserFatal( p_access, VLC_TRUE, _("Input syntax is deprecated"),
             _("The given syntax is deprecated. Run \"vlc -p dvb\" to see an " \
                 "explanation of the new syntax.") );
         free( psz_dup );
@@ -760,7 +770,7 @@ static int ParseMRL( access_t *p_access )
             else
             {
                 msg_Err( p_access, "illegal polarization %c", *psz_parser );
-                intf_UserFatal( p_access, VLC_FALSE, _("Illegal Polarization"), 
+                intf_UserFatal( p_access, VLC_FALSE, _("Illegal Polarization"),
                                 _("The provided polarization \"%c\" is not valid."),
                                 *psz_parser );
                 free( psz_dup );