diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 00:06:10 +0100 |
| commit | 7ef2ba523ca2ddc0470f5837bc88ad9c597361e2 (patch) | |
| tree | 9aaa33632f2c41e8c3129543c8214c8c3d7274cb /src/lib/util.h | |
| parent | 9e93c860759b8d04277596781706488f59a3cc12 (diff) | |
| parent | c37c744bbb236b1fd39f86e4f0ab36652d403d67 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/util.h')
| -rw-r--r-- | src/lib/util.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/util.h b/src/lib/util.h index 5f2e9a7fa..da7e73f20 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -160,6 +160,7 @@ extern std::string colour_lut_index_to_name (int index); 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); @@ -169,7 +170,7 @@ extern std::string get_optional_string (std::multimap<std::string, std::string> * 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 |