[vlc-commits] activex: simplify options set

[Rafaël Carré]

npapi-vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Jun 18 23:14:10 2013 +0200| [3defc7d6270916a549daddb5cecc515ba8f519f3] | committer: Rafaël Carré

activex: simplify options set

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=3defc7d6270916a549daddb5cecc515ba8f519f3
---

 activex/plugin.cpp |   21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index 84aef19..7414943 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -461,19 +461,14 @@ HRESULT VLCPlugin::onLoad(void)
 
 void VLCPlugin::initVLC()
 {
-    /*
-    ** default initialization options
-    */
-    const char *ppsz_argv[32] = { };
-    int   ppsz_argc = 0;
-
-    /* common settings */
-    ppsz_argv[ppsz_argc++] = "-vv";
-    ppsz_argv[ppsz_argc++] = "--no-stats";
-    ppsz_argv[ppsz_argc++] = "--intf=dummy";
-    ppsz_argv[ppsz_argc++] = "--no-video-title-show";
-
-    _p_libvlc = libvlc_new(ppsz_argc, ppsz_argv);
+    static const char * const ppsz_argv[] = {
+        "-vv",
+        "--no-stats",
+        "--intf=dummy",
+        "--no-video-title-show",
+    };
+
+    _p_libvlc = libvlc_new(sizeof(ppsz_argv) / sizeof(*ppsz_argv), ppsz_argv);
     if( !_p_libvlc )
         return;