Fix compile in OSX by reverting my change, dunno why OpenAL is different on my machine. Bit of debug work in nJoy test

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3100 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 86 insertions, 8 deletions

diff --git a/Source/Core/AudioCommon/Src/OpenALStream.cpp b/Source/Core/AudioCommon/Src/OpenALStream.cpp
index 7784472257..3d21b9c7b7 100644
--- a/Source/Core/AudioCommon/Src/OpenALStream.cpp
+++ b/Source/Core/AudioCommon/Src/OpenALStream.cpp
@@ -33,11 +33,7 @@ bool OpenALStream::Start()
 	pDeviceList = new ALDeviceList();

 	if ((pDeviceList) && (pDeviceList->GetNumDevices()))

 	{

-#ifdef __APPLE__

-		pDevice = alcOpenDevice((ALCubyte*)pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice()));

-#else

 		pDevice = alcOpenDevice((const ALCchar *)pDeviceList->GetDeviceName(pDeviceList->GetDefaultDevice()));

-#endif

 		if (pDevice)

 		{

 			pContext = alcCreateContext(pDevice, NULL);

diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp
index 7545b405fb..38f8cd28f3 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.cpp
@@ -73,6 +73,7 @@ BEGIN_EVENT_TABLE(ConfigBox,wxDialog)
 	EVT_BUTTON(IDB_ANALOG_MAIN_Y, ConfigBox::GetInputs)
 	EVT_BUTTON(IDB_ANALOG_SUB_X, ConfigBox::GetInputs)
 	EVT_BUTTON(IDB_ANALOG_SUB_Y, ConfigBox::GetInputs)
+	EVT_BUTTON(IDB_BUTTONDEBUGSTART,ConfigBox::StartDebug)
 END_EVENT_TABLE()
 
 ConfigBox::ConfigBox(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style)
@@ -123,6 +124,8 @@ void ConfigBox::CreateGUIControls()
 	m_Notebook->AddPage(m_Controller[2], wxT("Controller 3"));
 	m_Controller[3] = new wxPanel(m_Notebook, ID_CONTROLLERPAGE4, wxPoint(0, 0), wxSize(600, 400));
 	m_Notebook->AddPage(m_Controller[3], wxT("Controller 4"));
+	m_Controller[4] = new wxPanel(m_Notebook, ID_CONTROLLERPAGE5, wxPoint(0, 0), wxSize(600, 400));
+	m_Notebook->AddPage(m_Controller[4], wxT("Debug"));
 	
 	// Add controls
 	wxArrayString arrayStringFor_Joyname;
@@ -275,6 +278,14 @@ void ConfigBox::CreateGUIControls()
 		
 		SetControllerAll(i);
 	}
+	for(int a = 0; a < 16; ++a)
+	{
+		char temp[128];
+		sprintf(temp, "Axis %d:", a);
+		m_textAxises[a] = new wxStaticText(m_Controller[4], ID_DEBUGAXISSTATICTEXT0 + a, wxString::FromAscii(temp),  wxPoint(15, 15 + (a * 25)), wxDefaultSize, 0, wxString::FromAscii(temp));
+		m_JoyAxises[a] = new wxTextCtrl(m_Controller[4], ID_DEBUGAXISCTRLTEXT0 + a, wxT("0"), wxPoint(60, 15 + (a * 25)), wxSize(59, 25), wxTE_READONLY | wxTE_CENTRE, wxDefaultValidator, wxT("0"));
+	}
+	m_bJoyDebug = new wxButton(m_Controller[4], IDB_BUTTONDEBUGSTART, wxT("Start"), wxPoint(297, 385), wxDefaultSize, 0, wxDefaultValidator, wxT("Start"));
 }
 
 void ConfigBox::OnClose(wxCloseEvent& /*event*/)
@@ -322,7 +333,29 @@ void ConfigBox::CancelClick(wxCommandEvent& event)
 		Close(); 
 	}
 }
-
+void ConfigBox::StartDebug(wxCommandEvent& event)
+{
+	SDL_Joystick *joy = SDL_JoystickOpen(joysticks[0].ID);
+	int axes = SDL_JoystickNumAxes(joy);
+	for(int a = 16; a >= axes; --a)
+	{
+		m_textAxises[a]->Hide();
+		m_JoyAxises[a]->Hide();
+	}
+	Sint16 value;
+	while(1)
+	{	
+		for(int b = 0; b < axes; b++)
+		{
+			SDL_JoystickUpdate();
+			value = SDL_JoystickGetAxis(joy, b);
+			char temp[128];
+			sprintf(temp, "%d", value);
+			m_JoyAxises[b]->SetValue(wxString::FromAscii(temp));
+			wxWindow::Update();
+		}
+	}
+}
 void ConfigBox::Calibrate(wxCommandEvent& event)
 {
 	int controller = notebookpage;
@@ -332,6 +365,11 @@ void ConfigBox::Calibrate(wxCommandEvent& event)
 	int axes = SDL_JoystickNumAxes(joy);
 	Sint16 value;
 	unsigned long Started = SDL_GetTicks();
+	for(int b = 0; b < axes; b++)
+	{
+		joysticks[controller].sData[b].Min = 0;
+		joysticks[controller].sData[b].Max = 0;
+	}
 	while(1)
 	{			
 		for(int b = 0; b < axes; b++)
@@ -669,7 +707,7 @@ void ConfigBox::GetInputs(wxCommandEvent& event)
 				(value <= (joysticks[controller].sData[b].Min - joysticks[controller].sData[b].Min * joysticks[controller].deadzone/100.0f) ) || 
 				(value >= (joysticks[controller].sData[b].Max - joysticks[controller].sData[b].Max * joysticks[controller].deadzone/100.0f) ))	// Add and subtract a small value
 			{															// It allows for some small jitter
-				printf("value %d, Min %d Max %d Removal %f %f\n", value, joysticks[controller].sData[b].Min,joysticks[controller].sData[b].Max, joysticks[controller].sData[b].Min * joysticks[controller].deadzone/100.0f, joysticks[controller].sData[b].Max * joysticks[controller].deadzone/100.0f);
+				printf("value %d, Min %d Max %d Removal %f %f Cur: %d\n", value, joysticks[controller].sData[b].Min,joysticks[controller].sData[b].Max, joysticks[controller].sData[b].Min * joysticks[controller].deadzone/100.0f, joysticks[controller].sData[b].Max * joysticks[controller].deadzone/100.0f, value);
 				value = value < 0 ? -1 : 1; // Makes it know if the value is negative or positive
 				pressed = b;	
 				waiting = false;
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.h b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.h
index ece3386dd0..a287dd8768 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.h
+++ b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.h
@@ -62,7 +62,7 @@ class ConfigBox : public wxDialog
 		wxButton *m_OK;
 		wxButton *m_Cancel;
 				
-		wxPanel *m_Controller[4];		
+		wxPanel *m_Controller[5];		
 		wxNotebook *m_Notebook;
 
 		wxComboBox *m_Joyname[4];
@@ -132,6 +132,11 @@ class ConfigBox : public wxDialog
 		
 		wxTextCtrl *m_PlaceholderBMP[4];
 		wxStaticBitmap *m_controllerimage[4];
+	
+		// DEBUG
+		wxStaticText *m_textAxises[16]; // Support 16 axises
+		wxTextCtrl *m_JoyAxises[16]; // Support 16 axises
+		wxButton *m_bJoyDebug;
 		
 		int notebookpage;		
 	private:
@@ -145,6 +150,7 @@ class ConfigBox : public wxDialog
 			ID_CONTROLLERPAGE2,
 			ID_CONTROLLERPAGE3,
 			ID_CONTROLLERPAGE4,
+			ID_CONTROLLERPAGE5,
 
 			IDC_JOYNAME,
 			IDC_CONTROLTYPE,
@@ -210,7 +216,43 @@ class ConfigBox : public wxDialog
 			IDT_ANALOG_SUB_Y,
 			IDT_WEBSITE,
 			ID_BUTTONCALIBRATE,
-
+			
+			ID_DEBUGAXISCTRLTEXT0,
+			ID_DEBUGAXISCTRLTEXT1,
+			ID_DEBUGAXISCTRLTEXT2,
+			ID_DEBUGAXISCTRLTEXT3,
+			ID_DEBUGAXISCTRLTEXT4,
+			ID_DEBUGAXISCTRLTEXT5,
+			ID_DEBUGAXISCTRLTEXT6,
+			ID_DEBUGAXISCTRLTEXT7,
+			ID_DEBUGAXISCTRLTEXT8,
+			ID_DEBUGAXISCTRLTEXT9,
+			ID_DEBUGAXISCTRLTEXT10,
+			ID_DEBUGAXISCTRLTEXT11,
+			ID_DEBUGAXISCTRLTEXT12,
+			ID_DEBUGAXISCTRLTEXT13,
+			ID_DEBUGAXISCTRLTEXT14,
+			ID_DEBUGAXISCTRLTEXT15,
+			
+			ID_DEBUGAXISSTATICTEXT0,
+			ID_DEBUGAXISSTATICTEXT1,
+			ID_DEBUGAXISSTATICTEXT2,
+			ID_DEBUGAXISSTATICTEXT3,
+			ID_DEBUGAXISSTATICTEXT4,
+			ID_DEBUGAXISSTATICTEXT5,
+			ID_DEBUGAXISSTATICTEXT6,
+			ID_DEBUGAXISSTATICTEXT7,
+			ID_DEBUGAXISSTATICTEXT8,
+			ID_DEBUGAXISSTATICTEXT9,
+			ID_DEBUGAXISSTATICTEXT10,
+			ID_DEBUGAXISSTATICTEXT11,
+			ID_DEBUGAXISSTATICTEXT12,
+			ID_DEBUGAXISSTATICTEXT13,
+			ID_DEBUGAXISSTATICTEXT14,
+			ID_DEBUGAXISSTATICTEXT15,
+			
+			IDB_BUTTONDEBUGSTART,
+			
 			ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
 		};
 	
@@ -234,6 +276,8 @@ class ConfigBox : public wxDialog
 		void Calibrate(wxCommandEvent& event);
 		void GetInputs(wxCommandEvent& event);
 		void GetHats(int ID);
+	
+		void StartDebug(wxCommandEvent& event);
 
 		void SetButtonText(int id, char text[128]);		
 };