[vlc-devel] commit: Revert " Avoid huge CPU comsumption when rc and --daemon are use at the same time" ( Rafaël Carré )

[git version control]

vlc | branch: 0.8.6-bugfix | Rafaël Carré <funman at videolan.org> | Mon May 12 12:44:02 2008 +0200| [643f11c411510d757f898ad790dc4253142aa62b]

Revert "Avoid huge CPU comsumption when rc and --daemon are use at the same time"

This reverts commit c37341f13f0d0a7ef847a9caf1688d01882627ce.
Wrong fix, do not trust Ubuntu users.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=643f11c411510d757f898ad790dc4253142aa62b
---

 modules/control/rc.c |   14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 28c85db..3ad9247 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -141,12 +141,8 @@ void __msg_rc( intf_thread_t *p_intf, const char *psz_fmt, ... )
 
     if( p_intf->p_sys->i_socket == -1 )
     {
-        if (!config_GetInt( p_intf, "rc-fake-tty" ))
-        {
-            utf8_vfprintf( stdout, psz_fmt, args );
-            printf( "\r\n" );
-        }
-
+        utf8_vfprintf( stdout, psz_fmt, args );
+        printf( "\r\n" );
     }
     else
     {
@@ -2301,12 +2297,6 @@ vlc_bool_t ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size )
     }
 #endif
 
-   if (p_intf->p_sys->i_socket == -1 && config_GetInt( p_intf, "rc-fake-tty" ))
-   {
-        msleep( INTF_IDLE_SLEEP );
-        return VLC_FALSE;
-   }
-
     while( !p_intf->b_die && *pi_size < MAX_LINE_LENGTH &&
            (i_read = net_ReadNonBlock( p_intf, p_intf->p_sys->i_socket == -1 ?
                        0 /*STDIN_FILENO*/ : p_intf->p_sys->i_socket, NULL,