Avoid logging when QT plugin is unused but fails (from Ryan). GCC warning fix related initialization order.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-06-23 15:43:45 +00:00
parent 1d89c6a711
commit 32f65e50e7

View File

@@ -742,7 +742,8 @@ struct TimeRecord {
#define wxDL_METHOD_LOAD( lib, name, success ) \
pfn_ ## name = (name ## Type) lib.GetSymbol( wxT(#name), &success ); \
if (!success) return false;
if (!success) { wxLog::EnableLogging(true); return false; }
//Class that utilizes Robert Roeblings Dynamic Library Macros
class WXDLLIMPEXP_MEDIA wxQuickTimeLibrary
@@ -828,10 +829,15 @@ bool wxQuickTimeLibrary::Initialize()
{
m_ok = false;
if(!m_dll.Load(wxT("qtmlClient.dll")))
return false;
wxLog::EnableLogging(false); //Turn off the wxDynamicLibrary logging
bool bOk;
if(!m_dll.Load(wxT("qtmlClient.dll")))
{
wxLog::EnableLogging(true);
return false;
}
bool bOk; //TODO: Get rid of this, use m_ok instead (not a biggie)
wxDL_METHOD_LOAD( m_dll, StartMovie, bOk );
wxDL_METHOD_LOAD( m_dll, StopMovie, bOk );
@@ -869,6 +875,7 @@ bool wxQuickTimeLibrary::Initialize()
wxDL_METHOD_LOAD( m_dll, GetMovieVolume, bOk );
wxDL_METHOD_LOAD( m_dll, SetMovieVolume, bOk );
wxLog::EnableLogging(true);
m_ok = true;
return true;
@@ -985,9 +992,15 @@ wxString wxAMMediaBackend::GetErrorString(HRESULT hrdsv)
//
// Sets m_hNotifyWnd to NULL to signify that we haven't loaded anything yet
//---------------------------------------------------------------------------
wxAMMediaBackend::wxAMMediaBackend() : m_state(wxMEDIASTATE_STOPPED),
m_pMC(NULL), m_pME(NULL), m_pMS(NULL), m_pBA(NULL), m_pGB(NULL),
m_pVMC(NULL), m_pThread(NULL)
wxAMMediaBackend::wxAMMediaBackend()
:m_state(wxMEDIASTATE_STOPPED)
,m_pVMC(NULL)
,m_pGB(NULL)
,m_pBA(NULL)
,m_pMC(NULL)
,m_pME(NULL)
,m_pMS(NULL)
,m_pThread(NULL)
#ifdef __WXDEBUG__
,m_hQuartzDll(NULL)
#endif