Fix int/float confusion.

diff --git a/src/lib/server.cc b/src/lib/server.cc
index e8a9804ed1ca1c83acca2d6cc4085c4d68787117..10f64b48250ee044e87128d45b7c5db8fe85e3c3 100644 (file)
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -90,7 +90,7 @@ Server::process (shared_ptr<Socket> socket)
        Size out_size (get_required_int (kv, "output_width"), get_required_int (kv, "output_height"));
        int padding = get_required_int (kv, "padding");
        int subtitle_offset = get_required_int (kv, "subtitle_offset");
-       int subtitle_scale = get_required_int (kv, "subtitle_scale");
+       float subtitle_scale = get_required_float (kv, "subtitle_scale");
        string scaler_id = get_required_string (kv, "scaler");
        int frame = get_required_int (kv, "frame");
        int frames_per_second = get_required_int (kv, "frames_per_second");

diff --git a/src/lib/util.cc b/src/lib/util.cc
index c2b24944d79ada39b4f1f844cd3f0a1537c1b486..9a0a8be827774fd46ad1f47ecf60cbd8bffdf2f6 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -675,6 +675,13 @@ get_required_int (multimap<string, string> const & kv, string k)
        return lexical_cast<int> (v);
 }
 
+float
+get_required_float (multimap<string, string> const & kv, string k)
+{
+       string const v = get_required_string (kv, k);
+       return lexical_cast<float> (v);
+}
+
 string
 get_optional_string (multimap<string, string> const & kv, string k)
 {

diff --git a/src/lib/util.h b/src/lib/util.h
index 5f2e9a7fa181c6ce5abbccd67dd1a67eef90d763..da7e73f2049a6c532d0d3d91831f808129f576fc 100644 (file)
--- 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