Tidy up test film naming.

[dcpomatic.git] / src / lib / util.h

diff --git a/src/lib/util.h b/src/lib/util.h
index c2706a5948b2230d0ff12fa753e336246afd35ed..1d9984d9d74f5513db5089013a72f2a111786222 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -46,14 +46,13 @@ class Scaler;
 extern std::string seconds_to_hms (int);
 extern std::string seconds_to_approximate_hms (int);
 extern void stacktrace (std::ostream &, int);
-extern std::string audio_sample_format_to_string (AVSampleFormat);
-extern AVSampleFormat audio_sample_format_from_string (std::string);
 extern std::string dependency_version_summary ();
 extern double seconds (struct timeval);
 extern void dvdomatic_setup ();
 extern std::vector<std::string> split_at_spaces_considering_quotes (std::string);
 extern std::string md5_digest (std::string);
 extern std::string md5_digest (void const *, int);
+extern void ensure_ui_thread ();
 
 enum ContentType {
        STILL,
@@ -205,5 +204,34 @@ private:
        int _buffer_data;
 };
 
+class AudioBuffers
+{
+public:
+       AudioBuffers (int channels, int frames);
+       ~AudioBuffers ();
+
+       float** data () const {
+               return _data;
+       }
+       
+       float* data (int) const;
+
+       int frames () const {
+               return _frames;
+       }
+
+       void set_frames (int f);
+
+       void make_silent ();
+
+private:
+       /* no copy construction */
+       AudioBuffers (AudioBuffers const &);
+       
+       int _channels;
+       int _frames;
+       float** _data;
+};
+
 #endif