diff --git a/common/build/Utilities/Utilities.cbp b/common/build/Utilities/Utilities.cbp index bd9a6ac593..ba2862ca5b 100644 --- a/common/build/Utilities/Utilities.cbp +++ b/common/build/Utilities/Utilities.cbp @@ -19,8 +19,6 @@ - - @@ -63,15 +61,27 @@ + + + + + + + + + + + + - - - - + + + + @@ -83,12 +93,12 @@ - - + + - - + + diff --git a/pcsx2-codeblocks.workspace b/pcsx2-codeblocks.workspace index 6aa305ae6e..0f78b59918 100644 --- a/pcsx2-codeblocks.workspace +++ b/pcsx2-codeblocks.workspace @@ -1,12 +1,7 @@ - - - - - - + @@ -22,6 +17,6 @@ - + diff --git a/pcsx2/GSState.cpp b/pcsx2/GSState.cpp index da4838d350..6236e78748 100644 --- a/pcsx2/GSState.cpp +++ b/pcsx2/GSState.cpp @@ -1,6 +1,6 @@ /* PCSX2 - PS2 Emulator for PCs * Copyright (C) 2002-2009 PCSX2 Dev Team - * + * * PCSX2 is free software: you can redistribute it and/or modify it under the terms * of the GNU Lesser General Public License as published by the Free Software Found- * ation, either version 3 of the License, or (at your option) any later version. @@ -16,6 +16,7 @@ #include "PrecompiledHeader.h" #include "GS.h" +#include #ifdef PCSX2_DEVBUILD void SaveGSState(const wxString& file) @@ -134,7 +135,7 @@ void RunGSState( gzLoadingState& f ) *(u32*)(PS2MEM_GS+0x1000) = (*(u32*)(PS2MEM_GS+0x1000) & ~(1<<13)) | newfield; GSvsync(newfield); - + // fixme : Process pending app messages here. //SysUpdate(); @@ -150,4 +151,4 @@ void RunGSState( gzLoadingState& f ) it = packets.begin(); } } -#endif \ No newline at end of file +#endif diff --git a/pcsx2/IPU/mpeg2lib/Mpeg.cpp b/pcsx2/IPU/mpeg2lib/Mpeg.cpp index 3c8cc3451c..de153b1274 100644 --- a/pcsx2/IPU/mpeg2lib/Mpeg.cpp +++ b/pcsx2/IPU/mpeg2lib/Mpeg.cpp @@ -1130,9 +1130,6 @@ void __forceinline finishmpeg2sliceIDEC(decoder_t* &decoder) waitForSCD(); } -// This fixes Mana Khemia if uncommented, but needs testing. -// Breaks Figital Devil Saga. -//#define ALWAYS_RESUME_BEFORE_EXITING void mpeg2sliceIDEC(void* pdone) { u32 read; diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp index 0a192f3482..d28cef9363 100644 --- a/pcsx2/Linux/pcsx2.cbp +++ b/pcsx2/Linux/pcsx2.cbp @@ -164,9 +164,9 @@ - - - + + + @@ -268,8 +268,8 @@ - - + + diff --git a/plugins/SPU2null/Linux/Config.h b/plugins/SPU2null/Linux/Config.h index ea196262a9..90b6a3c21c 100644 --- a/plugins/SPU2null/Linux/Config.h +++ b/plugins/SPU2null/Linux/Config.h @@ -14,17 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - + */ + #include #include #include #include using namespace std; -void SaveConf(); -void LoadConf(); +extern void SaveConf(); +extern void LoadConf(); extern string s_strIniPath; +extern GtkWidget *MsgDlg; +exter void OnMsg_Ok(); #define is_checked(main_widget, widget_name) (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(main_widget, widget_name)))) #define set_checked(main_widget,widget_name, state) gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(lookup_widget(main_widget, widget_name)), state) diff --git a/plugins/spu2-x/src/Linux/Alsa.cpp b/plugins/spu2-x/src/Linux/Alsa.cpp index 8f6cfa0484..41b2224a49 100644 --- a/plugins/spu2-x/src/Linux/Alsa.cpp +++ b/plugins/spu2-x/src/Linux/Alsa.cpp @@ -1,6 +1,6 @@ /* SPU2-X, A plugin for Emulating the Sound Processing Unit of the Playstation 2 * Developed and maintained by the Pcsx2 Development Team. - * + * * Original portions from SPU2ghz are (c) 2008 by David Quintana [gigaherz] * * SPU2-X is free software: you can redistribute it and/or modify it under the terms @@ -34,7 +34,7 @@ protected: snd_pcm_t *handle; snd_pcm_uframes_t buffer_size; snd_async_handler_t *pcm_callback; - + uint period_time; uint buffer_time; @@ -70,7 +70,7 @@ protected: // Not sure if we just need an assert, or something like this: //if( data->handle != snd_async_handler_get_pcm(pcm_callback) ) return; - + data->_InternalCallback(); } @@ -87,60 +87,60 @@ public: handle = NULL; pcm_callback = NULL; pspeed = SAMPLE_RATE; - + // buffer time and period time are in microseconds... // (don't simplify the equation below -- it'll just cause integer rounding errors. period_time = (SndOutPacketSize*1000) / (SampleRate / 1000); buffer_time = period_time * NumBuffers; int err; - + err = snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); - if(err < 0) + if(err < 0) { ERROR_LOG("Audio open error: %s\n", snd_strerror(err)); return -1; } - + err = snd_pcm_nonblock(handle, 0); - if(err < 0) + if(err < 0) { ERROR_LOG("Can't set blocking mode: %s\n", snd_strerror(err)); return -1; } - + snd_pcm_hw_params_alloca(&hwparams); snd_pcm_sw_params_alloca(&swparams); - + err = snd_pcm_hw_params_any(handle, hwparams); - if (err < 0) + if (err < 0) { ERROR_LOG("Broken configuration for this PCM: %s\n", snd_strerror(err)); return -1; } - + err = snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); - if (err < 0) + if (err < 0) { ERROR_LOG("Access type not available: %s\n", snd_strerror(err)); return -1; } err = snd_pcm_hw_params_set_format(handle, hwparams, format); - if (err < 0) + if (err < 0) { ERROR_LOG("Sample format not available: %s\n", snd_strerror(err)); return -1; } - + err = snd_pcm_hw_params_set_channels(handle, hwparams, pchannels); - if (err < 0) + if (err < 0) { ERROR_LOG("Channels count not available: %s\n", snd_strerror(err)); return -1; } err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &pspeed, 0); - if (err < 0) + if (err < 0) { ERROR_LOG("Rate not available: %s\n", snd_strerror(err)); return -1; @@ -151,31 +151,31 @@ public: ERROR_LOG("Buffer time error: %s\n", snd_strerror(err)); return -1; } - + err = snd_pcm_hw_params_set_period_time_near(handle, hwparams, &period_time, 0); if (err < 0) { ERROR_LOG("Period time error: %s\n", snd_strerror(err)); return -1; } - + err = snd_pcm_hw_params(handle, hwparams); - if (err < 0) + if (err < 0) { ERROR_LOG("Unable to install hw params: %s\n", snd_strerror(err)); return -1; } - + snd_pcm_status_alloca(&status); err = snd_pcm_status(handle, status); - if(err < 0) + if(err < 0) { ERROR_LOG("Unable to get status: %s\n", snd_strerror(err)); return -1; } // Bind our asynchronous callback magic: - + snd_async_add_pcm_handler( &pcm_callback, handle, ExternalCallback, this ); snd_pcm_start( handle ); @@ -199,7 +199,7 @@ public: } virtual bool Is51Out() const { return false; } - + s32 Test() const { return 0; @@ -210,7 +210,7 @@ public: if(handle == NULL) return 0; // Returns the amount of free buffer space, in samples. - uint l = snd_pcm_avail_update(handle); + uint l = snd_pcm_avail_update(handle); if( l < 0 ) return 0; return (l / 1000) * (SampleRate / 1000); } @@ -234,4 +234,4 @@ public: } } static Alsa; -SndOutModule *AlsaOut = &Alsa; +SndOutModule *AlsaOut = &Alsa; diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp index c896779f41..bdb995b36f 100644 --- a/plugins/spu2-x/src/Linux/Config.cpp +++ b/plugins/spu2-x/src/Linux/Config.cpp @@ -1,6 +1,6 @@ /* SPU2-X, A plugin for Emulating the Sound Processing Unit of the Playstation 2 * Developed and maintained by the Pcsx2 Development Team. - * + * * Original portions from SPU2ghz are (c) 2008 by David Quintana [gigaherz] * * SPU2-X is free software: you can redistribute it and/or modify it under the terms @@ -97,8 +97,12 @@ void WriteSettings() { } - + void configure() { ReadSettings(); } + +void SysMessage(char const*, ...) +{ +} diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp index 9327345b9c..f127945b60 100644 --- a/plugins/spu2-x/src/Linux/SPU2-X.cbp +++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp @@ -7,9 +7,9 @@