X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Fvlmshell.c;h=90c59d985f6ead7e0a1979ba8423ea3c781f36b4;hb=a2846406835a6143c1c70623aa9fe53917b6a41a;hp=9db54d95232b52d671502b2f483e77c393f88e3f;hpb=8e18f5c6cdc3d3dba06a3e04d1f460ee694634a4;p=vlc

diff --git a/src/input/vlmshell.c b/src/input/vlmshell.c
index 9db54d9523..90c59d985f 100644
--- a/src/input/vlmshell.c
+++ b/src/input/vlmshell.c
@@ -30,7 +30,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <stdio.h>
 #include <ctype.h>                                              /* tolower() */
@@ -438,7 +438,7 @@ static int ExecuteControl( vlm_t *p_vlm, const char *psz_name, const int i_arg,
             else
             {
                 /* Percent */
-                double d_new_position = i18n_atof( psz_argument ) / 100.0;
+                double d_new_position = us_atof( psz_argument ) / 100.0;
 
                 if( b_relative )
                 {
@@ -463,7 +463,7 @@ static int ExecuteControl( vlm_t *p_vlm, const char *psz_name, const int i_arg,
     {
         if( psz_argument )
         {
-            const double d_scale = i18n_atof( psz_argument );
+            const double d_scale = us_atof( psz_argument );
             double d_position;
 
             vlm_ControlInternal( p_vlm, VLM_GET_MEDIA_INSTANCE_POSITION, p_media->cfg.id, psz_instance, &d_position );
@@ -481,7 +481,7 @@ static int ExecuteControl( vlm_t *p_vlm, const char *psz_name, const int i_arg,
     {
         if( psz_argument )
         {
-            const double d_scale = i18n_atof( psz_argument );
+            const double d_scale = us_atof( psz_argument );
             double d_position;
 
             vlm_ControlInternal( p_vlm, VLM_GET_MEDIA_INSTANCE_POSITION, p_media->cfg.id, psz_instance, &d_position );
@@ -968,17 +968,12 @@ vlm_media_sys_t *vlm_MediaSearch( vlm_t *vlm, const char *psz_name )
  *****************************************************************************/
 static vlm_schedule_sys_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name )
 {
-    vlm_schedule_sys_t *p_sched = malloc( sizeof( vlm_schedule_sys_t ) );
-
-    if( !p_sched )
-    {
+    if( !psz_name )
         return NULL;
-    }
 
-    if( !psz_name )
-    {
+    vlm_schedule_sys_t *p_sched = malloc( sizeof( vlm_schedule_sys_t ) );
+    if( !p_sched )
         return NULL;
-    }
 
     p_sched->psz_name = strdup( psz_name );
     p_sched->b_enabled = false;