added support for several new events in wxCalendarCtrl: clicking on week

[wxWidgets.git] / utils / wxMMedia2 / lib / sndbase.h

diff --git a/utils/wxMMedia2/lib/sndbase.h b/utils/wxMMedia2/lib/sndbase.h
index 31982695257bf608a5c88f60abc34231d5360b11..0f4fa4d8b750b1f8faeffee878d006705b6e8991 100644 (file)
--- a/utils/wxMMedia2/lib/sndbase.h
+++ b/utils/wxMMedia2/lib/sndbase.h
@@ -23,7 +23,8 @@ enum {
 typedef enum {
   wxSOUND_NOFORMAT,
   wxSOUND_PCM,
 typedef enum {
   wxSOUND_NOFORMAT,
   wxSOUND_PCM,

-  wxSOUND_ULAW
+  wxSOUND_ULAW,
+  wxSOUND_G72X

 } wxSoundFormatType;
 
 typedef enum {
 } wxSoundFormatType;
 
 typedef enum {


@@ -54,8 +55,8 @@ class WXDLLEXPORT wxSoundFormatBase {
   virtual wxSoundFormatType GetType() const { return wxSOUND_NOFORMAT; }
   virtual wxSoundFormatBase *Clone() const;
 
   virtual wxSoundFormatType GetType() const { return wxSOUND_NOFORMAT; }
   virtual wxSoundFormatBase *Clone() const;
 

-  virtual wxUint32 GetTimeFromByte(wxUint32 bytes) const = 0;
-  virtual wxUint32 GetByteFromTime(wxUint32 time) const = 0;
+  virtual wxUint32 GetTimeFromBytes(wxUint32 bytes) const = 0;
+  virtual wxUint32 GetBytesFromTime(wxUint32 time) const = 0;

  
   virtual bool operator !=(const wxSoundFormatBase& frmt2) const;
 };
  
   virtual bool operator !=(const wxSoundFormatBase& frmt2) const;
 };


@@ -70,9 +71,9 @@ class wxSoundStream {
   virtual ~wxSoundStream();
 
   // Reads "len" bytes from the sound stream.
   virtual ~wxSoundStream();
 
   // Reads "len" bytes from the sound stream.

-  virtual wxSoundStream& Read(void *buffer, size_t len) = 0;
+  virtual wxSoundStream& Read(void *buffer, wxUint32 len) = 0;

   // Writes "len" byte to the sound stream.
   // Writes "len" byte to the sound stream.

-  virtual wxSoundStream& Write(const void *buffer, size_t len) = 0;
+  virtual wxSoundStream& Write(const void *buffer, wxUint32 len) = 0;

   // Returns the best size for IO calls
   virtual wxUint32 GetBestSize() const { return 1024; }
 
   // Returns the best size for IO calls
   virtual wxUint32 GetBestSize() const { return 1024; }
 


@@ -96,7 +97,10 @@ class wxSoundStream {
   virtual void SetDuplexMode(bool duplex) = 0;
 
   wxSoundError GetError() const { return m_snderror; }
   virtual void SetDuplexMode(bool duplex) = 0;
 
   wxSoundError GetError() const { return m_snderror; }

-  size_t GetLastAccess() const { return m_lastcount; }
+  wxUint32 GetLastAccess() const { return m_lastcount; }
+
+  // This is only useful for device (I think).
+  virtual bool QueueFilled() const { return TRUE; }

 
  protected:
   // Current sound format
 
  protected:
   // Current sound format


@@ -106,7 +110,7 @@ class wxSoundStream {
   wxSoundError m_snderror;
 
   // Last access
   wxSoundError m_snderror;
 
   // Last access

-  size_t m_lastcount;
+  wxUint32 m_lastcount;

 
   // Event handler
   wxSoundStream *m_handler;
 
   // Event handler
   wxSoundStream *m_handler;


@@ -115,9 +119,6 @@ class wxSoundStream {
   char *m_cdata[2];
 
  protected:
   char *m_cdata[2];
 
  protected:

-  // Do the async stuff.
-  void DoAsyncStuff(int evt);
-

   // Handles event
   virtual void OnSoundEvent(int evt);
 };
   // Handles event
   virtual void OnSoundEvent(int evt);
 };