Browse files

adding return to xell (long press on back + logo)

  • Loading branch information...
1 parent 5e3579e commit 5aea3c82152ed18cc7bfc171079a68203b5669e0 @gligli committed Feb 19, 2012
View
2 source/plugins/xenon_audio_repair110/spu.h
@@ -26,5 +26,5 @@
void SetupTimer(void);
-void RemoveTimer(void);
+extern "C" void RemoveTimer(void);
extern "C" void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);
View
5 source/plugins/xenon_audio_repair110/xr_spu.cpp
@@ -129,6 +129,7 @@ int reverb_target;
#include <stdio.h>
+#include <cstdlib>
extern FILE *fp_spu_log;
@@ -835,6 +836,7 @@ INLINE void OutStoreInterpolationVal(int val_l, int val_r)
////////////////////////////////////////////////////////////////////////
#include "xr_xa.cpp"
+#include "spu.h"
////////////////////////////////////////////////////////////////////////
// START SOUND... called by main thread to setup a new sound on a channel
@@ -2644,6 +2646,7 @@ void SetupTimer(void)
#ifdef LIBXENON
if(!iUseTimer) // linux: use thread
{
+ atexit(RemoveTimer);
xenon_run_thread_task(3, thread_stack+(3*0x100000), (void*)MAINThread);
}
#else
@@ -2665,7 +2668,7 @@ void SetupTimer(void)
// REMOVETIMER: kill threads/timers
////////////////////////////////////////////////////////////////////////
-void RemoveTimer(void)
+extern "C" void RemoveTimer(void)
{
bEndThread=1; // raise flag to end thread
View
7 source/plugins/xenon_input/pad.c
@@ -78,8 +78,11 @@ void PSxInputReadPort(PadDataS* pad, int port) {
if(old[port].logo){
reset_time++;
if(reset_time>50){
- //exit(0);//return to xell
- enableCapture();
+ if (g.PadState[port].JoyDev.select){
+ exit(0);//return to xell
+ }else{
+ enableCapture();
+ }
}
}
else{

0 comments on commit 5aea3c8

Please sign in to comment.