Do not leak the IPC helper - might fix #1598

[vlc] / projects / activex / vlccontrol2.cpp

diff --git a/projects/activex/vlccontrol2.cpp b/projects/activex/vlccontrol2.cpp
index d319b546254ede34eb352b6001620493d141a86c..2a3c62b7183a9bfbac643e609cff930a2ab2face 100644 (file)
--- a/projects/activex/vlccontrol2.cpp
+++ b/projects/activex/vlccontrol2.cpp
@@ -122,10 +122,12 @@ STDMETHODIMP VLCAudio::get_mute(VARIANT_BOOL* mute)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        *mute = libvlc_audio_get_mute(p_libvlc, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
+        *mute = libvlc_audio_get_mute(p_libvlc, &ex) ?
+                        VARIANT_TRUE : VARIANT_FALSE;
         if( libvlc_exception_raised(&ex) )
         {
-            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
+            _p_instance->setErrorInfo(IID_IVLCAudio,
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -146,7 +148,8 @@ STDMETHODIMP VLCAudio::put_mute(VARIANT_BOOL mute)
         libvlc_audio_set_mute(p_libvlc, VARIANT_FALSE != mute, &ex);
         if( libvlc_exception_raised(&ex) )
         {
-            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
+            _p_instance->setErrorInfo(IID_IVLCAudio,
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -170,7 +173,8 @@ STDMETHODIMP VLCAudio::get_volume(long* volume)
         *volume = libvlc_audio_get_volume(p_libvlc, &ex);
         if( libvlc_exception_raised(&ex) )
         {
-            _p_instance->setErrorInfo(IID_IVLCAudio, libvlc_exception_get_message(&ex));
+            _p_instance->setErrorInfo(IID_IVLCAudio,
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -213,9 +217,10 @@ STDMETHODIMP VLCAudio::get_track(long* track)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         *track = libvlc_audio_get_track(p_md, &ex);
-        libvlc_media_instance_release(p_md);
+        libvlc_media_player_release(p_md);
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCAudio,
@@ -237,9 +242,10 @@ STDMETHODIMP VLCAudio::put_track(long track)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         libvlc_audio_set_track(p_md, track, &ex);
-        libvlc_media_instance_release(p_md);
+        libvlc_media_player_release(p_md);
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCAudio,
@@ -404,6 +410,7 @@ STDMETHODIMP VLCInput::get_length(double* length)
 {
     if( NULL == length )
         return E_POINTER;
+    *length = 0;
 
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
@@ -412,17 +419,19 @@ STDMETHODIMP VLCInput::get_length(double* length)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *length = (double)libvlc_media_instance_get_length(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            *length = (double)libvlc_media_player_get_length(p_md, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -434,6 +443,7 @@ STDMETHODIMP VLCInput::get_position(double* position)
     if( NULL == position )
         return E_POINTER;
 
+    *position = 0.0f;
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(hr) )
@@ -441,17 +451,19 @@ STDMETHODIMP VLCInput::get_position(double* position)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *position = libvlc_media_instance_get_position(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            *position = libvlc_media_player_get_position(p_md, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -467,17 +479,19 @@ STDMETHODIMP VLCInput::put_position(double position)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            libvlc_media_instance_set_position(p_md, position, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_set_position(p_md, position, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -496,17 +510,19 @@ STDMETHODIMP VLCInput::get_time(double* time)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *time = (double)libvlc_media_instance_get_time(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            *time = (double)libvlc_media_player_get_time(p_md, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -522,17 +538,19 @@ STDMETHODIMP VLCInput::put_time(double time)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            libvlc_media_instance_set_time(p_md, (vlc_int64_t)time, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_set_time(p_md, (int64_t)time, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -551,11 +569,12 @@ STDMETHODIMP VLCInput::get_state(long* state)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *state = libvlc_media_instance_get_state(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            *state = libvlc_media_player_get_state(p_md, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -581,17 +600,19 @@ STDMETHODIMP VLCInput::get_rate(double* rate)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *rate = libvlc_media_instance_get_rate(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            *rate = libvlc_media_player_get_rate(p_md, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -607,17 +628,19 @@ STDMETHODIMP VLCInput::put_rate(double rate)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            libvlc_media_instance_set_rate(p_md, rate, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_set_rate(p_md, rate, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -637,17 +660,19 @@ STDMETHODIMP VLCInput::get_fps(double* fps)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *fps = libvlc_media_instance_get_fps(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            *fps = libvlc_media_player_get_fps(p_md, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -666,17 +691,20 @@ STDMETHODIMP VLCInput::get_hasVout(VARIANT_BOOL* hasVout)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md;
+        p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
-            *hasVout = libvlc_media_instance_has_vout(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
-            libvlc_media_instance_release(p_md);
+            *hasVout = libvlc_media_player_has_vout(p_md, &ex) ?
+                                    VARIANT_TRUE : VARIANT_FALSE;
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
             }
         }
-        _p_instance->setErrorInfo(IID_IVLCInput, libvlc_exception_get_message(&ex));
+        _p_instance->setErrorInfo(IID_IVLCInput,
+                     libvlc_exception_get_message(&ex));
         libvlc_exception_clear(&ex);
         return E_FAIL;
     }
@@ -797,7 +825,8 @@ STDMETHODIMP VLCLog::get_verbosity(long* level)
             *level = libvlc_get_log_verbosity(p_libvlc, &ex);
             if( libvlc_exception_raised(&ex) )
             {
-                _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex));
+                _p_instance->setErrorInfo(IID_IVLCLog,
+                             libvlc_exception_get_message(&ex));
                 libvlc_exception_clear(&ex);
                 return E_FAIL;
             }
@@ -828,7 +857,8 @@ STDMETHODIMP VLCLog::put_verbosity(long verbosity)
                 _p_log = libvlc_log_open(p_libvlc, &ex);
                 if( libvlc_exception_raised(&ex) )
                 {
-                    _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex));
+                    _p_instance->setErrorInfo(IID_IVLCLog,
+                                 libvlc_exception_get_message(&ex));
                     libvlc_exception_clear(&ex);
                     return E_FAIL;
                 }
@@ -836,7 +866,8 @@ STDMETHODIMP VLCLog::put_verbosity(long verbosity)
             libvlc_set_log_verbosity(p_libvlc, (unsigned)verbosity, &ex);
             if( libvlc_exception_raised(&ex) )
             {
-                _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex));
+                _p_instance->setErrorInfo(IID_IVLCLog,
+                             libvlc_exception_get_message(&ex));
                 libvlc_exception_clear(&ex);
                 return E_FAIL;
             }
@@ -848,7 +879,8 @@ STDMETHODIMP VLCLog::put_verbosity(long verbosity)
             _p_log = NULL;
             if( libvlc_exception_raised(&ex) )
             {
-                _p_instance->setErrorInfo(IID_IVLCLog, libvlc_exception_get_message(&ex));
+                _p_instance->setErrorInfo(IID_IVLCLog,
+                             libvlc_exception_get_message(&ex));
                 libvlc_exception_clear(&ex);
                 return E_FAIL;
             }
@@ -917,7 +949,8 @@ public:
         VariantInit(&v);
         if( msg )
         {
-            if( SUCCEEDED(msg->QueryInterface(IID_IDispatch, (LPVOID*)&V_DISPATCH(&v))) )
+            if( SUCCEEDED(msg->QueryInterface(IID_IDispatch,
+                          (LPVOID*)&V_DISPATCH(&v))) )
             {
                 V_VT(&v) = VT_DISPATCH;
             }
@@ -1047,7 +1080,8 @@ STDMETHODIMP VLCMessages::clear()
         libvlc_log_clear(p_log, &ex);
         if( libvlc_exception_raised(&ex) )
         {
-            _p_instance->setErrorInfo(IID_IVLCMessages, libvlc_exception_get_message(&ex));
+            _p_instance->setErrorInfo(IID_IVLCMessages,
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1069,7 +1103,8 @@ STDMETHODIMP VLCMessages::get_count(long* count)
         *count = libvlc_log_count(p_log, &ex);
         if( libvlc_exception_raised(&ex) )
         {
-            _p_instance->setErrorInfo(IID_IVLCMessages, libvlc_exception_get_message(&ex));
+            _p_instance->setErrorInfo(IID_IVLCMessages,
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1195,10 +1230,12 @@ STDMETHODIMP VLCMessageIterator::get_hasNext(VARIANT_BOOL* hasNext)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        *hasNext = libvlc_log_iterator_has_next(_p_iter, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
+        *hasNext = libvlc_log_iterator_has_next(_p_iter, &ex) ?
+                                     VARIANT_TRUE : VARIANT_FALSE;
         if( libvlc_exception_raised(&ex) )
         {
-            _p_instance->setErrorInfo(IID_IVLCMessageIterator, libvlc_exception_get_message(&ex));
+            _p_instance->setErrorInfo(IID_IVLCMessageIterator,
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1227,7 +1264,8 @@ STDMETHODIMP VLCMessageIterator::next(IVLCMessage** message)
         libvlc_log_iterator_next(_p_iter, &buffer, &ex);
         if( libvlc_exception_raised(&ex) )
         {
-            _p_instance->setErrorInfo(IID_IVLCMessageIterator, libvlc_exception_get_message(&ex));
+            _p_instance->setErrorInfo(IID_IVLCMessageIterator,
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1492,7 +1530,7 @@ STDMETHODIMP VLCPlaylistItems::get_count(long* count)
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCPlaylistItems,
-                libvlc_exception_get_message(&ex));
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1514,7 +1552,7 @@ STDMETHODIMP VLCPlaylistItems::clear()
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCPlaylistItems,
-                libvlc_exception_get_message(&ex));
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1536,7 +1574,7 @@ STDMETHODIMP VLCPlaylistItems::remove(long item)
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCPlaylistItems,
-                libvlc_exception_get_message(&ex));
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1630,6 +1668,7 @@ STDMETHODIMP VLCPlaylist::get_itemCount(long* count)
     if( NULL == count )
         return E_POINTER;
 
+    *count = 0;
     libvlc_instance_t* p_libvlc;
     HRESULT hr = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(hr) )
@@ -1641,7 +1680,7 @@ STDMETHODIMP VLCPlaylist::get_itemCount(long* count)
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCPlaylist,
-                libvlc_exception_get_message(&ex));
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -1662,11 +1701,12 @@ STDMETHODIMP VLCPlaylist::get_isPlaying(VARIANT_BOOL* isPlaying)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        *isPlaying = libvlc_playlist_isplaying(p_libvlc, &ex) ? VARIANT_TRUE: VARIANT_FALSE;
+        *isPlaying = libvlc_playlist_isplaying(p_libvlc, &ex) ?
+                                    VARIANT_TRUE: VARIANT_FALSE;
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCPlaylist,
-                libvlc_exception_get_message(&ex));
+                         libvlc_exception_get_message(&ex));
             libvlc_exception_clear(&ex);
             return E_FAIL;
         }
@@ -2043,11 +2083,11 @@ STDMETHODIMP VLCVideo::get_fullscreen(VARIANT_BOOL* fullscreen)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             *fullscreen = libvlc_get_fullscreen(p_md, &ex) ? VARIANT_TRUE : VARIANT_FALSE;
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2069,11 +2109,11 @@ STDMETHODIMP VLCVideo::put_fullscreen(VARIANT_BOOL fullscreen)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             libvlc_set_fullscreen(p_md, VARIANT_FALSE != fullscreen, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2098,11 +2138,11 @@ STDMETHODIMP VLCVideo::get_width(long* width)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             *width = libvlc_video_get_width(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2127,11 +2167,11 @@ STDMETHODIMP VLCVideo::get_height(long* height)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             *height = libvlc_video_get_height(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2156,12 +2196,12 @@ STDMETHODIMP VLCVideo::get_aspectRatio(BSTR* aspect)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             char *psz_aspect = libvlc_video_get_aspect_ratio(p_md, &ex);
 
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 if( NULL == psz_aspect )
@@ -2197,7 +2237,7 @@ STDMETHODIMP VLCVideo::put_aspectRatio(BSTR aspect)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             char *psz_aspect = CStrFromBSTR(CP_UTF8, aspect);
@@ -2209,7 +2249,7 @@ STDMETHODIMP VLCVideo::put_aspectRatio(BSTR aspect)
             libvlc_video_set_aspect_ratio(p_md, psz_aspect, &ex);
 
             CoTaskMemFree(psz_aspect);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( libvlc_exception_raised(&ex) )
             {
                 _p_instance->setErrorInfo(IID_IVLCVideo,
@@ -2235,11 +2275,11 @@ STDMETHODIMP VLCVideo::get_subtitle(long* spu)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             *spu = libvlc_video_get_spu(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2261,9 +2301,9 @@ STDMETHODIMP VLCVideo::put_subtitle(long spu)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         libvlc_video_set_spu(p_md, spu, &ex);
-        libvlc_media_instance_release(p_md);
+        libvlc_media_player_release(p_md);
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
@@ -2287,12 +2327,12 @@ STDMETHODIMP VLCVideo::get_crop(BSTR* geometry)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             char *psz_geometry = libvlc_video_get_crop_geometry(p_md, &ex);
 
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 if( NULL == psz_geometry )
@@ -2328,7 +2368,7 @@ STDMETHODIMP VLCVideo::put_crop(BSTR geometry)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             char *psz_geometry = CStrFromBSTR(CP_UTF8, geometry);
@@ -2340,7 +2380,7 @@ STDMETHODIMP VLCVideo::put_crop(BSTR geometry)
             libvlc_video_set_crop_geometry(p_md, psz_geometry, &ex);
 
             CoTaskMemFree(psz_geometry);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( libvlc_exception_raised(&ex) )
             {
                 _p_instance->setErrorInfo(IID_IVLCVideo,
@@ -2366,11 +2406,11 @@ STDMETHODIMP VLCVideo::get_teletext(long* page)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             *page = libvlc_video_get_teletext(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2392,9 +2432,9 @@ STDMETHODIMP VLCVideo::put_teletext(long page)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         libvlc_video_set_teletext(p_md, page, &ex);
-        libvlc_media_instance_release(p_md);
+        libvlc_media_player_release(p_md);
         if( libvlc_exception_raised(&ex) )
         {
             _p_instance->setErrorInfo(IID_IVLCVideo, libvlc_exception_get_message(&ex));
@@ -2418,7 +2458,7 @@ STDMETHODIMP VLCVideo::takeSnapshot(LPPICTUREDISP* picture)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             static int uniqueId = 0;
@@ -2480,7 +2520,7 @@ STDMETHODIMP VLCVideo::takeSnapshot(LPPICTUREDISP* picture)
 
             /* take snapshot into file */
             libvlc_video_take_snapshot(p_md, psz_filepath, 0, 0, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 hr = E_FAIL;
@@ -2522,11 +2562,11 @@ STDMETHODIMP VLCVideo::toggleFullscreen()
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             libvlc_toggle_fullscreen(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2548,11 +2588,11 @@ STDMETHODIMP VLCVideo::toggleTeletext()
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_instance_t *p_md = libvlc_playlist_get_media_instance(p_libvlc, &ex);
+        libvlc_media_player_t *p_md = libvlc_playlist_get_media_player(p_libvlc, &ex);
         if( ! libvlc_exception_raised(&ex) )
         {
             libvlc_toggle_teletext(p_md, &ex);
-            libvlc_media_instance_release(p_md);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -2728,6 +2768,38 @@ STDMETHODIMP VLCControl2::put_MRL(BSTR mrl)
     return S_OK;
 };
 
+
+STDMETHODIMP VLCControl2::get_Toolbar(VARIANT_BOOL *visible)
+{
+    if( NULL == visible )
+        return E_POINTER;
+
+    /*
+     * Note to developpers
+     *
+     * Returning the _b_toolbar is closer to the method specification.
+     * But returning True when toolbar is not implemented so not displayed
+     * could be bad for ActiveX users which rely on this value to show their
+     * own toolbar if not provided by the ActiveX.
+     *
+     * This is the reason why FALSE is returned, until toolbar get implemented.
+     */
+
+    /* DISABLED for now */
+    //  *visible = _p_instance->getShowToolbar() ? VARIANT_TRUE: VARIANT_FALSE;
+
+    *visible = VARIANT_FALSE;
+
+    return S_OK;
+};
+
+STDMETHODIMP VLCControl2::put_Toolbar(VARIANT_BOOL visible)
+{
+    _p_instance->setShowToolbar((VARIANT_FALSE != visible) ? TRUE: FALSE);
+    return S_OK;
+};
+
+
 STDMETHODIMP VLCControl2::get_StartTime(long *seconds)
 {
     if( NULL == seconds )
@@ -2750,12 +2822,12 @@ STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version)
     if( NULL == version )
         return E_POINTER;
 
-    const char *versionStr = VLC_Version();
+    const char *versionStr = libvlc_get_version();
     if( NULL != versionStr )
     {
         *version = BSTRFromCStr(CP_UTF8, versionStr);
 
-        return NULL == *version ? E_OUTOFMEMORY : NOERROR;
+        return (NULL == *version) ? E_OUTOFMEMORY : NOERROR;
     }
     *version = NULL;
     return E_FAIL;