VLCKit: Remove contrib dependency files.

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 5ed38d2bd09f28f682598150bc024c278887e6e8..895990e00b2f79582f43216fa64c9453654181c2 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -372,7 +372,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
             pid_t i_pid = getpid ();
             msg_Dbg( p_libvlc, "PID is %d, writing it to %s",
                                i_pid, psz_pidfile );
-            pidfile = utf8_fopen( psz_pidfile,"w" );
+            pidfile = vlc_fopen( psz_pidfile,"w" );
             if( pidfile != NULL )
             {
                 utf8_fprintf( pidfile, "%d", (int)i_pid );
@@ -794,6 +794,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 );
@@ -816,11 +823,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     if( psz_modules )
     {
         char *p = psz_modules, *m;
-        playlist_t *p_playlist = pl_Hold( p_libvlc );
         while( ( m = strsep( &p, " :," ) ) != NULL )
             playlist_ServicesDiscoveryAdd( p_playlist, m );
         free( psz_modules );
-        pl_Release (p_libvlc);
     }
 
 #ifdef ENABLE_VLM
@@ -838,11 +843,6 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /*
      * Load background interfaces
      */
-    /* Create volume callback system. (this variable must be created before
-       all interfaces as they can use it) */
-    var_Create( p_libvlc, "volume-change", VLC_VAR_VOID );
-    var_Create( p_libvlc, "volume-muted", VLC_VAR_BOOL );
-
     psz_modules = var_CreateGetNonEmptyString( p_libvlc, "extraintf" );
     psz_control = var_CreateGetNonEmptyString( p_libvlc, "control" );
 
@@ -955,14 +955,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
@@ -975,10 +970,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     psz_val = var_InheritString( p_libvlc, "open" );
     if ( psz_val != NULL )
     {
-        playlist_t *p_playlist = pl_Hold( p_libvlc );
         playlist_AddExt( p_playlist, psz_val, NULL, PLAYLIST_INSERT, 0,
                          -1, 0, NULL, 0, true, pl_Unlocked );
-        pl_Release( p_libvlc );
         free( psz_val );
     }
 
@@ -1015,9 +1008,8 @@ void libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     }
 #endif
 
-    /* Free playlist now */
-    msg_Dbg( p_libvlc, "removing playlist" );
-    vlc_object_release( p_playlist );
+    /* Free playlist now, all threads are gone */
+    playlist_Destroy( p_playlist );
 
     stats_TimersDumpAll( p_libvlc );
     stats_TimersCleanAll( p_libvlc );
@@ -1221,11 +1213,9 @@ static int GetFilenames( libvlc_int_t *p_vlc, int i_argc, const char *ppsz_argv[
         if( !mrl )
             continue;
 
-        playlist_t *p_playlist = pl_Hold( p_vlc );
-        playlist_AddExt( p_playlist, mrl, NULL, PLAYLIST_INSERT,
+        playlist_AddExt( pl_Get( p_vlc ), mrl, NULL, PLAYLIST_INSERT,
                 0, -1, i_options, ( i_options ? &ppsz_argv[i_opt + 1] : NULL ),
                 VLC_INPUT_OPTION_TRUSTED, true, pl_Unlocked );
-        pl_Release( p_vlc );
         free( mrl );
     }