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

Linux doesn't use NTFS compression. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2938 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-03 19:35:33 +00:00
parent 70d47bf240
commit 97e6d37e39
7 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/IPU/IPU.cpp
View File

@ -41,7 +41,7 @@
static tIPU_DMA g_nDMATransfer(0); static tIPU_DMA g_nDMATransfer(0);
static tIPU_cmd ipu_cmd; static tIPU_cmd ipu_cmd;
static IPUStatus IPU1Status;
// FIXME - g_nIPU0Data and Pointer are not saved in the savestate, which breaks savestates for some // FIXME - g_nIPU0Data and Pointer are not saved in the savestate, which breaks savestates for some
// FMVs at random (if they get saved during the half frame of a 30fps rate). The fix is complicated // FMVs at random (if they get saved during the half frame of a 30fps rate). The fix is complicated

2
pcsx2/IPU/IPU.h
View File

@ -65,8 +65,6 @@ struct IPUStatus {
u32 NextMem; u32 NextMem;
}; };
static IPUStatus IPU1Status;
#define DMA_MODE_NORMAL 0 #define DMA_MODE_NORMAL 0
#define DMA_MODE_CHAIN 1 #define DMA_MODE_CHAIN 1

4
pcsx2/gui/AppConfig.cpp
View File

@ -354,7 +354,9 @@ AppConfig::AppConfig()
Toolbar_ImageSize = 24; Toolbar_ImageSize = 24;
Toolbar_ShowLabels = true; Toolbar_ShowLabels = true;
#ifdef __WXMSW__
McdCompressNTFS = true; McdCompressNTFS = true;
#endif
McdEnableEjection = true; McdEnableEjection = true;
EnableSpeedHacks = false; EnableSpeedHacks = false;
EnableGameFixes = false; EnableGameFixes = false;
@ -440,7 +442,9 @@ void AppConfig::LoadSaveRootItems( IniInterface& ini )
IniEntry( EnableSpeedHacks ); IniEntry( EnableSpeedHacks );
IniEntry( EnableGameFixes ); IniEntry( EnableGameFixes );
#ifdef __WXMSW__
IniEntry( McdCompressNTFS ); IniEntry( McdCompressNTFS );
#endif
IniEntry( McdEnableEjection ); IniEntry( McdEnableEjection );
ini.EnumEntry( L"CdvdSource", CdvdSource, CDVD_SourceLabels, defaults.CdvdSource ); ini.EnumEntry( L"CdvdSource", CdvdSource, CDVD_SourceLabels, defaults.CdvdSource );

3
pcsx2/gui/AppConfig.h
View File

@ -205,10 +205,9 @@ public:
// Enables display of toolbar text labels. // Enables display of toolbar text labels.
bool Toolbar_ShowLabels; bool Toolbar_ShowLabels;
#ifdef __WXMSW__
// uses automatic ntfs compression when creating new memory cards (Win32 only) // uses automatic ntfs compression when creating new memory cards (Win32 only)
// (Used in several places, so it's easier
bool McdCompressNTFS; bool McdCompressNTFS;
#endif
// Force-ejects modified memory cards when loading savestates (avoids corruption) // Force-ejects modified memory cards when loading savestates (avoids corruption)
bool McdEnableEjection; bool McdEnableEjection;

2
pcsx2/gui/AppMain.cpp
View File

@ -589,7 +589,9 @@ void AppApplySettings( const AppConfig* oldconf )
// Update the compression attribute on the Memcards folder. // Update the compression attribute on the Memcards folder.
// Memcards generally compress very well via NTFS compression. // Memcards generally compress very well via NTFS compression.
#ifdef __WXMSW__
NTFS_CompressFile( g_Conf->Folders.MemoryCards.ToString(), g_Conf->McdCompressNTFS ); NTFS_CompressFile( g_Conf->Folders.MemoryCards.ToString(), g_Conf->McdCompressNTFS );
#endif
sApp.DispatchEvent( AppStatus_SettingsApplied ); sApp.DispatchEvent( AppStatus_SettingsApplied );
paused_core.AllowResume(); paused_core.AllowResume();

10
pcsx2/gui/Dialogs/McdConfigDialog.cpp
View File

@ -57,27 +57,33 @@ Panels::McdConfigPanel_Toggles::McdConfigPanel_Toggles(wxWindow *parent)
) )
); );
*this += m_check_Ejection | pxExpand;
#ifdef __WXMSW__ #ifdef __WXMSW__
m_check_CompressNTFS = new pxCheckBox( this, m_check_CompressNTFS = new pxCheckBox( this,
_("Enable NTFS Compression on all cards by default."), _("Enable NTFS Compression on all cards by default."),
GetMsg_McdNtfsCompress() GetMsg_McdNtfsCompress()
); );
#endif
*this += m_check_Ejection | pxExpand;
*this += m_check_CompressNTFS | pxExpand; *this += m_check_CompressNTFS | pxExpand;
#endif
} }
void Panels::McdConfigPanel_Toggles::Apply() void Panels::McdConfigPanel_Toggles::Apply()
{ {
g_Conf->McdEnableEjection = m_check_Ejection->GetValue(); g_Conf->McdEnableEjection = m_check_Ejection->GetValue();
#ifdef __WXMSW__
g_Conf->McdCompressNTFS = m_check_CompressNTFS->GetValue(); g_Conf->McdCompressNTFS = m_check_CompressNTFS->GetValue();
#endif
} }
void Panels::McdConfigPanel_Toggles::AppStatusEvent_OnSettingsApplied() void Panels::McdConfigPanel_Toggles::AppStatusEvent_OnSettingsApplied()
{ {
m_check_Ejection ->SetValue( g_Conf->McdEnableEjection ); m_check_Ejection ->SetValue( g_Conf->McdEnableEjection );
#ifdef __WXMSW__
m_check_CompressNTFS ->SetValue( g_Conf->McdCompressNTFS ); m_check_CompressNTFS ->SetValue( g_Conf->McdCompressNTFS );
#endif
} }
Panels::McdConfigPanel_Standard::McdConfigPanel_Standard(wxWindow *parent) : _parent( parent ) Panels::McdConfigPanel_Standard::McdConfigPanel_Standard(wxWindow *parent) : _parent( parent )

2
pcsx2/gui/MemoryCardFile.cpp
View File

@ -102,7 +102,9 @@ FileMemoryCard::FileMemoryCard()
// [TODO] : Add memcard size detection and report it to the console log. // [TODO] : Add memcard size detection and report it to the console log.
// (8MB, 256Mb, whatever) // (8MB, 256Mb, whatever)
#ifdef __WXMSW__
NTFS_CompressFile( str, g_Conf->McdCompressNTFS ); NTFS_CompressFile( str, g_Conf->McdCompressNTFS );
#endif
if( !m_file[port][slot].Open( str.c_str(), L"r+b" ) ) if( !m_file[port][slot].Open( str.c_str(), L"r+b" ) )
{ {