.changed option --novlans to --vlans to test vlan server

.removed return 0 in LoadChannels

vlc.channels works again and with vlan soon...

diff --git a/src/interface/interface.c b/src/interface/interface.c
index e46b423cab3252034458260bdefd869fc652db89..ce990066e2efd11cc1b79144a3ffc7a8e63a17b4 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -411,7 +411,7 @@ int intf_ProcessKey( intf_thread_t *p_intf, int g_key )
     case INTF_KEY_SET_CHANNEL:
         /* Change channel - return code is ignored since SelectChannel displays
          * its own error messages */
-        intf_SelectChannel( p_intf, k_reply.param - '0' );
+        intf_SelectChannel( p_intf, k_reply.param );
         break;
     case INTF_KEY_INC_VOLUME:                                                    /* volume + */
         if( (p_main->p_aout != NULL) && (p_main->p_aout->vol < VOLMAX) )
@@ -521,7 +521,7 @@ static int LoadChannels( intf_thread_t *p_intf, char *psz_filename )
     p_intf->p_channel = NULL;
 
     /* FIXME: channels are disabled */
-    return( 0 );
+    //return( 0 );
 
     /* Open file */
     p_file = fopen( psz_filename, "r" );

diff --git a/src/interface/main.c b/src/interface/main.c
index 785a9ea55fd5ce8ccad6c0d6a2602a02575ab109..5dace591f5878c4bdd016983812f9f2fc0a04c51 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -76,7 +76,7 @@
 #define OPT_COLOR               165
 #define OPT_YUV                 166
 
-#define OPT_NOVLANS             170
+#define OPT_VLANS               170
 #define OPT_SERVER              171
 #define OPT_PORT                172
 #define OPT_BROADCAST           173
@@ -120,7 +120,7 @@ static const struct option longopts[] =
     {   "dvdsubtitle",      1,          0,      's' },
     
     /* Input options */
-    {   "novlans",          0,          0,      OPT_NOVLANS },
+    {   "vlans",            0,          0,      OPT_VLANS },
     {   "server",           1,          0,      OPT_SERVER },
     {   "port",             1,          0,      OPT_PORT },
     {   "broadcast",        0,          0,      OPT_BROADCAST },
@@ -415,7 +415,7 @@ static void SetDefaultConfiguration( void )
      */
     p_main->b_audio  = 1;
     p_main->b_video  = 1;
-    p_main->b_vlans  = 1;
+    p_main->b_vlans  = 0;
 }
 
 /*****************************************************************************
@@ -534,8 +534,8 @@ static int GetConfiguration( int i_argc, char *ppsz_argv[], char *ppsz_env[] )
             break;
 
         /* Input options */
-        case OPT_NOVLANS:                                       /* --novlans */
-            p_main->b_vlans = 0;
+        case OPT_VLANS:                                       /* --vlans */
+            p_main->b_vlans = 1;
             break;
         case OPT_SERVER:                                         /* --server */
             main_PutPszVariable( INPUT_SERVER_VAR, optarg );
@@ -606,7 +606,7 @@ static void Usage( int i_fashion )
               "  -c, --dvdchannel <channel>     \tchoose DVD audio channel\n"
               "  -s, --dvdsubtitle <channel>    \tchoose DVD subtitle channel\n"
               "\n"
-              "      --novlans                  \tdisable vlans\n"
+              "      --vlans                    \tenable vlans\n"
               "      --server <host>            \tvideo server address\n"
               "      --port <port>              \tvideo server port\n"
               "      --broadcast                \tlisten to a broadcast\n"