. ajout de #ifdef pour ne pas avoir de console X en mode framebuffer

 . mode --novlans par d�faut

diff --git a/src/interface/interface.c b/src/interface/interface.c
index f86b632ef9e14e92a3a66f37ae2336c6e42edcfc..c382dce8cabc1491f756927b5ffb2b11c82210e1 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -80,8 +80,10 @@ int intf_Run( intf_thread_t *p_intf )
         /* Flush waiting messages */
         intf_FlushMsg();
 
+#ifndef FRAMEBUFFER
         /* Manage specific interfaces */
         intf_ManageXConsole( &p_intf->xconsole );               /* X11 console */
+#endif
 
         /* Sleep to avoid using all CPU - since some interfaces needs to access 
          * keyboard events, a 100ms delay is a good compromise */
@@ -119,12 +121,16 @@ static int StartInterface( intf_thread_t *p_intf )
         p_intf->pp_input[i_thread] = NULL;        
     }    
 
+#ifdef FRAMEBUFFER
+    intf_DbgMsg("intf debug: not opening X11 console\n");
+#else
     /* Start X11 Console*/
     if( intf_OpenXConsole( &p_intf->xconsole ) )
     {
         intf_ErrMsg("intf error: can't open X11 console\n");
         return( 1 );
     }
+#endif
 
 #ifdef INIT_SCRIPT
     /* Execute the initialization script (typically spawn an input thread) */
@@ -151,9 +157,10 @@ static void EndInterface( intf_thread_t *p_intf )
     int         pi_vout_status[VOUT_MAX_THREADS];       /* vout threads status */
     
     
-    
+#ifndef FRAMEBUFFER    
     /* Close X11 console */
     intf_CloseXConsole( &p_intf->xconsole );        
+#endif
 
     /* Destroy all remaining input threads */
     for( i_thread = 0; i_thread < INPUT_MAX_THREADS; i_thread++ )

diff --git a/src/interface/main.c b/src/interface/main.c
index 7edd9f35cdb2a122252540a9dd608dcf0a75248c..0af3275bdd103b796f447bcdb380fe41d033aaa5 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -265,7 +265,7 @@ static void SetDefaultConfiguration( program_data_t *p_data )
     p_data->vout_cfg.i_properties =         0;
 
     /* VLAN management */
-    p_data->cfg.b_vlans =                   1;    
+    p_data->cfg.b_vlans =                   0;    
     p_data->cfg.psz_input_vlan_server =     VLAN_DEFAULT_SERVER;
     p_data->cfg.i_input_vlan_server_port =  VLAN_DEFAULT_SERVER_PORT;    
 }