#pragma warning (disable:4310)
#endif
-#if wxUSE_MEDIACTRL
+#if wxUSE_MEDIACTRL && wxUSE_ACTIVEX
#include "wx/mediactrl.h"
#endif
wxSize m_bestSize; // Cached size
-#ifdef __WXDEBUG__ // Stuff for getting useful debugging strings
+ // Stuff for getting useful debugging strings
+#if wxDEBUG_LEVEL
wxDynamicLibrary m_dllQuartz;
LPAMGETERRORTEXT m_lpAMGetErrorText;
wxString GetErrorString(HRESULT hrdsv);
-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL
+ wxEvtHandler* m_evthandler;
friend class wxAMMediaEvtHandler;
DECLARE_DYNAMIC_CLASS(wxAMMediaBackend)
bool m_bLoadEventSent; // Whether or not FinishLoaded was already called
// prevents it being called multiple times
- DECLARE_NO_COPY_CLASS(wxAMMediaEvtHandler)
+ wxDECLARE_NO_COPY_CLASS(wxAMMediaEvtHandler);
};
//===========================================================================
//---------------------------------------------------------------------------
// Usual debugging macros
//---------------------------------------------------------------------------
-#ifdef __WXDEBUG__
+#if wxDEBUG_LEVEL
#define MAX_ERROR_TEXT_LEN 160
// Get the error string for Active Movie
#endif
m_bestSize(wxDefaultSize)
{
+ m_evthandler = NULL;
}
//---------------------------------------------------------------------------
if (GetMP())
GetMP()->Release();
- m_ctrl->PopEventHandler(true);
+ if (m_evthandler)
+ {
+ m_ctrl->RemoveEventHandler(m_evthandler);
+ delete m_evthandler;
+ }
}
}
{
// First get the AMGetErrorText procedure in debug
// mode for more meaningful messages
-#ifdef __WXDEBUG__
- if ( m_dllQuartz.Load(_T("quartz.dll"), wxDL_VERBATIM) )
+#if wxDEBUG_LEVEL
+ if ( m_dllQuartz.Load(wxT("quartz.dll"), wxDL_VERBATIM) )
{
m_lpAMGetErrorText = (LPAMGETERRORTEXT)
m_dllQuartz.GetSymbolAorW(wxT("AMGetErrorText"));
}
-#endif // __WXDEBUG__
+#endif // wxDEBUG_LEVEL
#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
}
//---------------------------------------------------------------------------
-// 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;
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;
}
-//---------------------------------------------------------------------------
-// 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)
{
- // 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 = static_cast<long>(2000*log10(dVolume + (1 - dVolume)*0.00001));
+
+ HRESULT hr = GetAM()->put_Volume(lVolume);
if(FAILED(hr))
{
wxAMLOG(hr);
{
double outDuration;
HRESULT hr = GetAM()->get_Duration(&outDuration);
- if(FAILED(hr))
+ switch ( hr )
{
- wxAMLOG(hr);
- return 0;
- }
+ default:
+ wxAMLOG(hr);
+ // fall through
- // h,m,s,milli - outDuration is in 1 second (double)
- outDuration *= 1000;
- wxLongLong ll;
- ll.Assign(outDuration);
+ case S_FALSE:
+ return 0;
- return ll;
+ case S_OK:
+ // outDuration is in seconds, we need milliseconds
+ return outDuration * 1000;
+ }
}
//---------------------------------------------------------------------------
wxLongLong* pLoadTotal)
{
#ifndef __WXWINCE__
- LONGLONG loadTotal = 0, loadProgress = 0;
- IUnknown* pFG;
- IAMOpenProgress* pOP;
- HRESULT hr;
- hr = m_pAM->get_FilterGraph(&pFG);
- if(SUCCEEDED(hr))
+ IUnknown* pFG = NULL;
+
+ HRESULT hr = m_pAM->get_FilterGraph(&pFG);
+
+ // notice that the call above may return S_FALSE and leave pFG NULL
+ if(SUCCEEDED(hr) && pFG)
{
+ IAMOpenProgress* pOP = NULL;
hr = pFG->QueryInterface(IID_IAMOpenProgress, (void**)&pOP);
- if(SUCCEEDED(hr))
- {
+ if(SUCCEEDED(hr) && pOP)
+ {
+ LONGLONG
+ loadTotal = 0,
+ loadProgress = 0;
hr = pOP->QueryProgress(&loadTotal, &loadProgress);
pOP->Release();
+
+ if(SUCCEEDED(hr))
+ {
+ *pLoadProgress = loadProgress;
+ *pLoadTotal = loadTotal;
+ pFG->Release();
+ return;
+ }
}
pFG->Release();
}
+#endif // !__WXWINCE__
- if(SUCCEEDED(hr))
- {
- *pLoadProgress = loadProgress;
- *pLoadTotal = loadTotal;
- }
- else
-#endif
- {
- // When not loading from a URL QueryProgress will return
- // E_NOINTERFACE or whatever
- // wxAMFAIL(hr);
- *pLoadProgress = 0;
- *pLoadTotal = 0;
- }
+ *pLoadProgress = 0;
+ *pLoadTotal = 0;
}
//---------------------------------------------------------------------------
// End of wxAMMediaBackend
//---------------------------------------------------------------------------
-// in source file that contains stuff you don't directly use
-#include "wx/html/forcelnk.h"
-FORCE_LINK_ME(wxmediabackend_am)
+// Allow the user code to use wxFORCE_LINK_MODULE() to ensure that this object
+// file is not discarded by the linker.
+#include "wx/link.h"
+wxFORCE_LINK_THIS_MODULE(wxmediabackend_am)
-#endif // wxUSE_MEDIACTRL
+#endif // wxUSE_MEDIACTRL && wxUSE_ACTIVEX
projects / wxWidgets.git / blobdiff