ANSI mode compilation fix

[wxWidgets.git] / src / msw / mediactrl_am.cpp

diff --git a/src/msw/mediactrl_am.cpp b/src/msw/mediactrl_am.cpp
index de07e983b14518a662d3e227c847ea3f9ad0a1cc..75acd4f99e765b256cb8e4013818a37592a41b7d 100644 (file)
--- a/src/msw/mediactrl_am.cpp
+++ b/src/msw/mediactrl_am.cpp
@@ -56,7 +56,7 @@
 #pragma warning (disable:4310)
 #endif
 
 #pragma warning (disable:4310)
 #endif
 

-#if wxUSE_MEDIACTRL
+#if wxUSE_MEDIACTRL && wxUSE_ACTIVEX

 
 #include "wx/mediactrl.h"
 
 
 #include "wx/mediactrl.h"
 


@@ -64,12 +64,12 @@
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"
     #include "wx/log.h"
     #include "wx/dcclient.h"
     #include "wx/timer.h"

+    #include "wx/math.h"        // log10 & pow
+    #include "wx/stopwatch.h"

 #endif
 
 #endif
 

-#include "wx/math.h"        // log10 & pow

 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dynlib.h"
 #include "wx/msw/private.h" // user info and wndproc setting/getting
 #include "wx/dynlib.h"

-#include "wx/stopwatch.h"

 
 //---------------------------------------------------------------------------
 //  wxActiveXContainer - includes all the COM-specific stuff we need
 
 //---------------------------------------------------------------------------
 //  wxActiveXContainer - includes all the COM-specific stuff we need


@@ -1483,6 +1483,7 @@ public:
     LPAMGETERRORTEXT m_lpAMGetErrorText;
     wxString GetErrorString(HRESULT hrdsv);
 #endif // __WXDEBUG__
     LPAMGETERRORTEXT m_lpAMGetErrorText;
     wxString GetErrorString(HRESULT hrdsv);
 #endif // __WXDEBUG__

+    wxEvtHandler* m_evthandler;

 
     friend class wxAMMediaEvtHandler;
     DECLARE_DYNAMIC_CLASS(wxAMMediaBackend)
 
     friend class wxAMMediaEvtHandler;
     DECLARE_DYNAMIC_CLASS(wxAMMediaBackend)


@@ -1566,12 +1567,14 @@ wxString wxAMMediaBackend::GetErrorString(HRESULT hrdsv)
 wxAMMediaBackend::wxAMMediaBackend()
                  :m_pAX(NULL),
 #ifdef __WXWINCE__
 wxAMMediaBackend::wxAMMediaBackend()
                  :m_pAX(NULL),
 #ifdef __WXWINCE__

-                  m_pWMP(NULL)
+                  m_pWMP(NULL),

 #else
                   m_pAM(NULL),
 #else
                   m_pAM(NULL),

-                  m_pMP(NULL)
+                  m_pMP(NULL),

 #endif
 #endif

+                  m_bestSize(wxDefaultSize)

 {
 {

+   m_evthandler = NULL;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -1590,7 +1593,11 @@ wxAMMediaBackend::~wxAMMediaBackend()
         if (GetMP())
             GetMP()->Release();
 
         if (GetMP())
             GetMP()->Release();
 

-        m_ctrl->PopEventHandler(true);
+        if (m_evthandler)
+        {
+            m_ctrl->RemoveEventHandler(m_evthandler);
+            delete m_evthandler;
+        }

     }
 }
 
     }
 }
 


@@ -1682,7 +1689,8 @@ bool wxAMMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent,
 #endif
                                   );
     // Connect for events
 #endif
                                   );
     // Connect for events

-    m_ctrl->PushEventHandler(new wxAMMediaEvtHandler(this));
+    m_evthandler = new wxAMMediaEvtHandler(this);
+    m_ctrl->PushEventHandler(m_evthandler);

 
     //
     //  Here we set up wx-specific stuff for the default
 
     //
     //  Here we set up wx-specific stuff for the default


@@ -1791,6 +1799,7 @@ bool wxAMMediaBackend::DoLoad(const wxString& location)
         return false;
     }
 
         return false;
     }
 

+    m_bestSize = wxDefaultSize;

     return true;
 }
 
     return true;
 }
 


@@ -1804,10 +1813,6 @@ bool wxAMMediaBackend::DoLoad(const wxString& location)
 //---------------------------------------------------------------------------
 void wxAMMediaBackend::FinishLoad()
 {
 //---------------------------------------------------------------------------
 void wxAMMediaBackend::FinishLoad()
 {

-    // Get the original video size
-    GetAM()->get_ImageSourceWidth((long*)&m_bestSize.x);
-    GetAM()->get_ImageSourceHeight((long*)&m_bestSize.y);
-

     NotifyMovieLoaded();
 }
 
     NotifyMovieLoaded();
 }
 


@@ -1951,12 +1956,12 @@ wxLongLong wxAMMediaBackend::GetPosition()
 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------

-// wxAMMediaBackend::GetVolume
+// wxAMMediaBackend::GetVolume and SetVolume()

 //
 //

-// Gets the volume through the IActiveMovie interface -
-// value ranges from 0 (MAX volume) to -10000 (minimum volume).
-// -100 per decibel (Logorithmic in 0.01db per step).
+// Notice that for the IActiveMovie interface value ranges from 0 (MAX volume)
+// to -10000 (minimum volume) and the scale is logarithmic in 0.01db per step.

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

+

 double wxAMMediaBackend::GetVolume()
 {
     long lVolume;
 double wxAMMediaBackend::GetVolume()
 {
     long lVolume;


@@ -1967,37 +1972,20 @@ double wxAMMediaBackend::GetVolume()
         return 0.0;
     }
 
         return 0.0;
     }
 

-    // Volume conversion from Greg Hazel
-    double dVolume = (double)lVolume / 125;
+    double dVolume = lVolume / 2000.; // volume is now in [-5..0] range
+    dVolume = pow(10.0, dVolume);     //                 [10^-5, 1]
+    dVolume -= 0.00001;               //                [0, 1-10^-5]
+    dVolume /= 1 - 0.00001;           //                   [0, 1]

 
 

-    // convert to 0 to 1
-    dVolume = pow(10.0, dVolume/20.0);
-    // handle -INF
-    dVolume *= 1 + pow(10.0, -5.0);
-    dVolume -= pow(10.0, -5.0);

     return dVolume;
 }
 
     return dVolume;
 }
 

-//---------------------------------------------------------------------------
-// wxAMMediaBackend::SetVolume
-//
-// Sets the volume through the IActiveMovie interface -
-// value ranges from 0 (MAX volume) to -10000 (minimum volume).
-// -100 per decibel (Logorithmic in 0.01db per step).
-//---------------------------------------------------------------------------

 bool wxAMMediaBackend::SetVolume(double dVolume)
 {
 bool wxAMMediaBackend::SetVolume(double dVolume)
 {

-    // Volume conversion from Greg Hazel
-    long lVolume;
-    // handle -INF
-    dVolume *= 1 - pow(10.0, -5.0);
-    dVolume += pow(10.0, -5.0);
-    // convert to -100db to 0db
-    dVolume = 20 * log10(dVolume);
-    // scale to -10000 to 0
-    lVolume = (long)(125 * dVolume);
-
-    HRESULT hr = GetAM()->put_Volume( lVolume );
+    // inverse the transformation above
+    long lVolume = 2000*log10(dVolume + (1 - dVolume)*0.00001);
+
+    HRESULT hr = GetAM()->put_Volume(lVolume);

     if(FAILED(hr))
     {
         wxAMLOG(hr);
     if(FAILED(hr))
     {
         wxAMLOG(hr);


@@ -2142,7 +2130,22 @@ void wxAMMediaBackend::DoGetDownloadProgress(wxLongLong* pLoadProgress,
 //---------------------------------------------------------------------------
 wxSize wxAMMediaBackend::GetVideoSize() const
 {
 //---------------------------------------------------------------------------
 wxSize wxAMMediaBackend::GetVideoSize() const
 {

-    return m_bestSize;
+    if (m_bestSize == wxDefaultSize)
+    {
+        wxAMMediaBackend* self = wxConstCast(this, wxAMMediaBackend);
+        long w = 0;
+        long h = 0;
+
+        self->GetAM()->get_ImageSourceWidth(&w);
+        self->GetAM()->get_ImageSourceHeight(&h);
+
+        if (w != 0 && h != 0)
+            self->m_bestSize.Set(w, h);
+        else
+            return wxSize(0,0);
+    }
+
+   return m_bestSize;

 }
 
 //---------------------------------------------------------------------------
 }
 
 //---------------------------------------------------------------------------


@@ -2257,4 +2260,4 @@ void wxAMMediaEvtHandler::OnActiveX(wxActiveXEvent& event)
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(wxmediabackend_am)
 
 #include "wx/html/forcelnk.h"
 FORCE_LINK_ME(wxmediabackend_am)
 

-#endif // wxUSE_MEDIACTRL
+#endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX