Commit 8ee76f64 authored by Sam Hocevar's avatar Sam Hocevar

 . ajout de #ifdef pour ne pas avoir de console X en mode framebuffer
 . mode --novlans par d�faut
parent 723948d9
...@@ -80,8 +80,10 @@ int intf_Run( intf_thread_t *p_intf ) ...@@ -80,8 +80,10 @@ int intf_Run( intf_thread_t *p_intf )
/* Flush waiting messages */ /* Flush waiting messages */
intf_FlushMsg(); intf_FlushMsg();
#ifndef FRAMEBUFFER
/* Manage specific interfaces */ /* Manage specific interfaces */
intf_ManageXConsole( &p_intf->xconsole ); /* X11 console */ intf_ManageXConsole( &p_intf->xconsole ); /* X11 console */
#endif
/* Sleep to avoid using all CPU - since some interfaces needs to access /* Sleep to avoid using all CPU - since some interfaces needs to access
* keyboard events, a 100ms delay is a good compromise */ * keyboard events, a 100ms delay is a good compromise */
...@@ -119,12 +121,16 @@ static int StartInterface( intf_thread_t *p_intf ) ...@@ -119,12 +121,16 @@ static int StartInterface( intf_thread_t *p_intf )
p_intf->pp_input[i_thread] = NULL; p_intf->pp_input[i_thread] = NULL;
} }
#ifdef FRAMEBUFFER
intf_DbgMsg("intf debug: not opening X11 console\n");
#else
/* Start X11 Console*/ /* Start X11 Console*/
if( intf_OpenXConsole( &p_intf->xconsole ) ) if( intf_OpenXConsole( &p_intf->xconsole ) )
{ {
intf_ErrMsg("intf error: can't open X11 console\n"); intf_ErrMsg("intf error: can't open X11 console\n");
return( 1 ); return( 1 );
} }
#endif
#ifdef INIT_SCRIPT #ifdef INIT_SCRIPT
/* Execute the initialization script (typically spawn an input thread) */ /* Execute the initialization script (typically spawn an input thread) */
...@@ -151,9 +157,10 @@ static void EndInterface( intf_thread_t *p_intf ) ...@@ -151,9 +157,10 @@ static void EndInterface( intf_thread_t *p_intf )
int pi_vout_status[VOUT_MAX_THREADS]; /* vout threads status */ int pi_vout_status[VOUT_MAX_THREADS]; /* vout threads status */
#ifndef FRAMEBUFFER
/* Close X11 console */ /* Close X11 console */
intf_CloseXConsole( &p_intf->xconsole ); intf_CloseXConsole( &p_intf->xconsole );
#endif
/* Destroy all remaining input threads */ /* Destroy all remaining input threads */
for( i_thread = 0; i_thread < INPUT_MAX_THREADS; i_thread++ ) for( i_thread = 0; i_thread < INPUT_MAX_THREADS; i_thread++ )
......
...@@ -265,7 +265,7 @@ static void SetDefaultConfiguration( program_data_t *p_data ) ...@@ -265,7 +265,7 @@ static void SetDefaultConfiguration( program_data_t *p_data )
p_data->vout_cfg.i_properties = 0; p_data->vout_cfg.i_properties = 0;
/* VLAN management */ /* 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.psz_input_vlan_server = VLAN_DEFAULT_SERVER;
p_data->cfg.i_input_vlan_server_port = VLAN_DEFAULT_SERVER_PORT; p_data->cfg.i_input_vlan_server_port = VLAN_DEFAULT_SERVER_PORT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment