[xiph-commits] r17487 - in trunk/oggdsf: . src/lib/plugin/AxPlayer

[cristianadam at svn.xiph.org]

Author: cristianadam
Date: 2010-10-04 12:22:19 -0700 (Mon, 04 Oct 2010)
New Revision: 17487

Modified:
   trunk/oggdsf/ChangeLog.txt
   trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp
   trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.h
   trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp
Log:
Added "controls" attribute.

Modified: trunk/oggdsf/ChangeLog.txt
===================================================================
--- trunk/oggdsf/ChangeLog.txt	2010-10-04 19:14:02 UTC (rev 17486)
+++ trunk/oggdsf/ChangeLog.txt	2010-10-04 19:22:19 UTC (rev 17487)
@@ -2,6 +2,9 @@
 
     * Updated libvpx to 0.9.2
     * Updated webmdshow to 0.9.10
+    * Updated libtheora to 1.2.0 alpha (SVN)
+    * Updated libtremor
+    * Added "controls" attribute to HTML5 <video> ActiveX plugin
 
 Version 0.84.17359 - 04.08.2010
     

Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp	2010-10-04 19:14:02 UTC (rev 17486)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.cpp	2010-10-04 19:22:19 UTC (rev 17487)
@@ -156,6 +156,7 @@
 m_state(NotOpened),
 m_audioState(UnMuted),
 m_textureFilterType(D3DTEXF_NONE),
+m_enableControls(false),
 m_isMouseOver(false),
 m_audioVolume(FilterGraph::MIN_VOLUME),
 m_audioUnMuteVolume(FilterGraph::MIN_VOLUME),
@@ -677,6 +678,11 @@
 
 void DShowVideoPlayer::DrawControls(const CRect& rect, HDC dc)
 {
+    if (!EnableControls())
+    {
+        return;
+    }
+
     if (!GetMouseOver())
     {
         return;

Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.h
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.h	2010-10-04 19:14:02 UTC (rev 17486)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/DShowVideoPlayer.h	2010-10-04 19:22:19 UTC (rev 17487)
@@ -133,6 +133,9 @@
     void CreateDevice();
     CComPtr<IDirect3DDevice9>& GetDevice();
 
+    bool EnableControls() const { return m_enableControls; }
+    void EnableControls(bool val) { m_enableControls = val; }
+
 private:
     FilterGraph m_filterGraph;
 
@@ -172,6 +175,7 @@
     PlayerState m_state;
     AudioState m_audioState;
 
+    bool m_enableControls;
     bool m_isMouseOver;
     bool m_doDisplayAudioVolume;
     bool m_isMouseOverMuteButton;

Modified: trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp
===================================================================
--- trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp	2010-10-04 19:14:02 UTC (rev 17486)
+++ trunk/oggdsf/src/lib/plugin/AxPlayer/VideoTagBehavior.cpp	2010-10-04 19:22:19 UTC (rev 17487)
@@ -43,6 +43,7 @@
     const wchar_t* SRC_ATTRIBUTE = L"src";
     const wchar_t* WIDTH_ATTRIBUTE = L"width";
     const wchar_t* HEIGHT_ATTRIBUTE = L"height";
+    const wchar_t* CONTROLS_ATTRIBUTE = L"controls";
 
     const int NOT_SET = -1;
 }
@@ -520,6 +521,11 @@
 
             ParseDimensionAttribute(attributeValue, true);
         }
+        else if (attributeName == CONTROLS_ATTRIBUTE)
+        {
+            LOG(logINFO) << attributeName << " was set";
+            m_videoPlayer.EnableControls(true);
+        }
     }
 }