summaryrefslogtreecommitdiff
path: root/gr-blocks/lib/file_meta_source_impl.cc
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-04-15 21:16:52 -0400
committerTom Rondeau <trondeau@vt.edu>2013-04-29 14:51:27 -0400
commit35303ae975a5b1bdecc2492bc96e2b8e89b62a3d (patch)
tree55b14176026ae458d22d22e257ef7fc1c970754f /gr-blocks/lib/file_meta_source_impl.cc
parent894865eede58e6c2b42cbc30dd969658ac2365ca (diff)
blocks: fix file meta data source to handle repeat of files.
Diffstat (limited to 'gr-blocks/lib/file_meta_source_impl.cc')
-rw-r--r--gr-blocks/lib/file_meta_source_impl.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc
index 5d64e40a26..2b16b9066b 100644
--- a/gr-blocks/lib/file_meta_source_impl.cc
+++ b/gr-blocks/lib/file_meta_source_impl.cc
@@ -376,7 +376,15 @@ namespace gr {
parse_extras(extras, nitems_written(0), d_tags);
}
else {
- return -1;
+ if(!d_repeat)
+ return -1;
+ else {
+ if(fseek(d_fp, 0, SEEK_SET) == -1) {
+ std::stringstream s;
+ s << "[" << __FILE__ << "]" << " fseek failed" << std::endl;
+ throw std::runtime_error(s.str());
+ }
+ }
}
}
@@ -404,7 +412,7 @@ namespace gr {
out += i * d_itemsize;
if(size == 0) // done
- break;
+ break;
if(i > 0) // short read, try again
continue;
@@ -424,7 +432,7 @@ namespace gr {
}
if(size > 0) { // EOF or error
- if(size == seg_size) // we didn't read anything; say we're done
+ if(size == seg_size) // we didn't read anything; say we're done
return -1;
return seg_size - size; // else return partial result
}