summaryrefslogtreecommitdiff
path: root/os2eindopdracht/SampleStream.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'os2eindopdracht/SampleStream.cpp')
-rw-r--r--os2eindopdracht/SampleStream.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/os2eindopdracht/SampleStream.cpp b/os2eindopdracht/SampleStream.cpp
index ca60281..3727e52 100644
--- a/os2eindopdracht/SampleStream.cpp
+++ b/os2eindopdracht/SampleStream.cpp
@@ -15,7 +15,7 @@ SampleStream::SampleStream(string input_stream) {
void SampleStream::load(string input) {
_stream.clear();
- for (unsigned long i = 0; i < input.size(); i += 2)
+ for (size_t i = 0; i < input.size(); i += 2)
_stream.push_back(((input[i] & 0xff) << 0) | ((input[i+1] & 0xff) << 8));
}
@@ -28,13 +28,13 @@ string SampleStream::save() {
return out;
}
-vector<SampleBlock> SampleStream::split(unsigned long block_size) {
+vector<SampleBlock> SampleStream::split(size_t block_size) {
vector<SampleBlock> out;
- unsigned long stream_size = _stream.size();
- for (unsigned long i = 0; i < stream_size; i += block_size) {
- unsigned long begin_offset = i;
- unsigned long end_offset = min(i + block_size, stream_size);
- SampleBlock block(_stream.begin() + begin_offset, _stream.begin() + end_offset);
+ size_t stream_size = _stream.size();
+ for (size_t i = 0; i < stream_size; i += block_size) {
+ size_t begin_offset = i;
+ size_t end_offset = min(i + block_size, stream_size);
+ SampleBlock block(_stream.begin() + begin_offset, end_offset - begin_offset);
out.push_back(block);
}
return out;