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

Tweaking the GS frame a bit, and reverse the meaning of that SPU2-X timestretch enable boolean. Hate double negations! :p 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2840 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2 2010-04-13 11:07:18 +00:00
parent d6c2ba9a44
commit a1706ed9f4
8 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/gui/FrameForGS.cpp
View File

@ -119,9 +119,8 @@ void GSPanel::DoResize()
// Default to matching client size. // Default to matching client size.
// Add a few pixels here, so the outermost pixels of the GS plugin output are "hidden". // Add a few pixels here, so the outermost pixels of the GS plugin output are "hidden".
// This avoids issues with flashing pixels on the edges, especially when Anti Aliasing is used. // This avoids issues with flashing pixels on the edges, especially when Anti Aliasing is used.
// Note: Tests in FFX showed we need at least 5 pixels. So using 6 for good measure :p viewport.x+=4;
viewport.x+=6; viewport.y+=4;
viewport.y+=6;
break; break;
case AspectRatio_4_3: case AspectRatio_4_3:
@ -209,6 +208,8 @@ void GSPanel::OnFocus( wxFocusEvent& evt )
} }
else else
DoShowMouse(); DoShowMouse();
//Console.Warning("GS frame > focus set");
} }
void GSPanel::OnFocusLost( wxFocusEvent& evt ) void GSPanel::OnFocusLost( wxFocusEvent& evt )
@ -216,6 +217,7 @@ void GSPanel::OnFocusLost( wxFocusEvent& evt )
evt.Skip(); evt.Skip();
m_HasFocus = false; m_HasFocus = false;
DoShowMouse(); DoShowMouse();
//Console.Warning("GS frame > focus lost");
} }
void GSPanel::AppStatusEvent_OnSettingsApplied() void GSPanel::AppStatusEvent_OnSettingsApplied()

2
plugins/spu2-x/src/Config.h
View File

@ -67,7 +67,7 @@ extern bool EffectsDisabled;
extern u32 OutputModule; extern u32 OutputModule;
extern int SndOutLatencyMS; extern int SndOutLatencyMS;
extern bool timeStretchDisabled; extern bool timeStretchEnabled;
extern bool asyncMixingEnabled; extern bool asyncMixingEnabled;
#ifndef __LINUX__ #ifndef __LINUX__

12
plugins/spu2-x/src/Linux/Config.cpp
View File

@ -47,7 +47,7 @@ int ReverbBoost = 0;
// OUTPUT // OUTPUT
u32 OutputModule = FindOutputModuleById( PortaudioOut->GetIdent() ); u32 OutputModule = FindOutputModuleById( PortaudioOut->GetIdent() );
int SndOutLatencyMS = 160; int SndOutLatencyMS = 160;
bool timeStretchDisabled = false; bool timeStretchEnabled = true;
bool asyncMixingEnabled = false; bool asyncMixingEnabled = false;
/*****************************************************************************/ /*****************************************************************************/
@ -63,7 +63,7 @@ void ReadSettings()
OutputModule = FindOutputModuleById( temp.c_str() );// find the driver index of this module OutputModule = FindOutputModuleById( temp.c_str() );// find the driver index of this module
SndOutLatencyMS = CfgReadInt(L"OUTPUT",L"Latency", 150); SndOutLatencyMS = CfgReadInt(L"OUTPUT",L"Latency", 150);
timeStretchDisabled = CfgReadBool( L"OUTPUT", L"Disable_Timestretch", false ); timeStretchEnabled = CfgReadBool( L"OUTPUT", L"Enable_Timestretch", true );
asyncMixingEnabled = CfgReadBool( L"OUTPUT", L"Enable_AsyncMixing", false ); asyncMixingEnabled = CfgReadBool( L"OUTPUT", L"Enable_AsyncMixing", false );
PortaudioOut->ReadSettings(); PortaudioOut->ReadSettings();
@ -88,7 +88,7 @@ void WriteSettings()
CfgWriteStr(L"OUTPUT",L"Output_Module", mods[OutputModule]->GetIdent() ); CfgWriteStr(L"OUTPUT",L"Output_Module", mods[OutputModule]->GetIdent() );
CfgWriteInt(L"OUTPUT",L"Latency", SndOutLatencyMS); CfgWriteInt(L"OUTPUT",L"Latency", SndOutLatencyMS);
CfgWriteBool(L"OUTPUT",L"Disable_Timestretch", timeStretchDisabled); CfgWriteBool(L"OUTPUT",L"Enable_Timestretch", timeStretchEnabled);
CfgWriteBool(L"OUTPUT",L"Enable_AsyncMixing", asyncMixingEnabled); CfgWriteBool(L"OUTPUT",L"Enable_AsyncMixing", asyncMixingEnabled);
PortaudioOut->WriteSettings(); PortaudioOut->WriteSettings();
@ -171,7 +171,7 @@ void DisplayDialog()
latency_slide = gtk_hscale_new_with_range(LATENCY_MIN, LATENCY_MAX, 5); latency_slide = gtk_hscale_new_with_range(LATENCY_MIN, LATENCY_MAX, 5);
gtk_range_set_value(GTK_RANGE(latency_slide), SndOutLatencyMS); gtk_range_set_value(GTK_RANGE(latency_slide), SndOutLatencyMS);
time_check = gtk_check_button_new_with_label("Disable Time Stretch"); time_check = gtk_check_button_new_with_label("Enable Time Stretch");
advanced_button = gtk_button_new_with_label("Advanced..."); advanced_button = gtk_button_new_with_label("Advanced...");
@ -206,7 +206,7 @@ void DisplayDialog()
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(effects_check), EffectsDisabled); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(effects_check), EffectsDisabled);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(debug_check), DebugEnabled); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(debug_check), DebugEnabled);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(time_check), timeStretchDisabled); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(time_check), timeStretchEnabled);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), main_frame); gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), main_frame);
gtk_widget_show_all (dialog); gtk_widget_show_all (dialog);
@ -233,7 +233,7 @@ void DisplayDialog()
OutputModule = FindOutputModuleById( PortaudioOut->GetIdent() ); OutputModule = FindOutputModuleById( PortaudioOut->GetIdent() );
SndOutLatencyMS = gtk_range_get_value(GTK_RANGE(latency_slide)); SndOutLatencyMS = gtk_range_get_value(GTK_RANGE(latency_slide));
timeStretchDisabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(time_check)); timeStretchEnabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(time_check));
} }
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);

2
plugins/spu2-x/src/Linux/Config.h
View File

@ -78,7 +78,7 @@ extern wchar_t dspPlugin[];
extern int dspPluginModule; extern int dspPluginModule;
extern bool dspPluginEnabled; extern bool dspPluginEnabled;
extern bool timeStretchDisabled; extern bool timeStretchEnabled;
extern bool asyncMixingEnabled; extern bool asyncMixingEnabled;
extern bool StereoExpansionEnabled; extern bool StereoExpansionEnabled;

10
plugins/spu2-x/src/SndOut.cpp
View File

@ -127,7 +127,7 @@ bool SndBuffer::CheckUnderrunStatus( int& nSamples, int& quietSampleCount )
quietSampleCount = 0; quietSampleCount = 0;
if( m_underrun_freeze ) if( m_underrun_freeze )
{ {
int toFill = m_size / (timeStretchDisabled && !asyncMixingEnabled ? 32 : 400); int toFill = m_size / (!timeStretchEnabled && !asyncMixingEnabled ? 32 : 400);
toFill = GetAlignedBufferSize( toFill ); toFill = GetAlignedBufferSize( toFill );
// toFill is now aligned to a SndOutPacket // toFill is now aligned to a SndOutPacket
@ -149,7 +149,7 @@ bool SndBuffer::CheckUnderrunStatus( int& nSamples, int& quietSampleCount )
quietSampleCount = SndOutPacketSize - m_data; quietSampleCount = SndOutPacketSize - m_data;
m_underrun_freeze = true; m_underrun_freeze = true;
if( !timeStretchDisabled && !asyncMixingEnabled ) if( timeStretchEnabled && !asyncMixingEnabled )
timeStretchUnderrun(); timeStretchUnderrun();
return nSamples != 0; return nSamples != 0;
@ -192,7 +192,7 @@ void SndBuffer::_WriteSamples(StereoOut32 *bData, int nSamples)
s32 comp; s32 comp;
if( !timeStretchDisabled && !asyncMixingEnabled ) if( timeStretchEnabled && !asyncMixingEnabled )
{ {
comp = timeStretchOverrun(); comp = timeStretchOverrun();
} }
@ -350,7 +350,7 @@ void SndBuffer::Write( const StereoOut32& Sample )
{ {
for( int i=0; i<SndOutPacketSize; ++i, ++ei ) { sndTempBuffer[i] = sndTempBuffer16[ei].UpSample(); } for( int i=0; i<SndOutPacketSize; ++i, ++ei ) { sndTempBuffer[i] = sndTempBuffer16[ei].UpSample(); }
if( !timeStretchDisabled && !asyncMixingEnabled ) if( timeStretchEnabled && !asyncMixingEnabled )
timeStretchWrite(); timeStretchWrite();
else else
_WriteSamples(sndTempBuffer, SndOutPacketSize); _WriteSamples(sndTempBuffer, SndOutPacketSize);
@ -369,7 +369,7 @@ void SndBuffer::Write( const StereoOut32& Sample )
#endif #endif
else else
{ {
if( !timeStretchDisabled && !asyncMixingEnabled ) if( timeStretchEnabled && !asyncMixingEnabled )
timeStretchWrite(); timeStretchWrite();
else else
_WriteSamples(sndTempBuffer, SndOutPacketSize); _WriteSamples(sndTempBuffer, SndOutPacketSize);

14
plugins/spu2-x/src/Windows/Config.cpp
View File

@ -40,7 +40,7 @@ bool EffectsDisabled = false;
// OUTPUT // OUTPUT
int SndOutLatencyMS = 150; int SndOutLatencyMS = 150;
bool timeStretchDisabled = false; bool timeStretchEnabled = true;
bool asyncMixingEnabled = false; bool asyncMixingEnabled = false;
u32 OutputModule = 0; u32 OutputModule = 0;
@ -62,7 +62,7 @@ void ReadSettings()
Interpolation = CfgReadInt( L"MIXING",L"Interpolation", 1 ); Interpolation = CfgReadInt( L"MIXING",L"Interpolation", 1 );
ReverbBoost = CfgReadInt( L"MIXING",L"Reverb_Boost", 0 ); ReverbBoost = CfgReadInt( L"MIXING",L"Reverb_Boost", 0 );
timeStretchDisabled = CfgReadBool( L"OUTPUT", L"Disable_Timestretch", false ); timeStretchEnabled = CfgReadBool( L"OUTPUT", L"Enable_Timestretch", true );
asyncMixingEnabled = CfgReadBool( L"OUTPUT", L"Enable_AsyncMixing", false ); asyncMixingEnabled = CfgReadBool( L"OUTPUT", L"Enable_AsyncMixing", false );
EffectsDisabled = CfgReadBool( L"MIXING", L"Disable_Effects", false ); EffectsDisabled = CfgReadBool( L"MIXING", L"Disable_Effects", false );
@ -113,7 +113,7 @@ void WriteSettings()
CfgWriteStr(L"OUTPUT",L"Output_Module", mods[OutputModule]->GetIdent() ); CfgWriteStr(L"OUTPUT",L"Output_Module", mods[OutputModule]->GetIdent() );
CfgWriteInt(L"OUTPUT",L"Latency", SndOutLatencyMS); CfgWriteInt(L"OUTPUT",L"Latency", SndOutLatencyMS);
CfgWriteBool(L"OUTPUT",L"Disable_Timestretch", timeStretchDisabled); CfgWriteBool(L"OUTPUT",L"Enable_Timestretch", timeStretchEnabled);
CfgWriteBool(L"OUTPUT",L"Enable_AsyncMixing", asyncMixingEnabled); CfgWriteBool(L"OUTPUT",L"Enable_AsyncMixing", asyncMixingEnabled);
CfgWriteBool(L"OUTPUT",L"Enable_StereoExpansion", StereoExpansionEnabled); CfgWriteBool(L"OUTPUT",L"Enable_StereoExpansion", StereoExpansionEnabled);
@ -177,12 +177,12 @@ BOOL CALLBACK ConfigProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
swprintf_s(temp,L"%d ms (avg)",SndOutLatencyMS); swprintf_s(temp,L"%d ms (avg)",SndOutLatencyMS);
SetWindowText(GetDlgItem(hWnd,IDC_LATENCY_LABEL),temp); SetWindowText(GetDlgItem(hWnd,IDC_LATENCY_LABEL),temp);
EnableWindow( GetDlgItem( hWnd, IDC_OPEN_CONFIG_SOUNDTOUCH ), !timeStretchDisabled ); EnableWindow( GetDlgItem( hWnd, IDC_OPEN_CONFIG_SOUNDTOUCH ), timeStretchEnabled );
EnableWindow( GetDlgItem( hWnd, IDC_OPEN_CONFIG_DEBUG ), DebugEnabled ); EnableWindow( GetDlgItem( hWnd, IDC_OPEN_CONFIG_DEBUG ), DebugEnabled );
SET_CHECK(IDC_EFFECTS_DISABLE, EffectsDisabled); SET_CHECK(IDC_EFFECTS_DISABLE, EffectsDisabled);
SET_CHECK(IDC_EXPANSION_ENABLE,StereoExpansionEnabled); SET_CHECK(IDC_EXPANSION_ENABLE,StereoExpansionEnabled);
SET_CHECK(IDC_TS_DISABLE, timeStretchDisabled); SET_CHECK(IDC_TS_ENABLE, timeStretchEnabled);
SET_CHECK(IDC_DEBUG_ENABLE, DebugEnabled); SET_CHECK(IDC_DEBUG_ENABLE, DebugEnabled);
SET_CHECK(IDC_DSP_ENABLE, dspPluginEnabled); SET_CHECK(IDC_DSP_ENABLE, dspPluginEnabled);
} }
@ -239,8 +239,8 @@ BOOL CALLBACK ConfigProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam)
HANDLE_CHECK(IDC_EFFECTS_DISABLE,EffectsDisabled); HANDLE_CHECK(IDC_EFFECTS_DISABLE,EffectsDisabled);
HANDLE_CHECK(IDC_DSP_ENABLE,dspPluginEnabled); HANDLE_CHECK(IDC_DSP_ENABLE,dspPluginEnabled);
HANDLE_CHECK(IDC_EXPANSION_ENABLE,StereoExpansionEnabled); HANDLE_CHECK(IDC_EXPANSION_ENABLE,StereoExpansionEnabled);
HANDLE_CHECKNB(IDC_TS_DISABLE,timeStretchDisabled); HANDLE_CHECKNB(IDC_TS_ENABLE,timeStretchEnabled);
EnableWindow( GetDlgItem( hWnd, IDC_OPEN_CONFIG_SOUNDTOUCH ), !timeStretchDisabled ); EnableWindow( GetDlgItem( hWnd, IDC_OPEN_CONFIG_SOUNDTOUCH ), timeStretchEnabled );
break; break;
HANDLE_CHECKNB(IDC_DEBUG_ENABLE,DebugEnabled); HANDLE_CHECKNB(IDC_DEBUG_ENABLE,DebugEnabled);

2
plugins/spu2-x/src/Windows/Spu2-X.rc
View File

@ -58,7 +58,7 @@ BEGIN
PUSHBUTTON "Configure...",IDC_OUTCONF,236,40,54,12 PUSHBUTTON "Configure...",IDC_OUTCONF,236,40,54,12
COMBOBOX IDC_INTERPOLATE,14,26,114,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_INTERPOLATE,14,26,114,84,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Slider2",IDC_LATENCY_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,167,73,116,10 CONTROL "Slider2",IDC_LATENCY_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,167,73,116,10
CONTROL "Disable Time-stretching",IDC_TS_DISABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,96,121,11 CONTROL "Enable Time-stretching",IDC_TS_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,96,121,11
CONTROL "Use a Winamp DSP plugin",IDC_DSP_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,216,126,11 CONTROL "Use a Winamp DSP plugin",IDC_DSP_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,149,216,126,11
CHECKBOX "Disable Effects Processing",IDC_EFFECTS_DISABLE,14,47,112,10,NOT WS_TABSTOP CHECKBOX "Disable Effects Processing",IDC_EFFECTS_DISABLE,14,47,112,10,NOT WS_TABSTOP
LTEXT "Latency:",IDC_STATIC,181,62,33,9,NOT WS_GROUP LTEXT "Latency:",IDC_STATIC,181,62,33,9,NOT WS_GROUP

2
plugins/spu2-x/src/Windows/resource.h
View File

@ -32,7 +32,7 @@
#define IDC_MSGSHOW 1024 #define IDC_MSGSHOW 1024
#define IDC_OUTCONF 1028 #define IDC_OUTCONF 1028
#define IDC_DSP_ENABLE 1029 #define IDC_DSP_ENABLE 1029
#define IDC_TS_DISABLE 1030 #define IDC_TS_ENABLE 1030
#define IDC_DS_DEVICE 1032 #define IDC_DS_DEVICE 1032
#define IDC_DBG_OVERRUNS 1038 #define IDC_DBG_OVERRUNS 1038
#define IDC_DBG_CACHE 1039 #define IDC_DBG_CACHE 1039