From 85f582bda7cff60e81f16a75551a8e0ee79867e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 2 Aug 2003 13:50:49 +0000 Subject: [PATCH] wxJoystick and wxWave are now available in all Unix ports, the code was not GTK specific git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22485 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk1/joystick.h | 102 ---------------------------- include/wx/gtk1/wave.h | 65 ------------------ include/wx/joystick.h | 6 +- include/wx/{gtk => unix}/joystick.h | 0 include/wx/{gtk => unix}/wave.h | 0 include/wx/wave.h | 8 ++- 6 files changed, 8 insertions(+), 173 deletions(-) delete mode 100644 include/wx/gtk1/joystick.h delete mode 100644 include/wx/gtk1/wave.h rename include/wx/{gtk => unix}/joystick.h (100%) rename include/wx/{gtk => unix}/wave.h (100%) diff --git a/include/wx/gtk1/joystick.h b/include/wx/gtk1/joystick.h deleted file mode 100644 index 65c2401aa0..0000000000 --- a/include/wx/gtk1/joystick.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: joystick.h -// Purpose: wxJoystick class -// Author: Guilhem Lavaux -// Modified by: -// Created: 01/02/97 -// RCS-ID: $Id$ -// Copyright: -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __JOYSTICKH__ -#define __JOYSTICKH__ - -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "joystick.h" -#endif - -#include "wx/event.h" -#include "wx/thread.h" - -class WXDLLEXPORT wxJoystick: public wxObject, public wxThread -{ - DECLARE_DYNAMIC_CLASS(wxJoystick) - public: - /* - * Public interface - */ - - wxJoystick(int joystick = wxJOYSTICK1); - - // Attributes - //////////////////////////////////////////////////////////////////////////// - - wxPoint GetPosition(void) const; - int GetZPosition(void) const; - int GetButtonState(void) const; - int GetPOVPosition(void) const; - int GetPOVCTSPosition(void) const; - int GetRudderPosition(void) const; - int GetUPosition(void) const; - int GetVPosition(void) const; - int GetMovementThreshold(void) const; - void SetMovementThreshold(int threshold) ; - - // Capabilities - //////////////////////////////////////////////////////////////////////////// - - bool IsOk(void) const; // Checks that the joystick is functioning - int GetNumberJoysticks(void) const ; - int GetManufacturerId(void) const ; - int GetProductId(void) const ; - wxString GetProductName(void) const ; - int GetXMin(void) const; - int GetYMin(void) const; - int GetZMin(void) const; - int GetXMax(void) const; - int GetYMax(void) const; - int GetZMax(void) const; - int GetNumberButtons(void) const; - int GetNumberAxes(void) const; - int GetMaxButtons(void) const; - int GetMaxAxes(void) const; - int GetPollingMin(void) const; - int GetPollingMax(void) const; - int GetRudderMin(void) const; - int GetRudderMax(void) const; - int GetUMin(void) const; - int GetUMax(void) const; - int GetVMin(void) const; - int GetVMax(void) const; - - bool HasRudder(void) const; - bool HasZ(void) const; - bool HasU(void) const; - bool HasV(void) const; - bool HasPOV(void) const; - bool HasPOV4Dir(void) const; - bool HasPOVCTS(void) const; - - // Operations - //////////////////////////////////////////////////////////////////////////// - - // pollingFreq = 0 means that movement events are sent when above the threshold. - // If pollingFreq > 0, events are received every this many milliseconds. - bool SetCapture(wxWindow* win, int pollingFreq = 0); - bool ReleaseCapture(void); - -protected: - int m_joystick; - wxPoint m_lastposition; - int m_axe[15]; - int m_buttons; - wxWindow *m_catchwin; - int m_polling; - - void *Entry(void); -}; - -#endif - // __JOYSTICKH__ - diff --git a/include/wx/gtk1/wave.h b/include/wx/gtk1/wave.h deleted file mode 100644 index 92d678dab4..0000000000 --- a/include/wx/gtk1/wave.h +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wave.h -// Purpose: wxWave class -// Author: Julian Smart -// Modified by: -// Created: 25/10/98 -// RCS-ID: $Id$ -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_WAVE_H_ -#define _WX_WAVE_H_ - -#include "wx/defs.h" - -#if wxUSE_WAVE - -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "wave.h" -#endif - -#include "wx/object.h" - -#ifndef AUDIODEV -#define AUDIODEV "/dev/dsp" // Default path for audio device -#endif - -class wxWave : public wxObject -{ -public: - wxWave(); - wxWave(const wxString& fileName, bool isResource = FALSE); - wxWave(int size, const wxByte* data); - ~wxWave(); - -public: - // Create from resource or file - bool Create(const wxString& fileName, bool isResource = FALSE); - // Create from data - bool Create(int size, const wxByte* data); - - bool IsOk() const { return (m_waveData ? TRUE : FALSE); }; - bool Play(bool async = TRUE, bool looped = FALSE); - -protected: - bool Free(); - -private: - wxByte* m_waveData; - int m_waveLength; - bool m_isResource; - - - int OpenDSP(void); - bool InitDSP(int dev, int iDataBits, int iChannel,unsigned long ulSamplingRate); - int m_DSPblkSize; // Size of the DSP buffer - char *m_data; - int m_sizeData; -}; - -#endif - -#endif - diff --git a/include/wx/joystick.h b/include/wx/joystick.h index 3dd8906c32..3171fca87b 100644 --- a/include/wx/joystick.h +++ b/include/wx/joystick.h @@ -6,11 +6,11 @@ #if defined(__WXMSW__) #include "wx/msw/joystick.h" #elif defined(__WXMOTIF__) -#include "wx/motif/joystick.h" +#include "wx/unix/joystick.h" #elif defined(__WXGTK__) -#include "wx/gtk/joystick.h" +#include "wx/unix/joystick.h" #elif defined(__WXX11__) -#include "wx/x11/joystick.h" +#include "wx/unix/joystick.h" #elif defined(__WXMAC__) #include "wx/mac/joystick.h" #elif defined(__WXPM__) diff --git a/include/wx/gtk/joystick.h b/include/wx/unix/joystick.h similarity index 100% rename from include/wx/gtk/joystick.h rename to include/wx/unix/joystick.h diff --git a/include/wx/gtk/wave.h b/include/wx/unix/wave.h similarity index 100% rename from include/wx/gtk/wave.h rename to include/wx/unix/wave.h diff --git a/include/wx/wave.h b/include/wx/wave.h index e9aaa5a888..d766cc341e 100644 --- a/include/wx/wave.h +++ b/include/wx/wave.h @@ -4,13 +4,15 @@ #if defined(__WXMSW__) #include "wx/msw/wave.h" #elif defined(__WXGTK__) -#include "wx/gtk/wave.h" +#include "wx/unix/wave.h" +#elif defined(__WXX11__) +#include "wx/unix/wave.h" +#elif defined(__WXMOTIF__) +#include "wx/unix/wave.h" #elif defined(__WXMAC__) #include "wx/mac/wave.h" #elif defined(__WXPM__) #include "wx/os2/wave.h" -#elif defined(__WXMAC__) -#include "wx/mac/wave.h" #endif #endif -- 2.50.0