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

Cruft cleanup from MJW, strip the tabs out of sound.cpp

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-11-12 03:30:07 +00:00
parent d51253e844
commit f8a586e08e
7 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/file.h
View File

@@ -94,8 +94,8 @@ public:
int fd() const { return m_fd; }
// read/write (unbuffered)
// returns number of bytes read or ofsInvalid on error
size_t Read(void *pBuf, size_t nCount);
// returns number of bytes read or wxInvalidOffset on error
ssize_t Read(void *pBuf, size_t nCount);
// returns the number of bytes written
size_t Write(const void *pBuf, size_t nCount);
// returns true on success

4
src/common/file.cpp
View File

@@ -299,7 +299,7 @@ bool wxFile::Close()
// ----------------------------------------------------------------------------
// read
size_t wxFile::Read(void *pBuf, size_t nCount)
ssize_t wxFile::Read(void *pBuf, size_t nCount)
{
wxCHECK( (pBuf != NULL) && IsOpened(), 0 );
@@ -308,7 +308,7 @@ size_t wxFile::Read(void *pBuf, size_t nCount)
if ( iRc == -1 )
{
wxLogSysError(_("can't read from file descriptor %d"), m_fd);
return (size_t)wxInvalidOffset;
return wxInvalidOffset;
}
return iRc;

2
src/common/intl.cpp
View File

@@ -1130,7 +1130,7 @@ bool wxMsgCatalogFile::Load(const wxChar *szDirPrefix, const wxChar *szName0,
// read the whole file in memory
m_pData = new size_t8[nSize];
if ( fileMsg.Read(m_pData, nSize) != nSize + (size_t)0 ) {
if ( fileMsg.Read(m_pData, nSize) != nSize ) {
wxDELETEA(m_pData);
return false;
}

8
src/common/wfstream.cpp
View File

@@ -69,7 +69,7 @@ wxFileOffset wxFileInputStream::GetLength() const
size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
{
size_t ret = m_file->Read(buffer, size);
ssize_t ret = m_file->Read(buffer, size);
// NB: we can't use a switch here because HP-UX CC doesn't allow
// switching over long long (which size_t is in 64bit mode)
@@ -79,7 +79,7 @@ size_t wxFileInputStream::OnSysRead(void *buffer, size_t size)
// nothing read, so nothing more to read
m_lasterror = wxSTREAM_EOF;
}
else if ( ret == (size_t)wxInvalidOffset )
else if ( ret == wxInvalidOffset )
{
m_lasterror = wxSTREAM_READ_ERROR;
ret = 0;
@@ -234,11 +234,11 @@ wxFileOffset wxFFileInputStream::GetLength() const
size_t wxFFileInputStream::OnSysRead(void *buffer, size_t size)
{
size_t ret = m_file->Read(buffer, size);
ssize_t ret = m_file->Read(buffer, size);
if (m_file->Eof())
m_lasterror = wxSTREAM_EOF;
if (ret == (size_t)wxInvalidOffset)
if (ret == wxInvalidOffset)
{
m_lasterror = wxSTREAM_READ_ERROR;
ret = 0;

4
src/unix/snglinst.cpp
View File

@@ -277,8 +277,8 @@ bool wxSingleInstanceCheckerImpl::Create(const wxString& name)
}
char buf[256];
size_t count = file.Read(buf, WXSIZEOF(buf));
if ( count == (size_t)wxInvalidOffset )
ssize_t count = file.Read(buf, WXSIZEOF(buf));
if ( count == wxInvalidOffset )
{
wxLogError(_("Failed to read PID from lock file."));
}

20
src/unix/sound.cpp
View File

@@ -6,7 +6,7 @@
// Created: 25/10/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart, Open Source Applications Foundation
// Licence: wxWindows licence
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
@@ -231,7 +231,7 @@ bool wxSoundBackendOSS::InitDSP(int dev, const wxSoundData *data)
}
if (tmp != stereo)
{
wxLogTrace(_T("sound"), _T("Unable to set DSP to %s."), stereo? _T("stereo"):_T("mono"));
wxLogTrace(_T("sound"), _T("Unable to set DSP to %s."), stereo? _T("stereo"):_T("mono"));
m_needConversion = true;
}
@@ -249,13 +249,13 @@ bool wxSoundBackendOSS::InitDSP(int dev, const wxSoundData *data)
// problems. Sound cards will sometimes use things like 44101 when you
// ask for 44100. No need overriding this and having strange output
// file rates for something that we can't hear anyways.
if (data->m_samplingRate - tmp > (tmp * .01) ||
tmp - data->m_samplingRate > (tmp * .01)) {
wxLogTrace(_T("sound"),
if (data->m_samplingRate - tmp > (tmp * .01) ||
tmp - data->m_samplingRate > (tmp * .01)) {
wxLogTrace(_T("sound"),
_T("Unable to set DSP sampling rate to %d (wants %d)"),
data->m_samplingRate, tmp);
m_needConversion = true;
}
}
}
// Do this last because some drivers can adjust the buffer sized based on
@@ -461,11 +461,11 @@ bool wxSound::Create(const wxString& fileName, bool isResource)
wxFile fileWave;
if (!fileWave.Open(fileName, wxFile::read))
{
return false;
}
{
return false;
}
size_t len = fileWave.Length();
wxFileOffset len = fileWave.Length();
wxUint8 *data = new wxUint8[len];
if (fileWave.Read(data, len) != len)
{

7
utils/HelpGen/src/HelpGen.cpp
View File

@@ -1417,7 +1417,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
char *buf = new char[len + 1];
buf[len] = '\0';
if ( file.Read(buf, len) == (size_t)wxInvalidOffset ) {
if ( file.Read(buf, len) == wxInvalidOffset ) {
delete [] buf;
return false;
@@ -1988,7 +1988,7 @@ bool IgnoreNamesHandler::AddNamesFromFile(const wxString& filename)
char *buf = new char[len + 1];
buf[len] = '\0';
if ( file.Read(buf, len) == (size_t)wxInvalidOffset ) {
if ( file.Read(buf, len) == wxInvalidOffset ) {
delete [] buf;
return false;
@@ -2186,6 +2186,9 @@ static const wxString GetVersionString()
/*
$Log$
Revision 1.33 2004/11/12 03:30:07 RL
Cruft cleanup from MJW, strip the tabs out of sound.cpp
Revision 1.32 2004/11/10 21:02:58 VZ
new set of fixes for problems due to huge files support: drop wxFileSize_t, use wxFileOffset only, make wxInvalidOffset an int (main part of the patch 1063498)