Files belonging to patch from, thannoy: Allow future control toolbar to be hidden...

[vlc] / projects / activex / vlccontrol2.cpp

diff --git a/projects/activex/vlccontrol2.cpp b/projects/activex/vlccontrol2.cpp
index d319b546254ede34eb352b6001620493d141a86c..26548c0ac026e033e8ee0ab5b20188e69ad9f596 100644 (file)
--- a/projects/activex/vlccontrol2.cpp
+++ b/projects/activex/vlccontrol2.cpp
@@ -213,9 +213,9 @@ 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 = 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 +237,9 @@ 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 = 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,
@@ -412,11 +412,11 @@ 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 = 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;
@@ -441,11 +441,11 @@ 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 = 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;
@@ -467,11 +467,11 @@ 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 = 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;
@@ -496,11 +496,11 @@ 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 = 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;
@@ -522,11 +522,11 @@ 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 = 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, (vlc_int64_t)time, &ex);
+            libvlc_media_player_release(p_md);
             if( ! libvlc_exception_raised(&ex) )
             {
                 return NOERROR;
@@ -551,11 +551,11 @@ 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 = 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,11 +581,11 @@ 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 = 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;
@@ -607,11 +607,11 @@ 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 = 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;
@@ -637,11 +637,11 @@ 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 = 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;
@@ -666,11 +666,11 @@ 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 = 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;
@@ -2043,11 +2043,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 +2069,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 +2098,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 +2127,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 +2156,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 +2197,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 +2209,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 +2235,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 +2261,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 +2287,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 +2328,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 +2340,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 +2366,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 +2392,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 +2418,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 +2480,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 +2522,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 +2548,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 +2728,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 )