[vlc-commits] oldrc: inline Quit()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 19 19:35:30 2019 +0300| [872f721a9532407e9a13690c5b2940fdb5589641] | committer: Rémi Denis-Courmont

oldrc: inline Quit()

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

 modules/control/oldrc.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/modules/control/oldrc.c b/modules/control/oldrc.c
index 5c4f25d543..f3f34e4a8a 100644
--- a/modules/control/oldrc.c
+++ b/modules/control/oldrc.c
@@ -79,7 +79,6 @@ static input_item_t *parse_MRL( const char * );
 
 static int  Input        ( vlc_object_t *, char const *, vlc_value_t );
 static int  Playlist     ( vlc_object_t *, char const *, vlc_value_t );
-static int  Quit         ( vlc_object_t *, char const *, vlc_value_t );
 static int  Intf         ( vlc_object_t *, char const *, vlc_value_t );
 static int  Volume       ( vlc_object_t *, char const *, vlc_value_t );
 static int  VolumeMove   ( vlc_object_t *, char const *, vlc_value_t );
@@ -582,6 +581,9 @@ static void *Run( void *data )
             psz_arg = (char*)"";
         }
 
+        if( !strcmp( psz_cmd, "quit" ) )
+            libvlc_Quit( vlc_object_instance(p_intf) );
+
 #define VOID(name, func) \
         if (strcmp(psz_cmd, name) == 0) { \
             vlc_value_t n; \
@@ -594,7 +596,7 @@ static void *Run( void *data )
             func(VLC_OBJECT(p_intf), psz_cmd, n); \
         } else
 
-        VOID("quit", Quit)
+
         STRING("intf", Intf)
 
         STRING("add", Playlist)
@@ -1339,16 +1341,6 @@ end:
     return ret;
 }
 
-static int Quit( vlc_object_t *p_this, char const *psz_cmd,
-                 vlc_value_t newval )
-{
-    VLC_UNUSED(psz_cmd);
-    VLC_UNUSED(newval);
-
-    libvlc_Quit( vlc_object_instance(p_this) );
-    return VLC_SUCCESS;
-}
-
 static int Intf( vlc_object_t *p_this, char const *psz_cmd,
                  vlc_value_t newval )
 {