Reimplement sample counter

1 files changed, 6 insertions, 16 deletions

diff --git a/examples/sinewave/sinewave_example.cpp b/examples/sinewave/sinewave_example.cpp
index 2f7c47e..606cab2 100644
--- a/examples/sinewave/sinewave_example.cpp
+++ b/examples/sinewave/sinewave_example.cpp
@@ -14,20 +14,11 @@ using Clock = std::chrono::high_resolution_clock;
 
 int main(int argc, char* argv[]) {
 
-	seconds interval{ 10.0 };
-	bool end = false;
-	int i = 1;
+	seconds interval{ 0.01 };
+	int i = 0;
 	int samples;
 	int	opt;
 
-	const std::function infinite = []() {};
-	const std::function limited = [&end, &i, &samples]() {
-		i++;
-		if (i > samples) end = true;
-	};
-
-	auto generatorGuard = infinite;
-
 	try {
 		while ((opt = getopt(argc, argv, "n:i:")) != -1) {
 			switch (opt) {
@@ -36,8 +27,6 @@ int main(int argc, char* argv[]) {
 				break;
 			case 'n':
 				samples = std::stoi(optarg);
-				if (samples == 0) end = true;
-				generatorGuard = limited;
 				break;
 			default:
 				std::cerr << "Usage: " << argv[0] << " [-i interval][-n samples]"<<std::endl;
@@ -55,14 +44,15 @@ int main(int argc, char* argv[]) {
 	hwd::sinewave::set_frequency(10);
 	hwd::sinewave::set_phase(30);
 
-	while (!end) {
+	while (1) {
+		if (i >= samples) break;
+		i++;
+
 		const auto endTime = Clock::now() + interval;
 
 		std::cout << hwd::sinewave::get_point() << std::endl;
 	
 		std::this_thread::sleep_until(endTime);
-		
-		generatorGuard();
 	}
 
 	return 0;