ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mess with Jake's code until it works in Linux. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2961 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-07 09:55:30 +00:00
parent 07eed4ed47
commit aaded4ec6d
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/Utilities/ScopedPtr.h
View File

@ -149,7 +149,7 @@ protected:
public:
typedef T element_type;
wxEXPLICIT ScopedArray(T * ptr = NULL) :
wxEXPLICIT ScopedArray(T * ptr = NULL)
{
m_array = ptr;
m_valid_range = 0xffffffff;

5
common/include/Utilities/ScopedPtrMT.h
View File

@ -15,7 +15,8 @@
#pragma once
#include "Threading.h"
#include "Threading.h"
using Threading::ScopedLock;
// --------------------------------------------------------------------------------------
// ScopedPtrMT
@ -44,7 +45,7 @@ public:
ScopedPtrMT& Reassign(T * ptr = NULL)
{
TPtr doh = (TPtr)AtomicExchangePointer( m_ptr, ptr );
TPtr doh = (TPtr)Threading::AtomicExchangePointer( m_ptr, ptr );
if ( ptr != doh ) delete doh;
return *this;
}

1
common/src/Utilities/CMakeLists.txt
View File

@ -154,6 +154,7 @@ set(UtilitiesHeaders
../../include/Utilities/RedtapeWindows.h
../../include/Utilities/SafeArray.h
../../include/Utilities/ScopedPtr.h
../../include/Utilities/ScopedPtrMT.h
../../include/Utilities/StringHelpers.h
../../include/Utilities/Threading.h
../../include/Utilities/ThreadingDialogs.h

17
pcsx2/gui/AppCorePlugins.cpp
View File

@ -166,7 +166,7 @@ public:
m_pid = pid;
m_method = method;
}
protected:
void InvokeEvent()
{
@ -203,10 +203,11 @@ AppPluginManager::~AppPluginManager() throw()
}
void AppPluginManager::Load( PluginsEnum_t pid, const wxString& srcfile )
{
{
if( !wxThread::IsMain() )
{
wxGetApp().ProcessAction( LoadSinglePluginEvent( pid, srcfile ) );
LoadSinglePluginEvent evt( pid, srcfile );
wxGetApp().ProcessAction( evt);
Sleep( 5 );
return;
}
@ -218,7 +219,8 @@ void AppPluginManager::Unload( PluginsEnum_t pid )
{
if( !wxThread::IsMain() )
{
wxGetApp().ProcessAction( SinglePluginMethodEvent( &AppPluginManager::Unload, pid ) );
SinglePluginMethodEvent evt( &AppPluginManager::Unload, pid );
wxGetApp().ProcessAction( evt );
Sleep( 5 );
return;
}
@ -245,7 +247,9 @@ void AppPluginManager::Init( PluginsEnum_t pid )
{
if( !wxThread::IsMain() )
{
wxGetApp().ProcessAction( SinglePluginMethodEvent( &AppPluginManager::Init, pid ) );
//pxInvokeActionEvent& evt = SinglePluginMethodEvent( &AppPluginManager::Init, pid );
SinglePluginMethodEvent evt(&AppPluginManager::Init, pid);
wxGetApp().ProcessAction( evt );
Sleep( 5 );
return;
}
@ -257,7 +261,8 @@ void AppPluginManager::Shutdown( PluginsEnum_t pid )
{
if( !wxThread::IsMain() )
{
wxGetApp().ProcessAction( SinglePluginMethodEvent( &AppPluginManager::Shutdown, pid ) );
SinglePluginMethodEvent evt( &AppPluginManager::Shutdown, pid );
wxGetApp().ProcessAction( evt );
Sleep( 5 );
return;
}