getopt: remove useless functions and boiler plate, update licens

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 58f588a5ea70fcea0911fd2e91a641cb418b2406..0a7d11d3384f4fe877b36881077202ebe6d80b4f 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -57,9 +57,7 @@
 #   include <io.h>
 #endif
 
-#ifdef WIN32                       /* optind, getopt(), included in unistd.h */
-#   include "extras/getopt.h"
-#endif
+#include "config/vlc_getopt.h"
 
 #ifdef HAVE_LOCALE_H
 #   include <locale.h>
@@ -794,6 +792,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
      */
     vlc_InitActions( p_libvlc );
 
+    /* Create a variable for showing the fullscreen interface */
+    var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
+    var_SetBool( p_libvlc, "intf-show", true );
+
+    /* Create a variable for showing the right click menu */
+    var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
+
     /* variables for signalling creation of new files */
     var_Create( p_libvlc, "snapshot-file", VLC_VAR_STRING );
     var_Create( p_libvlc, "record-file", VLC_VAR_STRING );
@@ -948,14 +953,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
-
-
-    /* Create a variable for showing the fullscreen interface from hotkeys */
-    var_Create( p_libvlc, "intf-show", VLC_VAR_BOOL );
-    var_SetBool( p_libvlc, "intf-show", true );
-
-    /* Create a variable for showing the right click menu */
-    var_Create( p_libvlc, "intf-popupmenu", VLC_VAR_BOOL );
+#ifdef WIN32
+    var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );
+#endif
 
     /*
      * Get input filenames given as commandline arguments