* Various fixes

* Introduced FinishPreparation() in wxSoundFileStream as a conclusion
  to PrepareToPlay()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/wxMMedia2/lib/sndaiff.cpp b/utils/wxMMedia2/lib/sndaiff.cpp
index 674141f653d4d8430a843d3b23bd827d71ac2465..a00ac569ed058c61e272d46335a52be20e099e40 100644 (file)
--- a/utils/wxMMedia2/lib/sndaiff.cpp
+++ b/utils/wxMMedia2/lib/sndaiff.cpp
@@ -141,6 +141,7 @@ bool wxSoundAiff::PrepareToPlay()
       // m_input->SeekI(4, wxFromCurrent);  // Pass an INT32
       // m_input->SeekI(len-4, wxFromCurrent); // Pass the rest
       m_input->SeekI(ssnd + 4, wxFromCurrent);
+      FinishPreparation(len - 4);
       end_headers = TRUE;
       break;
     }

diff --git a/utils/wxMMedia2/lib/sndcpcm.cpp b/utils/wxMMedia2/lib/sndcpcm.cpp
index 1c4bf098523c8b304236e28e7d1cc0f835b61e6e..add5ba1772d42fff9b2b29f2b380f88856766540 100644 (file)
--- a/utils/wxMMedia2/lib/sndcpcm.cpp
+++ b/utils/wxMMedia2/lib/sndcpcm.cpp
@@ -28,6 +28,9 @@ wxSoundStreamPcm::~wxSoundStreamPcm()
 
 #include "converter.def"
 
+// -----------------------------------------------------------------------
+// Main PCM stream converter table
+// -----------------------------------------------------------------------
 wxSoundStreamPcm::ConverterType s_converters[] = {
   NULL,
   Convert_8_8_sign,                    /* 8 -> 8 sign */
@@ -72,7 +75,7 @@ wxSoundStreamPcm::ConverterType s_converters[] = {
 
 //
 // TODO: Read() and Write() aren't really safe. If you give it a buffer which
-// is not aligned on 8, you may crash (See converter.def).
+// is not aligned on 2, you may crash (See converter.def).
 //
 
 wxSoundStream& wxSoundStreamPcm::Read(void *buffer, wxUint32 len)
@@ -152,6 +155,13 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
   pcm_format = (wxSoundFormatPcm *)&format;
   pcm_format2 = (wxSoundFormatPcm *)new_format;
 
+  // ----------------------------------------------------
+  // Select table to use:
+  //     * 8 bits -> 8 bits
+  //     * 16 bits -> 8 bits
+  //     * 8 bits -> 16 bits
+  //     * 16 bits -> 16 bits
+
   m_16_to_8 = FALSE;
   if (pcm_format->GetBPS() != pcm_format2->GetBPS()) {
     m_16_to_8 = TRUE;
@@ -179,6 +189,10 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
 #define OTHER_ORDER wxLITTLE_ENDIAN
 #endif
 
+  // --------------------------------------------------------
+  // Find the good converter !
+
+
   if (pcm_format->GetOrder() == OTHER_ORDER &&
       pcm_format2->GetOrder() == OTHER_ORDER && change_sign) 
     index = CONVERT_SWAP_SIGN_SWAP;

diff --git a/utils/wxMMedia2/lib/sndfile.cpp b/utils/wxMMedia2/lib/sndfile.cpp
index 55f1c15e758bf297a3349915cccfbce1adbf2819..31c109b46c744a657d3076fbdbbe3b44c28db505 100644 (file)
--- a/utils/wxMMedia2/lib/sndfile.cpp
+++ b/utils/wxMMedia2/lib/sndfile.cpp
@@ -175,6 +175,9 @@ wxSoundFileStream::wxSoundFileStream(wxInputStream& stream,
   : m_codec(io_sound), m_sndio(&io_sound),
     m_input(&stream), m_output(NULL), m_state(wxSOUND_FILE_STOPPED)
 {
+  m_length = 0;
+  m_bytes_left = 0;
+  m_prepared = FALSE;
 }
 
 wxSoundFileStream::wxSoundFileStream(wxOutputStream& stream,
@@ -182,6 +185,9 @@ wxSoundFileStream::wxSoundFileStream(wxOutputStream& stream,
   : m_codec(io_sound), m_sndio(&io_sound),
     m_input(NULL), m_output(&stream), m_state(wxSOUND_FILE_STOPPED)
 {
+  m_length = 0;
+  m_bytes_left = 0;
+  m_prepared = FALSE;
 }
 
 wxSoundFileStream::~wxSoundFileStream()
@@ -195,8 +201,9 @@ bool wxSoundFileStream::Play()
   if (m_state != wxSOUND_FILE_STOPPED)
     return FALSE;
 
-  if (!PrepareToPlay())
-    return FALSE;
+  if (!m_prepared)
+    if (!PrepareToPlay())
+      return FALSE;
 
   m_state = wxSOUND_FILE_PLAYING;
 
@@ -214,7 +221,7 @@ bool wxSoundFileStream::Record(unsigned long time)
   if (!PrepareToRecord(time))
     return FALSE;
 
-  m_len = m_sndformat->GetBytesFromTime(time);
+  FinishPreparation(m_sndformat->GetBytesFromTime(time));
 
   m_state = wxSOUND_FILE_RECORDING;
   if (!StartProduction(wxSOUND_INPUT))
@@ -231,6 +238,8 @@ bool wxSoundFileStream::Stop()
   if (!StopProduction())
     return FALSE;
 
+  m_prepared = FALSE;
+
   if (m_state == wxSOUND_FILE_RECORDING)
     if (!FinishRecording()) {
       m_state = wxSOUND_FILE_STOPPED;
@@ -306,6 +315,28 @@ bool wxSoundFileStream::StopProduction()
   return m_codec.StopProduction();
 }
 
+void wxSoundFileStream::FinishPreparation(wxUint32 len)
+{
+  m_bytes_left = m_length = len;
+  m_prepared = TRUE;
+}
+
+wxUint32 wxSoundFileStream::GetLength()
+{
+  if (m_input && !m_prepared && GetError() == wxSOUND_NOERR)
+    return (PrepareToPlay()) ? m_length : 0;
+
+  return m_length;
+}
+
+wxUint32 wxSoundFileStream::GetPosition()
+{
+  if (!m_prepared && m_input != NULL && GetError() == wxSOUND_NOERR)
+    PrepareToPlay();
+
+  return m_length-m_bytes_left;
+}
+
 void wxSoundFileStream::OnSoundEvent(int evt)
 {
   wxUint32 len = m_codec.GetBestSize();
@@ -317,21 +348,25 @@ void wxSoundFileStream::OnSoundEvent(int evt)
   while (!m_sndio->QueueFilled()) {
     switch(evt) {
     case wxSOUND_INPUT:
-      if (len > m_len)
-        len = m_len;
+      if (len > m_bytes_left)
+        len = m_bytes_left;
 
       len = m_codec.Read(buffer, len).GetLastAccess();
       PutData(buffer, len);
-      m_len -= len;
-      if (m_len == 0) {
+      m_bytes_left -= len;
+      if (m_bytes_left == 0) {
         Stop();
         delete[] buffer;
         return;
       }
       break;
     case wxSOUND_OUTPUT:
+      if (len > m_bytes_left)
+        len = m_bytes_left;
+
       len = GetData(buffer, len);
-      if (len == 0) {
+      m_bytes_left -= len;
+      if (m_bytes_left == 0) {
         Stop();
         delete[] buffer;
         return;

diff --git a/utils/wxMMedia2/lib/sndfile.h b/utils/wxMMedia2/lib/sndfile.h
index 10e77f8610a0baef90e1d0833c35c59fa02b95a5..5499c4106feaf990fabb240e7342e9e6b153cf76 100644 (file)
--- a/utils/wxMMedia2/lib/sndfile.h
+++ b/utils/wxMMedia2/lib/sndfile.h
@@ -67,7 +67,8 @@ class wxSoundFileStream: public wxSoundStream {
   bool StartProduction(int evt);
   bool StopProduction();
 
-  unsigned long GetLength() const;
+  wxUint32 GetLength();
+  wxUint32 GetPosition();
 
   wxSoundStream& Read(void *buffer, wxUint32 len); 
   wxSoundStream& Write(const void *buffer, wxUint32 len);
@@ -85,12 +86,14 @@ class wxSoundFileStream: public wxSoundStream {
   wxOutputStream *m_output;
 
   wxSoundFileState m_state, m_oldstate;
-  wxUint32 m_len;
+  wxUint32 m_length, m_bytes_left;
+  bool m_prepared;
 
  protected:
   virtual bool PrepareToPlay() = 0; 
   virtual bool PrepareToRecord(unsigned long time) = 0;
   virtual bool FinishRecording() = 0;
+  void FinishPreparation(wxUint32 len);
 
   virtual wxUint32 GetData(void *buffer, wxUint32 len) = 0;
   virtual wxUint32 PutData(const void *buffer, wxUint32 len) = 0;

diff --git a/utils/wxMMedia2/lib/sndwav.cpp b/utils/wxMMedia2/lib/sndwav.cpp
index d083097222598100021f29c8a922bd9cc514ac8e..509a004009ea504e6021e15aa59d7f0bb41dcfc0 100644 (file)
--- a/utils/wxMMedia2/lib/sndwav.cpp
+++ b/utils/wxMMedia2/lib/sndwav.cpp
@@ -168,6 +168,7 @@ bool wxSoundWave::PrepareToPlay()
     }
     case DATA_SIGNATURE: // "data"
       end_headers = TRUE;
+      FinishPreparation(len);
       break;
     default:
       m_input->SeekI(len, wxFromCurrent);
@@ -308,11 +309,9 @@ bool wxSoundWave::FinishRecording()
     // We can't but there is no error.
     return TRUE;
 
-  if (m_len == 0)
+  if (m_bytes_left == 0)
     return TRUE;
 
-  
-
   // TODO: Update headers when we stop before the specified time (if possible)
   return TRUE;
 }