Put everything in namespace bmusb; it was getting too generic with e.g. VideoFormat...

[bmusb] / bmusb.h

diff --git a/bmusb.h b/bmusb.h
index 941c57c27d358ba22f28cb97268f71c475178f9c..506685dc4c6a7401d17143cdb611315981c7b187 100644 (file)
--- a/bmusb.h
+++ b/bmusb.h
@@ -14,6 +14,8 @@
 #include <thread>
 #include <vector>
 
+namespace bmusb {
+
 class BMUSBCapture;
 
 // An interface for frame allocators; if you do not specify one
@@ -90,6 +92,10 @@ struct VideoMode {
 };
 
 // Represents the format of an actual frame coming in.
+// Note: Frame rate is _frame_ rate, not field rate. So 1080i60 gets 30/1, _not_ 60/1.
+// "second_field_start" is only valid for interlaced modes; it signifies
+// how many lines from the very top of the frame there are before the second field
+// starts (so it will always be >= height/2 + extra_lines_top).
 struct VideoFormat {
        uint16_t id = 0;  // For debugging/logging only.
        unsigned width = 0, height = 0, second_field_start = 0;
@@ -322,11 +328,6 @@ class BMUSBCapture : public CaptureInterface {
        bool disconnected = false;
 };
 
-// Get details for the given video format; returns false if detection was incomplete.
-// Note: Frame rate is _frame_ rate, not field rate. So 1080i60 gets 30/1, _not_ 60/1.
-// "second_field_start" is only valid for interlaced modes; it signifies
-// how many lines from the very top of the frame there are before the second field
-// starts (so it will always be >= height/2 + extra_lines_top).
-bool decode_video_format(uint16_t video_format, VideoFormat *decoded_video_format);
+}  // namespace bmusb
 
 #endif