X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dea7e44a76e4e886f2bc60b0e82322a71b1f1f4f..dc8a1aa53d9c71820d683aefe7ea04d7e480f63b:/contrib/src/mmedia/sndoss.cpp

diff --git a/contrib/src/mmedia/sndoss.cpp b/contrib/src/mmedia/sndoss.cpp
index 4070ca0fdc..aa36a1e18f 100644
--- a/contrib/src/mmedia/sndoss.cpp
+++ b/contrib/src/mmedia/sndoss.cpp
@@ -4,10 +4,8 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999, 2000
 // CVSID: $Id$
+// wxWindows licence
 // --------------------------------------------------------------------------
-#ifdef __GNUG__
-#pragma implementation "sndoss.cpp"
-#endif
 
 // --------------------------------------------------------------------------
 // System dependent headers
@@ -35,7 +33,7 @@
 wxSoundStreamOSS::wxSoundStreamOSS(const wxString& dev_name)
 {
     wxSoundFormatPcm pcm_default;
-    
+
     // Open the OSS device
     m_fd = open(dev_name.mb_str(), O_WRONLY);
     if (m_fd == -1) {
@@ -53,12 +51,12 @@ wxSoundStreamOSS::wxSoundStreamOSS(const wxString& dev_name)
 
     // Get the default best size for OSS
     ioctl(m_fd, SNDCTL_DSP_GETBLKSIZE, &m_bufsize);
-    
+
     m_snderror = wxSOUND_NOERROR;
 
     // Close OSS
     close(m_fd);
-    
+
     m_oss_ok   = true;
     m_oss_stop = true;
     m_q_filled = true;
@@ -84,15 +82,16 @@ wxSoundStream& wxSoundStreamOSS::Read(void *buffer, wxUint32 len)
         m_lastcount = 0;
         return *this;
     }
-    
-    m_lastcount = (wxUint32)ret = read(m_fd, buffer, len);
+
+    ret = read(m_fd, buffer, len);
+    m_lastcount = (wxUint32)ret;
     m_q_filled  = true;
-    
+
     if (ret < 0)
         m_snderror = wxSOUND_IOERROR;
     else
         m_snderror = wxSOUND_NOERROR;
-    
+
     return *this;
 }
 
@@ -108,7 +107,7 @@ wxSoundStream& wxSoundStreamOSS::Write(const void *buffer, wxUint32 len)
 
     ret = write(m_fd, buffer, len);
     m_q_filled = true;
-    
+
     if (ret < 0) {
         m_lastcount = 0;
         m_snderror  = wxSOUND_IOERROR;
@@ -116,7 +115,7 @@ wxSoundStream& wxSoundStreamOSS::Write(const void *buffer, wxUint32 len)
         m_snderror = wxSOUND_NOERROR;
         m_lastcount = (wxUint32)ret;
     }
-    
+
     return *this;
 }
 
@@ -124,20 +123,20 @@ bool wxSoundStreamOSS::SetSoundFormat(const wxSoundFormatBase& format)
 {
     int tmp;
     wxSoundFormatPcm *pcm_format;
-    
+
     if (format.GetType() != wxSOUND_PCM) {
         m_snderror = wxSOUND_INVFRMT;
         return false;
     }
-    
+
     if (!m_oss_ok) {
         m_snderror = wxSOUND_INVDEV;
         return false;
     }
-    
+
     if (m_sndformat)
         delete m_sndformat;
-    
+
     m_sndformat = format.Clone();
     if (!m_sndformat) {
         m_snderror = wxSOUND_MEMERROR;
@@ -153,18 +152,18 @@ bool wxSoundStreamOSS::SetSoundFormat(const wxSoundFormatBase& format)
             return false;
         }
     }
-    
+
     // Set the sample rate field.
     tmp = pcm_format->GetSampleRate();
     ioctl(m_fd, SNDCTL_DSP_SPEED, &tmp);
-    
+
     pcm_format->SetSampleRate(tmp);
-    
+
     // Detect the best format
     DetectBest(pcm_format);
     // Try to apply it
     SetupFormat(pcm_format);
-    
+
     tmp = pcm_format->GetChannels();
     ioctl(m_fd, SNDCTL_DSP_CHANNELS, &tmp);
     pcm_format->SetChannels(tmp);
@@ -172,7 +171,7 @@ bool wxSoundStreamOSS::SetSoundFormat(const wxSoundFormatBase& format)
     // Close the OSS device
     if (m_oss_stop)
         close(m_fd);
-    
+
     m_snderror = wxSOUND_NOERROR;
     if (*pcm_format != format) {
         m_snderror = wxSOUND_NOEXACT;
@@ -185,7 +184,7 @@ bool wxSoundStreamOSS::SetSoundFormat(const wxSoundFormatBase& format)
 bool wxSoundStreamOSS::SetupFormat(wxSoundFormatPcm *pcm_format)
 {
     int tmp;
-    
+
     switch(pcm_format->GetBPS()) {
         case 8:
             if (pcm_format->Signed())
@@ -210,9 +209,9 @@ bool wxSoundStreamOSS::SetupFormat(wxSoundFormatPcm *pcm_format)
             }
             break;
     }
-    
+
     ioctl(m_fd, SNDCTL_DSP_SETFMT, &tmp);
-    
+
     // Demangling.
     switch (tmp) {
         case AFMT_U8:
@@ -252,7 +251,7 @@ static void _wxSound_OSS_CBack(gpointer data, int source,
                                GdkInputCondition condition)
 {
     wxSoundStreamOSS *oss = (wxSoundStreamOSS *)data;
-    
+
     switch (condition) {
         case GDK_INPUT_READ:
             oss->WakeUpEvt(wxSOUND_INPUT);
@@ -275,31 +274,31 @@ void wxSoundStreamOSS::WakeUpEvt(int evt)
 bool wxSoundStreamOSS::StartProduction(int evt)
 {
     wxSoundFormatBase *old_frmt;
-    
+
     if (!m_oss_stop)
         StopProduction();
-    
+
     old_frmt = m_sndformat->Clone();
     if (!old_frmt) {
         m_snderror = wxSOUND_MEMERROR;
         return false;
     }
-    
+
     if (evt == wxSOUND_OUTPUT)
         m_fd = open(m_devname.mb_str(), O_WRONLY);
     else if (evt == wxSOUND_INPUT)
         m_fd = open(m_devname.mb_str(), O_RDONLY);
-    
+
     if (m_fd == -1) {
         m_snderror = wxSOUND_INVDEV;
         return false;
     }
-    
+
     SetSoundFormat(*old_frmt);
     delete old_frmt;
-    
+
     int trig;
-    
+
     if (evt == wxSOUND_OUTPUT) {
 #ifdef __WXGTK__
         m_tag = gdk_input_add(m_fd, GDK_INPUT_WRITE, _wxSound_OSS_CBack, (gpointer)this);