Changeset 04e7bd8471c3470615f8a42fbe9d51aa857b1073

Timestamp:

04/11/08 17:02:57 (3 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1207926177 +0200

git-parent:

[d5ec802741e96f90002d46288ca1da86fb279d86]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1207925797 +0200

Message:

Files belonging to patch from, thannoy: Allow future control toolbar to be hidden (default) or shown.

Files:

• projects/activex/README.TXT (modified) (5 diffs)
• projects/activex/persistpropbag.cpp (modified) (2 diffs)
• projects/activex/plugin.cpp (modified) (1 diff)
• projects/activex/plugin.h (modified) (2 diffs)
• projects/activex/vlccontrol2.cpp (modified) (1 diff)
• projects/activex/vlccontrol2.h (modified) (1 diff)

projects/activex/README.TXT

@@ -29 +29 @@
-export MIDL="midl"
-
-
-
+
+
+
+
+
+
+
+
-
-II. Debugging
@@ -65 +71 @@
-REGSVR32 C:\WINDOWS\AXVLC.DLL
-
-i
+I
-make sure that the plugin path is set in the registry as per following example:
-
@@ -96 +102 @@
-
-the following public properties can be used to control the plugin from HTML,
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-the alias column allows to specify an alternative <PARAM name> for the
@@ -150 +158 @@
-Methods:
-
+  *** current interface (0.8.6+) ***
+UUID : 9BE31822-FDAD-461B-AD51-BE1D1C159921
+defined in axvlc.idl as "coclass VLCPlugin2", "interface IVLCControl2"
+
+This interface organize API with several object (like .audio.mute)
+It is currently documented on videolan wiki (may change) at
+http://wiki.videolan.org/Documentation:Play_HowTo/Advanced_Use_of_VLC
+
+
+  ***  old interface (deprecated)  ***
+UUID : E23FE9C6-778E-49D4-B537-38FCDE4887D8
+defined in axvlc.idl as "coclass VLCPlugin", "interface IVLCControl"
+
-play()
-    Play current item the playlist
@@ -155 +176 @@
-pause()
-    Pause current item in the playlist
-
+
-stop()
-    Stop playing current item in playlist

projects/activex/persistpropbag.cpp

@@ -102 +102 @@
-    }
-
+    V_VT(&value) = VT_BOOL;
+    if( S_OK == pPropBag->Read(OLESTR("toolbar"), &value, pErrorLog) )
+    {
+        _p_instance->setShowToolbar(V_BOOL(&value) != VARIANT_FALSE);
+        VariantClear(&value);
+    }
+
-    SIZEL size = _p_instance->getExtent();
-    V_VT(&value) = VT_I4;
@@ -228 +235 @@
-    VariantClear(&value);
-
+    V_VT(&value) = VT_BOOL;
+    V_BOOL(&value) = _p_instance->getShowToolbar()? VARIANT_TRUE : VARIANT_FALSE;
+    pPropBag->Write(OLESTR("Toolbar"), &value);
+    VariantClear(&value);
+
-    SIZEL size = _p_instance->getExtent();
-    V_VT(&value) = VT_I4;

projects/activex/plugin.cpp

@@ -350 +350 @@
-    {
-        // initialize persistable properties
-
-
+
+
+
-        _bstr_baseurl = NULL;
-
-
-
-
-
-
+    
+   
+      
+    
+    
+ 
-        // set default/preferred size (320x240) pixels in HIMETRIC
-        HDC hDC = CreateDevDC(NULL);

projects/activex/plugin.h

@@ -111 +111 @@
-    };
-    inline BOOL getAutoLoop(void) { return _b_autoloop;};
+
+    inline void setShowToolbar(BOOL showtoolbar)
+    {
+        _b_toolbar = showtoolbar;
+        setDirty(TRUE);
+    };
+    inline BOOL getShowToolbar(void) { return _b_toolbar;};
-
-    void setVolume(int volume);
@@ -262 +269 @@
-    BOOL _b_autoplay;
-    BOOL _b_autoloop;
+    BOOL _b_toolbar;
-    BOOL _b_visible;
-    BOOL _b_mute;

projects/activex/vlccontrol2.cpp

@@ -2729 +2729 @@
-};
-
+
+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)
-{

projects/activex/vlccontrol2.h

@@ -583 +583 @@
-    STDMETHODIMP get_MRL(BSTR *mrl);
-    STDMETHODIMP put_MRL(BSTR mrl);
+    STDMETHODIMP get_Toolbar(VARIANT_BOOL *visible);
+    STDMETHODIMP put_Toolbar(VARIANT_BOOL visible);
-    STDMETHODIMP get_StartTime(long *seconds);
-    STDMETHODIMP put_StartTime(long seconds);