sc2mpd / Code / Diff of /mpd2src/fiforeader.cpp

Diff of /mpd2src/fiforeader.cpp [bee94a] .. [7a7ab2]

Switch to unified view


...
            if (errno == EAGAIN)
                return m_tmpbuf;
            LOGERR("FifoReader::read: ret " << nread << " errno " <<
            errno << " : " << strerror(errno) << endl);
            return 0;




        }
    }




    //LOGDEB("FifoReader: data done" << endl);
    return m_tmpbuf;
}

	a/mpd2src/fiforeader.cpp		b/mpd2src/fiforeader.cpp
	...		...
107	if (errno == EAGAIN)	107	if (errno == EAGAIN)
108	return m_tmpbuf;	108	return m_tmpbuf;
109	LOGERR("FifoReader::read: ret " << nread << " errno " <<	109	LOGERR("FifoReader::read: ret " << nread << " errno " <<
110	errno << " : " << strerror(errno) << endl);	110	errno << " : " << strerror(errno) << endl);
111	return 0;	111	return 0;
112	} else if (size - (size_t)nread > 0) {
113	LOGDEB("FifoReader::data: inserting " << size - nread <<
114	" bytes\n");
115	memset(m_tmpbuf + nread, 0, size - nread);
116	}	112	}
117	}	113	}
118
119	if (m_needswap)
120	swapSamples(m_tmpbuf, bytesPerSample(), m_tmpbufsize / bytesPerSample());
121		114
122	//LOGDEB("FifoReader: data done" << endl);	115	//LOGDEB("FifoReader: data done" << endl);
123	return m_tmpbuf;	116	return m_tmpbuf;
124	}	117	}