#include "compose.hpp"
#ifdef DVDOMATIC_DEBUG
-#define TIMING(...) _log->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
+#define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING);
#else
#define TIMING(...)
#endif
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,
};
/** A rectangle */
-struct Rectangle
+struct Rect
{
- Rectangle ()
+ Rect ()
: x (0)
, y (0)
, width (0)
, height (0)
{}
- Rectangle (int x_, int y_, int w_, int h_)
+ Rect (int x_, int y_, int w_, int h_)
: x (x_)
, y (y_)
, width (w_)
return Size (width, height);
}
- Rectangle intersection (Rectangle const & other) const;
+ Rect intersection (Rect const & other) const;
};
extern std::string crop_string (Position, Size);
extern int round_up (int, int);
extern std::multimap<std::string, std::string> read_key_value (std::istream& s);
extern int get_required_int (std::multimap<std::string, std::string> const & kv, std::string k);
+extern float get_required_float (std::multimap<std::string, std::string> const & kv, std::string k);
extern std::string get_required_string (std::multimap<std::string, std::string> const & kv, std::string k);
extern int get_optional_int (std::multimap<std::string, std::string> const & kv, std::string k);
extern std::string get_optional_string (std::multimap<std::string, std::string> const & kv, std::string k);
* that are useful for DVD-o-matic.
*
* This class wraps some things that I could not work out how to do with boost;
- * most notably, sync read/write calls with timeouts, and the ability to peak into
+ * most notably, sync read/write calls with timeouts, and the ability to peek into
* data being read.
*/
class Socket
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