CW Cyrix's Git Repository Mirror

Browse code

Use std::copy_n/std::fill_n instead of std::copy/std::fill where possible.

Naram Qashat authored on 2014/09/08 16:52:49
Showing 5 changed files

src/in_gsf/vbam/apu/Blip_Buffer.cpp index 3ce019d..25c8412 100644
src/in_gsf/vbam/apu/Gb_Apu.cpp index ba15cbb..0d08b2c 100644
src/in_gsf/vbam/gba/GBA.cpp index 1caeac4..960a541 100644
src/in_ncsf/SSEQPlayer/Channel.h index 0193371..2ad851c 100644
src/in_xsf_framework/XSFPlayer.cpp index 38c52ed..f062fc7 100644

@@ -264,7 +264,7 @@ void Blip_Synth_::treble_eq(const blip_eq_t &eq)
                      		fimpulse[blip_res + half_size + i] = fimpulse[blip_res + half_size - 1 - i];
                      	// starts at 0
                     -	std::fill(&fimpulse[0], &fimpulse[blip_res], 0.0f);
                     +	std::fill_n(&fimpulse[0], blip_res, 0.0f);
                      	// find rescale factor
                      	double total = std::accumulate(&fimpulse[blip_res], &fimpulse[blip_res + half_size], 0.0);

src/in_gsf/vbam/apu/Gb_Apu.cpp

History View file @ c14b89a

@@ -83,7 +83,7 @@ void Gb_Apu::volume(double v)
                      void Gb_Apu::reset_regs()
+                     {
                     -	std::fill(&this->regs[0], &this->regs[0x20], 0);
                     +	std::fill_n(&this->regs[0], 0x20, 0);
                      	this->square1.reset();
                      	this->square2.reset();

src/in_gsf/vbam/gba/GBA.cpp

History View file @ c14b89a

@@ -1505,7 +1505,7 @@ void CPUInit()
                      		cpuBitsSet[i] = count;
+                     	}
                     -	std::fill(&ioReadable[0], &ioReadable[0x304], true);
                     +	std::fill_n(&ioReadable[0], 0x304, true);
                      	std::fill(&ioReadable[0x10], &ioReadable[0x48], false);
                      	std::fill(&ioReadable[0x4c], &ioReadable[0x50], false);
                      	std::fill(&ioReadable[0x54], &ioReadable[0x60], false);

src/in_ncsf/SSEQPlayer/Channel.h

History View file @ c14b89a

@@ -102,11 +102,11 @@ template<size_t N> struct RingBuffer
 
 	RingBuffer() : bufferPos(N / 2), getPos(N / 2)
 	{
-		std::fill(&this->buffer[0], &this->buffer[N * 2], 0);
+		std::fill_n(&this->buffer[0], N * 2, 0);
 	}
 	void Clear()
 	{
-		std::fill(&this->buffer[0], &this->buffer[N * 2], 0);
+		std::fill_n(&this->buffer[0], N * 2, 0);
 		this->bufferPos = this->getPos = N / 2;
 	}
 	void PushSample(int16_t sample)
@@ -125,11 +125,11 @@ template<size_t N> struct RingBuffer
 		if (this->bufferPos + size > N * 3 / 2)
 		{
 			size_t free = N * 3 / 2 - this->bufferPos;
-			std::copy(&samples[0], &samples[free], &this->buffer[this->bufferPos]);
+			std::copy_n(&samples[0], free, &this->buffer[this->bufferPos]);
 			std::copy(&samples[free], &samples[size], &this->buffer[N / 2]);
 		}
 		else
-			std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos]);
+			std::copy_n(&samples[0], size, &this->buffer[this->bufferPos]);
 		size_t rightFree = this->bufferPos < N ? N - this->bufferPos : 0;
 		if (rightFree < size)
 		{
@@ -137,18 +137,18 @@ template<size_t N> struct RingBuffer
 			{
 				size_t leftStart = this->bufferPos - N;
 				size_t leftSize = std::min(N / 2 - leftStart, size);
-				std::copy(&samples[0], &samples[leftSize], &this->buffer[leftStart]);
+				std::copy_n(&samples[0], leftSize, &this->buffer[leftStart]);
 				if (leftSize < size)
 					std::copy(&samples[leftSize], &samples[size], &this->buffer[N * 3 / 2]);
 			}
 			else
 			{
-				std::copy(&samples[0], &samples[rightFree], &this->buffer[this->bufferPos + N]);
+				std::copy_n(&samples[0], rightFree, &this->buffer[this->bufferPos + N]);
 				std::copy(&samples[rightFree], &samples[size], &this->buffer[0]);
 			}
 		}
 		else
-			std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos + N]);
+			std::copy_n(&samples[0], size, &this->buffer[this->bufferPos + N]);
 		this->bufferPos += size;
 		if (this->bufferPos >= N * 3 / 2)
 			this->bufferPos -= N;

src/in_xsf_framework/XSFPlayer.cpp

History View file @ c14b89a

@@ -66,12 +66,12 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
 		if (this->uses32BitSamplesClampedTo16Bit)
 		{
 			auto trueBufLong = reinterpret_cast<int32_t *>(&trueBuffer[0]);
-			std::copy(&trueBufLong[0], &trueBufLong[bufsize << 1], &bufLong[0]);
+			std::copy_n(&trueBufLong[0], bufsize << 1, &bufLong[0]);
 		}
 		else
 		{
 			auto trueBufShort = reinterpret_cast<int16_t *>(&trueBuffer[0]);
-			std::copy(&trueBufShort[0], &trueBufShort[bufsize << 1], &bufLong[0]);
+			std::copy_n(&trueBufShort[0], bufsize << 1, &bufLong[0]);
 		}
 		if (detectSilence || skipSilenceOnStartSec)
 		{
@@ -117,7 +117,7 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
 				{
 					auto tmpBuf = std::vector<int32_t>((bufsize - skipOffset) << 1);
 					std::copy(&bufLong[(offset + skipOffset) << 1], &bufLong[bufsize << 1], &tmpBuf[0]);
-					std::copy(&tmpBuf[0], &tmpBuf[(bufsize - skipOffset) << 1], &bufLong[offset << 1]);
+					std::copy_n(&tmpBuf[0], (bufsize - skipOffset) << 1, &bufLong[offset << 1]);
 					pos += skipOffset;
 				}
 				else
@@ -131,12 +131,12 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
 			if (this->uses32BitSamplesClampedTo16Bit)
 			{
 				auto trueBufLong = reinterpret_cast<int32_t *>(&trueBuffer[0]);
-				std::copy(&bufLong[0], &bufLong[bufsize << 1], &trueBufLong[0]);
+				std::copy_n(&bufLong[0], bufsize << 1, &trueBufLong[0]);
 			}
 			else
 			{
 				auto trueBufShort = reinterpret_cast<int16_t *>(&trueBuffer[0]);
-				std::copy(&bufLong[0], &bufLong[bufsize << 1], &trueBufShort[0]);
+				std::copy_n(&bufLong[0], bufsize << 1, &trueBufShort[0]);
 			}
 		}
 	}
@@ -188,7 +188,7 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
 	else
 	{
 		auto trueBufShort = reinterpret_cast<int16_t *>(&trueBuffer[0]);
-		std::copy(&bufLong[0], &bufLong[bufsize << 1], &trueBufShort[0]);
+		std::copy_n(&bufLong[0], bufsize << 1, &trueBufShort[0]);
 		std::copy(&trueBuffer[0], &trueBuffer[bufsize << 2], &buf[0]);
 	}
 

...	...	@@ -102,11 +102,11 @@ template<size_t N> struct RingBuffer
102	102
103	103	RingBuffer() : bufferPos(N / 2), getPos(N / 2)
104	104	{
105		- std::fill(&this->buffer[0], &this->buffer[N * 2], 0);
	105	+ std::fill_n(&this->buffer[0], N * 2, 0);
106	106	}
107	107	void Clear()
108	108	{
109		- std::fill(&this->buffer[0], &this->buffer[N * 2], 0);
	109	+ std::fill_n(&this->buffer[0], N * 2, 0);
110	110	this->bufferPos = this->getPos = N / 2;
111	111	}
112	112	void PushSample(int16_t sample)
...	...	@@ -125,11 +125,11 @@ template<size_t N> struct RingBuffer
125	125	if (this->bufferPos + size > N * 3 / 2)
126	126	{
127	127	size_t free = N * 3 / 2 - this->bufferPos;
128		- std::copy(&samples[0], &samples[free], &this->buffer[this->bufferPos]);
	128	+ std::copy_n(&samples[0], free, &this->buffer[this->bufferPos]);
129	129	std::copy(&samples[free], &samples[size], &this->buffer[N / 2]);
130	130	}
131	131	else
132		- std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos]);
	132	+ std::copy_n(&samples[0], size, &this->buffer[this->bufferPos]);
133	133	size_t rightFree = this->bufferPos < N ? N - this->bufferPos : 0;
134	134	if (rightFree < size)
135	135	{
...	...	@@ -137,18 +137,18 @@ template<size_t N> struct RingBuffer
137	137	{
138	138	size_t leftStart = this->bufferPos - N;
139	139	size_t leftSize = std::min(N / 2 - leftStart, size);
140		- std::copy(&samples[0], &samples[leftSize], &this->buffer[leftStart]);
	140	+ std::copy_n(&samples[0], leftSize, &this->buffer[leftStart]);
141	141	if (leftSize < size)
142	142	std::copy(&samples[leftSize], &samples[size], &this->buffer[N * 3 / 2]);
143	143	}
144	144	else
145	145	{
146		- std::copy(&samples[0], &samples[rightFree], &this->buffer[this->bufferPos + N]);
	146	+ std::copy_n(&samples[0], rightFree, &this->buffer[this->bufferPos + N]);
147	147	std::copy(&samples[rightFree], &samples[size], &this->buffer[0]);
148	148	}
149	149	}
150	150	else
151		- std::copy(&samples[0], &samples[size], &this->buffer[this->bufferPos + N]);
	151	+ std::copy_n(&samples[0], size, &this->buffer[this->bufferPos + N]);
152	152	this->bufferPos += size;
153	153	if (this->bufferPos >= N * 3 / 2)
154	154	this->bufferPos -= N;

...	...	@@ -66,12 +66,12 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
66	66	if (this->uses32BitSamplesClampedTo16Bit)
67	67	{
68	68	auto trueBufLong = reinterpret_cast<int32_t *>(&trueBuffer[0]);
69		- std::copy(&trueBufLong[0], &trueBufLong[bufsize << 1], &bufLong[0]);
	69	+ std::copy_n(&trueBufLong[0], bufsize << 1, &bufLong[0]);
70	70	}
71	71	else
72	72	{
73	73	auto trueBufShort = reinterpret_cast<int16_t *>(&trueBuffer[0]);
74		- std::copy(&trueBufShort[0], &trueBufShort[bufsize << 1], &bufLong[0]);
	74	+ std::copy_n(&trueBufShort[0], bufsize << 1, &bufLong[0]);
75	75	}
76	76	if (detectSilence \|\| skipSilenceOnStartSec)
77	77	{
...	...	@@ -117,7 +117,7 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
117	117	{
118	118	auto tmpBuf = std::vector<int32_t>((bufsize - skipOffset) << 1);
119	119	std::copy(&bufLong[(offset + skipOffset) << 1], &bufLong[bufsize << 1], &tmpBuf[0]);
120		- std::copy(&tmpBuf[0], &tmpBuf[(bufsize - skipOffset) << 1], &bufLong[offset << 1]);
	120	+ std::copy_n(&tmpBuf[0], (bufsize - skipOffset) << 1, &bufLong[offset << 1]);
121	121	pos += skipOffset;
122	122	}
123	123	else
...	...	@@ -131,12 +131,12 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
131	131	if (this->uses32BitSamplesClampedTo16Bit)
132	132	{
133	133	auto trueBufLong = reinterpret_cast<int32_t *>(&trueBuffer[0]);
134		- std::copy(&bufLong[0], &bufLong[bufsize << 1], &trueBufLong[0]);
	134	+ std::copy_n(&bufLong[0], bufsize << 1, &trueBufLong[0]);
135	135	}
136	136	else
137	137	{
138	138	auto trueBufShort = reinterpret_cast<int16_t *>(&trueBuffer[0]);
139		- std::copy(&bufLong[0], &bufLong[bufsize << 1], &trueBufShort[0]);
	139	+ std::copy_n(&bufLong[0], bufsize << 1, &trueBufShort[0]);
140	140	}
141	141	}
142	142	}
...	...	@@ -188,7 +188,7 @@ bool XSFPlayer::FillBuffer(std::vector<uint8_t> &buf, unsigned &samplesWritten)
188	188	else
189	189	{
190	190	auto trueBufShort = reinterpret_cast<int16_t *>(&trueBuffer[0]);
191		- std::copy(&bufLong[0], &bufLong[bufsize << 1], &trueBufShort[0]);
	191	+ std::copy_n(&bufLong[0], bufsize << 1, &trueBufShort[0]);
192	192	std::copy(&trueBuffer[0], &trueBuffer[bufsize << 2], &buf[0]);
193	193	}
194	194