aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2015-03-22 18:14:45 +0100
committerTrygve Laugstøl <trygvis@inamo.no>2015-03-22 18:14:45 +0100
commitec15f36073b77375a06457c423d9a56245aa9dfc (patch)
treecfaeff2569701df5bd096c9128fa987fc258407c /apps
parent6bac290b92b635be047237b880144dbc163df6ec (diff)
downloadble-toys-ec15f36073b77375a06457c423d9a56245aa9dfc.tar.gz
ble-toys-ec15f36073b77375a06457c423d9a56245aa9dfc.tar.bz2
ble-toys-ec15f36073b77375a06457c423d9a56245aa9dfc.tar.xz
ble-toys-ec15f36073b77375a06457c423d9a56245aa9dfc.zip
o Renaming open_sample_input_stream to open_sample_stream_parser.
Diffstat (limited to 'apps')
-rw-r--r--apps/sample-select.cpp2
-rw-r--r--apps/sample-timestamp.cpp4
-rw-r--r--apps/sm-serial-read-all.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/apps/sample-select.cpp b/apps/sample-select.cpp
index d1e6d0e..e1bac07 100644
--- a/apps/sample-select.cpp
+++ b/apps/sample-select.cpp
@@ -93,7 +93,7 @@ public:
unique_ptr<SampleOutputStream> unique_output_stream = open_sample_output_stream(shared_ptr<ostream>(&cout, noop_deleter), dict, parser->type(), options);
shared_ptr<SampleOutputStream> output_stream{std::move(unique_output_stream)};
shared_ptr<SampleOutputStream> p = make_shared<TimestampFixingSampleOutputStream>(output_stream, dict, timestamp_name, relative_name, relative_resolution, start_time);
- parser = open_sample_input_stream(p, dict, parser->type());
+ parser = open_sample_stream_parser(p, dict, parser->type());
int recordCount = 0;
diff --git a/apps/sample-timestamp.cpp b/apps/sample-timestamp.cpp
index 2fde1b6..85431ae 100644
--- a/apps/sample-timestamp.cpp
+++ b/apps/sample-timestamp.cpp
@@ -125,7 +125,7 @@ public:
relative_key = dict.indexOf(relative_name);
auto sample_buffer = make_shared<VectorSampleOutputStream>();
- auto parser = open_sample_input_stream(sample_buffer, dict);
+ auto parser = open_sample_stream_parser(sample_buffer, dict);
while (!input.fail()) {
char buffer[buffer_size];
input.read(buffer, buffer_size);
@@ -182,7 +182,7 @@ public:
unique_ptr<SampleOutputStream> unique_output_stream = open_sample_output_stream(shared_ptr<ostream>(&cout, noop_deleter), dict, parser->type(), options);
shared_ptr<SampleOutputStream> output_stream{std::move(unique_output_stream)};
shared_ptr<SampleOutputStream> p = make_shared<TimestampFixingSampleOutputStream>(output_stream, dict, timestamp_name, relative_name, relative_resolution, start_time);
- parser = open_sample_input_stream(p, dict, parser->type());
+ parser = open_sample_stream_parser(p, dict, parser->type());
int recordCount = 0;
diff --git a/apps/sm-serial-read-all.cpp b/apps/sm-serial-read-all.cpp
index 0c5e54a..5c2af1d 100644
--- a/apps/sm-serial-read-all.cpp
+++ b/apps/sm-serial-read-all.cpp
@@ -143,7 +143,7 @@ public:
port.set_option(serial_port_base::flow_control(serial_port_base::flow_control::none));
KeyDictionary parserDict; // TODO: dette feiler
- unique_ptr<SampleStreamParser> parser = open_sample_input_stream(thread_safe_output, parserDict, sample_format_type::KEY_VALUE);
+ unique_ptr<SampleStreamParser> parser = open_sample_stream_parser(thread_safe_output, parserDict, sample_format_type::KEY_VALUE);
auto handler = new port_handler(port_name, port, move(parser));
active_ports[port_name] = handler;