Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added utils/Makefile.in for utils makefiles

Browse Source 
Changed some name in wxMMedia2


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Guilhem Lavaux
1999-08-15 10:15:05 +00:00
parent a3736ef475
commit 622e48cbd2
9 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.in
View File

@@ -2733,6 +2733,7 @@ AC_OUTPUT([
samples/html/help/Makefile samples/html/help/Makefile
samples/html/printing/Makefile samples/html/printing/Makefile
samples/html/test/Makefile samples/html/test/Makefile
utils/Makefile
utils/wxMMedia2/Makefile utils/wxMMedia2/Makefile
utils/wxMMedia2/lib/Makefile utils/wxMMedia2/lib/Makefile
utils/wxMMedia2/sample/Makefile utils/wxMMedia2/sample/Makefile

10
utils/Makefile.in Normal file
View File

@@ -0,0 +1,10 @@
#
# Makefile : Builds wxWindows utils for Unix.
#
all:
cd wxMMedia2; make
clean:
cd wxMMedia2; make clean

4
utils/wxMMedia2/lib/sndbase.h
View File

@@ -54,8 +54,8 @@ class WXDLLEXPORT wxSoundFormatBase {
virtual wxSoundFormatType GetType() const { return wxSOUND_NOFORMAT; } virtual wxSoundFormatType GetType() const { return wxSOUND_NOFORMAT; }
virtual wxSoundFormatBase *Clone() const; virtual wxSoundFormatBase *Clone() const;
virtual wxUint32 GetTimeFromByte(wxUint32 bytes) const = 0; virtual wxUint32 GetTimeFromBytes(wxUint32 bytes) const = 0;
virtual wxUint32 GetByteFromTime(wxUint32 time) const = 0; virtual wxUint32 GetBytesFromTime(wxUint32 time) const = 0;
virtual bool operator !=(const wxSoundFormatBase& frmt2) const; virtual bool operator !=(const wxSoundFormatBase& frmt2) const;
}; };

2
utils/wxMMedia2/lib/sndfile.cpp
View File

@@ -168,7 +168,7 @@ bool wxSoundFileStream::Record(unsigned long time)
if (!PrepareToRecord(time)) if (!PrepareToRecord(time))
return FALSE; return FALSE;
m_len = m_sndformat->GetByteFromTime(time); m_len = m_sndformat->GetBytesFromTime(time);
if (!StartProduction(wxSOUND_INPUT)) if (!StartProduction(wxSOUND_INPUT))
return FALSE; return FALSE;

4
utils/wxMMedia2/lib/sndpcm.cpp
View File

@@ -64,12 +64,12 @@ wxSoundFormatBase *wxSoundFormatPcm::Clone() const
return new_pcm; return new_pcm;
} }
wxUint32 wxSoundFormatPcm::GetTimeFromByte(wxUint32 bytes) const wxUint32 wxSoundFormatPcm::GetTimeFromBytes(wxUint32 bytes) const
{ {
return (bytes / (m_srate * (m_bps / 8) * m_nchan)); 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)); return (time * (m_srate * (m_bps / 8) * m_nchan));
} }

4
utils/wxMMedia2/lib/sndpcm.h
View File

@@ -41,8 +41,8 @@ class wxSoundFormatPcm : public wxSoundFormatBase {
wxSoundFormatType GetType() const { return wxSOUND_PCM; } wxSoundFormatType GetType() const { return wxSOUND_PCM; }
wxSoundFormatBase *Clone() const; wxSoundFormatBase *Clone() const;
wxUint32 GetTimeFromByte(wxUint32 bytes) const; wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
wxUint32 GetByteFromTime(wxUint32 time) const; wxUint32 GetBytesFromTime(wxUint32 time) const;
bool operator!=(const wxSoundFormatBase& frmt2) const; bool operator!=(const wxSoundFormatBase& frmt2) const;

4
utils/wxMMedia2/lib/sndulaw.cpp
View File

@@ -46,12 +46,12 @@ wxSoundFormatBase *wxSoundFormatUlaw::Clone() const
return ulaw; return ulaw;
} }
wxUint32 wxSoundFormatUlaw::GetTimeFromByte(wxUint32 bytes) const wxUint32 wxSoundFormatUlaw::GetTimeFromBytes(wxUint32 bytes) const
{ {
return (bytes / m_srate); return (bytes / m_srate);
} }
wxUint32 wxSoundFormatUlaw::GetByteFromTime(wxUint32 time) const wxUint32 wxSoundFormatUlaw::GetBytesFromTime(wxUint32 time) const
{ {
return time * m_srate; return time * m_srate;
} }

4
utils/wxMMedia2/lib/sndulaw.h
View File

@@ -30,8 +30,8 @@ class WXDLLEXPORT wxSoundFormatUlaw: public wxSoundFormatBase {
wxSoundFormatType GetType() const { return wxSOUND_ULAW; } wxSoundFormatType GetType() const { return wxSOUND_ULAW; }
wxSoundFormatBase *Clone() const; wxSoundFormatBase *Clone() const;
wxUint32 GetTimeFromByte(wxUint32 bytes) const; wxUint32 GetTimeFromBytes(wxUint32 bytes) const;
wxUint32 GetByteFromTime(wxUint32 time) const; wxUint32 GetBytesFromTime(wxUint32 time) const;
bool operator !=(const wxSoundFormatBase& frmt2) const; bool operator !=(const wxSoundFormatBase& frmt2) const;

6
utils/wxMMedia2/lib/sndwav.cpp
View File

@@ -155,7 +155,7 @@ FAIL_WITH(m_output->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
wxDataOutputStream data(*m_output); wxDataOutputStream data(*m_output);
data.BigEndianOrdered(FALSE); data.BigEndianOrdered(FALSE);
len = m_sndformat->GetByteFromTime(time); len = m_sndformat->GetBytesFromTime(time);
len += HEADER_SIZE; len += HEADER_SIZE;
@@ -185,7 +185,7 @@ FAIL_WITH(m_output->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
bits_p_spl = pcm->GetBPS(); bits_p_spl = pcm->GetBPS();
channels = pcm->GetChannels(); channels = pcm->GetChannels();
byte_p_spl = pcm->GetBPS() / 8; byte_p_spl = pcm->GetBPS() / 8;
byte_p_sec = pcm->GetByteFromTime(1); byte_p_sec = pcm->GetBytesFromTime(1);
format = 1; format = 1;
data << format << channels << sample_fq data << format << channels << sample_fq
<< byte_p_sec << byte_p_spl << bits_p_spl; << 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); WRITE_SIGNATURE(DATA_SIGNATURE);
data.Write32(m_sndformat->GetByteFromTime(time)); data.Write32(m_sndformat->GetBytesFromTime(time));
return TRUE; return TRUE;
} }