More clean up on subtitle.

[vlc] / src / config / cmdline.c

diff --git a/src/config/cmdline.c b/src/config/cmdline.c
index dc5d2b786c68bbeb9ea178f0f900b6acbc887830..4899129088da9d81ebc40fc33b1c3af1e1ae9c0e 100644 (file)
--- a/src/config/cmdline.c
+++ b/src/config/cmdline.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "../libvlc.h"
 #include "vlc_keys.h"
 
@@ -40,6 +40,8 @@
 #include "configuration.h"
 #include "modules/modules.h"
 
+#include <assert.h>
+
 /*****************************************************************************
  * config_LoadCmdLine: parse command line
  *****************************************************************************
@@ -74,12 +76,10 @@ int __config_LoadCmdLine( vlc_object_t *p_this, int *pi_argc,
         /* GDMF!... I can't do this or else the MacOSX window server will
          * not pick up the PSN and not register the app and we crash...
          * hence the following kludge otherwise we'll get confused w/ argv[1]
-         * being an input file name */
-#if 0
-        ppsz_argv[ 1 ] = NULL;
-#endif
-        *pi_argc = *pi_argc - 1;
-        pi_argc--;
+         * being an input file name.
+         * As there won't be any more args to parse, just exit. */
+        assert( *pi_argc == 2 );
+        *pi_argc = 1;
         return 0;
     }
 #endif