Added utils/Makefile.in for utils makefiles

Changed some name in wxMMedia2

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

diff --git a/configure.in b/configure.in
index 93eb56a52cb7ba5f7801cd3bac08d76f852b86e8..13fdd3092c338a30c66805dd135e0b9b799eff87 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2733,6 +2733,7 @@ AC_OUTPUT([
            samples/html/help/Makefile
            samples/html/printing/Makefile
            samples/html/test/Makefile
+           utils/Makefile
            utils/wxMMedia2/Makefile
            utils/wxMMedia2/lib/Makefile
            utils/wxMMedia2/sample/Makefile

diff --git a/utils/Makefile.in b/utils/Makefile.in
new file mode 100644 (file)
index 0000000..332c37b
--- /dev/null
+++ b/utils/Makefile.in
@@ -0,0 +1,10 @@
+#
+# Makefile : Builds wxWindows utils for Unix.
+#
+
+all:
+       cd wxMMedia2; make
+
+clean:
+       cd wxMMedia2; make clean
+

diff --git a/utils/wxMMedia2/lib/sndbase.h b/utils/wxMMedia2/lib/sndbase.h
index 31982695257bf608a5c88f60abc34231d5360b11..26fae17890868e7c864da513ac1e1d031b429329 100644 (file)
--- a/utils/wxMMedia2/lib/sndbase.h
+++ b/utils/wxMMedia2/lib/sndbase.h
@@ -54,8 +54,8 @@ class WXDLLEXPORT wxSoundFormatBase {
   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;
 };

diff --git a/utils/wxMMedia2/lib/sndfile.cpp b/utils/wxMMedia2/lib/sndfile.cpp
index f6a00e1376067714013e77284dfadef1391b2537..3040943411dc4c600729b09bc4e45b2b4cffc131 100644 (file)
--- a/utils/wxMMedia2/lib/sndfile.cpp
+++ b/utils/wxMMedia2/lib/sndfile.cpp
@@ -168,7 +168,7 @@ bool wxSoundFileStream::Record(unsigned long time)
   if (!PrepareToRecord(time))
     return FALSE;
 
-  m_len = m_sndformat->GetByteFromTime(time);
+  m_len = m_sndformat->GetBytesFromTime(time);
 
   if (!StartProduction(wxSOUND_INPUT))
     return FALSE;

diff --git a/utils/wxMMedia2/lib/sndpcm.cpp b/utils/wxMMedia2/lib/sndpcm.cpp
index 5fa2b191ac22915c96be3c32dd9fadeab2c8d542..50a24361ed297d51eab7c7749e64d343d063f88a 100644 (file)
--- a/utils/wxMMedia2/lib/sndpcm.cpp
+++ b/utils/wxMMedia2/lib/sndpcm.cpp
@@ -64,12 +64,12 @@ wxSoundFormatBase *wxSoundFormatPcm::Clone() const
   return new_pcm;
 }
 
-wxUint32 wxSoundFormatPcm::GetTimeFromByte(wxUint32 bytes) const
+wxUint32 wxSoundFormatPcm::GetTimeFromBytes(wxUint32 bytes) const
 {
   return (bytes / (m_srate * (m_bps / 8) * m_nchan));
 }
 
-wxUint32 wxSoundFormatPcm::GetByteFromTime(wxUint32 time) const
+wxUint32 wxSoundFormatPcm::GetBytesFromTime(wxUint32 time) const
 {
   return (time * (m_srate * (m_bps / 8) * m_nchan));
 }

diff --git a/utils/wxMMedia2/lib/sndpcm.h b/utils/wxMMedia2/lib/sndpcm.h
index eeabcf23410193c4e5eb0ce903926da712a10820..cae649c29c6abc51f46f7c60b3ac4c320941bc25 100644 (file)
--- a/utils/wxMMedia2/lib/sndpcm.h
+++ b/utils/wxMMedia2/lib/sndpcm.h
@@ -41,8 +41,8 @@ class wxSoundFormatPcm : public wxSoundFormatBase {
   wxSoundFormatType GetType() const { return wxSOUND_PCM; }
   wxSoundFormatBase *Clone() const;
 
-  wxUint32 GetTimeFromByte(wxUint32 bytes) const;
-  wxUint32 GetByteFromTime(wxUint32 time) const;
+  wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
+  wxUint32 GetBytesFromTime(wxUint32 time) const;
 
   bool operator!=(const wxSoundFormatBase& frmt2) const;
 

diff --git a/utils/wxMMedia2/lib/sndulaw.cpp b/utils/wxMMedia2/lib/sndulaw.cpp
index d858bfacc4b68010cdb72002e9264c4c8a9261de..bba1cd7eea959ba2a22a7e51e4d386eea1ec700a 100644 (file)
--- a/utils/wxMMedia2/lib/sndulaw.cpp
+++ b/utils/wxMMedia2/lib/sndulaw.cpp
@@ -46,12 +46,12 @@ wxSoundFormatBase *wxSoundFormatUlaw::Clone() const
   return ulaw;
 }
 
-wxUint32 wxSoundFormatUlaw::GetTimeFromByte(wxUint32 bytes) const
+wxUint32 wxSoundFormatUlaw::GetTimeFromBytes(wxUint32 bytes) const
 {
   return (bytes / m_srate);
 }
 
-wxUint32 wxSoundFormatUlaw::GetByteFromTime(wxUint32 time) const
+wxUint32 wxSoundFormatUlaw::GetBytesFromTime(wxUint32 time) const
 {
   return time * m_srate;
 }

diff --git a/utils/wxMMedia2/lib/sndulaw.h b/utils/wxMMedia2/lib/sndulaw.h
index 97cbf93e13f10e73647e2ccf8dfefb39e377656f..ef893d2e85226afa6dd4943de52562ea03afe32a 100644 (file)
--- a/utils/wxMMedia2/lib/sndulaw.h
+++ b/utils/wxMMedia2/lib/sndulaw.h
@@ -30,8 +30,8 @@ class WXDLLEXPORT wxSoundFormatUlaw: public wxSoundFormatBase {
   wxSoundFormatType GetType() const { return wxSOUND_ULAW; }
   wxSoundFormatBase *Clone() const;
 
-  wxUint32 GetTimeFromByte(wxUint32 bytes) const;
-  wxUint32 GetByteFromTime(wxUint32 time) const;
+  wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
+  wxUint32 GetBytesFromTime(wxUint32 time) const;
 
   bool operator !=(const wxSoundFormatBase& frmt2) const;
 

diff --git a/utils/wxMMedia2/lib/sndwav.cpp b/utils/wxMMedia2/lib/sndwav.cpp
index be6f1b3777d9b3ea1c9ceac69d5f554db74a40b4..9cd9fb2f84e1d159f0984737a059dcdbfaae31bf 100644 (file)
--- a/utils/wxMMedia2/lib/sndwav.cpp
+++ b/utils/wxMMedia2/lib/sndwav.cpp
@@ -155,7 +155,7 @@ FAIL_WITH(m_output->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
   wxDataOutputStream data(*m_output);
   data.BigEndianOrdered(FALSE);
 
-  len = m_sndformat->GetByteFromTime(time);
+  len = m_sndformat->GetBytesFromTime(time);
 
   len += HEADER_SIZE;
 
@@ -185,7 +185,7 @@ FAIL_WITH(m_output->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
     bits_p_spl = pcm->GetBPS();
     channels   = pcm->GetChannels();
     byte_p_spl = pcm->GetBPS() / 8;
-    byte_p_sec = pcm->GetByteFromTime(1);
+    byte_p_sec = pcm->GetBytesFromTime(1);
     format     = 1;
     data << format << channels << sample_fq
          << byte_p_sec << byte_p_spl << bits_p_spl;
@@ -200,7 +200,7 @@ FAIL_WITH(m_output->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
   }
 
   WRITE_SIGNATURE(DATA_SIGNATURE);
-  data.Write32(m_sndformat->GetByteFromTime(time));
+  data.Write32(m_sndformat->GetBytesFromTime(time));
   return TRUE;
 }