libretro/pcsx2
1
0
Fork 0
mirror of https://github.com/libretro/pcsx2.git synced 2024-12-13 21:28:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor cosmetic cleanups for the earlier Linux fixes.

Browse Source 
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2925 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-04-28 16:25:04 +00:00
parent 5c20358c19
commit aae53a9707
5 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/PluginManager.cpp
View File

@ -1486,12 +1486,12 @@ const wxString PluginManager::GetName( PluginsEnum_t pid ) const
{
ScopedLock lock( m_mtx_PluginStatus );
pxAssume( (uint)pid < PluginId_Count );
return m_info[pid] ? m_info[pid]->Name : wxT("Unloaded Plugin");
return m_info[pid] ? m_info[pid]->Name : (wxString)_("Unloaded Plugin");
}
const wxString PluginManager::GetVersion( PluginsEnum_t pid ) const
{
ScopedLock lock( m_mtx_PluginStatus );
pxAssume( (uint)pid < PluginId_Count );
return m_info[pid] ? m_info[pid]->Version : wxT("0.0");
return m_info[pid] ? m_info[pid]->Version : L"0.0";
}

18
pcsx2/SaveState.h
View File

@ -101,6 +101,8 @@ namespace Exception
};
}
typedef SafeArray<u8> VmStateBuffer;
// --------------------------------------------------------------------------------------
// SaveStateBase class
// --------------------------------------------------------------------------------------
@ -110,7 +112,7 @@ namespace Exception
class SaveStateBase
{
protected:
SafeArray<u8>* m_memory;
VmStateBuffer* m_memory;
char m_tagspace[32];
u32 m_version; // version of the savestate being loaded.
@ -122,8 +124,8 @@ protected:
bool m_DidBios;
public:
SaveStateBase( SafeArray<u8>& memblock );
SaveStateBase( SafeArray<u8>* memblock );
SaveStateBase( VmStateBuffer& memblock );
SaveStateBase( VmStateBuffer* memblock );
virtual ~SaveStateBase() { }
static wxString GetFilename( int slot );
@ -191,7 +193,7 @@ public:
void gsFreeze();
protected:
void Init( SafeArray<u8>* memblock );
void Init( VmStateBuffer* memblock );
// Load/Save functions for the various components of our glorious emulator!
@ -236,8 +238,8 @@ protected:
public:
virtual ~memSavingState() throw() { }
memSavingState( SafeArray<u8>& save_to );
memSavingState( SafeArray<u8>* save_to );
memSavingState( VmStateBuffer& save_to );
memSavingState( VmStateBuffer* save_to );
// Saving of state data to a memory buffer
void FreezeMem( void* data, int size );
@ -251,8 +253,8 @@ class memLoadingState : public SaveStateBase
public:
virtual ~memLoadingState() throw();
memLoadingState( const SafeArray<u8>& load_from );
memLoadingState( const SafeArray<u8>* load_from );
memLoadingState( const VmStateBuffer& load_from );
memLoadingState( const VmStateBuffer* load_from );
// Loading of state data from a memory buffer...
void FreezeMem( void* data, int size );

4
pcsx2/ZipTools/thread_gzip.cpp
View File

@ -25,9 +25,9 @@ CompressThread_gzip::CompressThread_gzip( const wxString& file, SafeArray<u8>* s
{
m_gzfp = NULL;
}
// Believe it or not, the space in > > is required.
CompressThread_gzip::CompressThread_gzip( const wxString& file, ScopedPtr<SafeArray<u8> >& srcdata, FnType_WriteCompressedHeader* writeheader )
CompressThread_gzip::CompressThread_gzip( const wxString& file, ScopedPtr< SafeArray<u8> >& srcdata, FnType_WriteCompressedHeader* writeheader )
: BaseCompressThread( file, srcdata.DetachPtr(), writeheader )
{
m_gzfp = NULL;

4
pcsx2/gui/AppSaveStates.h
View File

@ -29,7 +29,7 @@
class SaveSinglePluginHelper
{
protected:
SafeArray<u8> m_plugstore;
VmStateBuffer m_plugstore;
bool m_validstate;
PluginsEnum_t m_pid;
@ -41,7 +41,7 @@ public:
};
extern SafeArray<u8>& StateCopy_GetBuffer();
extern VmStateBuffer& StateCopy_GetBuffer();
extern bool StateCopy_IsValid();
extern void StateCopy_FreezeToMem();

18
pcsx2/gui/SysState.cpp
View File

@ -22,7 +22,7 @@
#include "ZipTools/ThreadedZipTools.h"
// Used to hold the current state backup (fullcopy of PS2 memory and plugin states).
static SafeArray<u8> state_buffer( L"Public Savestate Buffer" );
static VmStateBuffer state_buffer( L"Public Savestate Buffer" );
static const char SavestateIdentString[] = "PCSX2 Savestate";
static const uint SavestateIdentLen = sizeof(SavestateIdentString);
@ -108,12 +108,12 @@ public:
class SysExecEvent_DownloadState : public SysExecEvent
{
protected:
SafeArray<u8>* m_dest_buffer;
VmStateBuffer* m_dest_buffer;
public:
virtual ~SysExecEvent_DownloadState() throw() {}
SysExecEvent_DownloadState* Clone() const { return new SysExecEvent_DownloadState( *this ); }
SysExecEvent_DownloadState( SafeArray<u8>* dest=&state_buffer )
SysExecEvent_DownloadState( VmStateBuffer* dest=&state_buffer )
{
m_dest_buffer = dest;
}
@ -140,7 +140,7 @@ protected:
class SysExecEvent_ZipToDisk : public SysExecEvent
{
protected:
SafeArray<u8>* m_src_buffer;
VmStateBuffer* m_src_buffer;
wxString m_filename;
public:
@ -152,15 +152,15 @@ public:
}
SysExecEvent_ZipToDisk* Clone() const { return new SysExecEvent_ZipToDisk( *this ); }
// Yep, gcc doesn't like >> again.
SysExecEvent_ZipToDisk( ScopedPtr<SafeArray<u8> >& src, const wxString& filename )
SysExecEvent_ZipToDisk( ScopedPtr<VmStateBuffer>& src, const wxString& filename )
: m_filename( filename )
{
m_src_buffer = src.DetachPtr();
}
SysExecEvent_ZipToDisk( SafeArray<u8>* src, const wxString& filename )
SysExecEvent_ZipToDisk( VmStateBuffer* src, const wxString& filename )
: m_filename( filename )
{
m_src_buffer = src;
@ -246,7 +246,7 @@ protected:
// StateCopy Public Interface
// =====================================================================================================
SafeArray<u8>& StateCopy_GetBuffer()
VmStateBuffer& StateCopy_GetBuffer()
{
return state_buffer;
}
@ -263,7 +263,7 @@ void StateCopy_FreezeToMem()
void StateCopy_SaveToFile( const wxString& file )
{
ScopedPtr<SafeArray<u8> > zipbuf(new SafeArray<u8>( L"Zippable Savestate" ));
ScopedPtr<VmStateBuffer> zipbuf(new VmStateBuffer( L"Zippable Savestate" ));
GetSysExecutorThread().PostEvent(new SysExecEvent_DownloadState( zipbuf ));
GetSysExecutorThread().PostEvent(new SysExecEvent_ZipToDisk( zipbuf, file ));
}