Change from_argb_hex() (which wasn't being used) to from_rgba_hex().

[libsub.git] / src / vertical_position.cc

diff --git a/src/vertical_position.cc b/src/vertical_position.cc
index 9801e4d53237be6c9c99aa70d758adbe19e9d504..aca327f36fe18c9aff6e20b0913b864b4f084ec8 100644 (file)
--- a/src/vertical_position.cc
+++ b/src/vertical_position.cc
@@ -18,10 +18,10 @@
 */
 
 #include "vertical_position.h"
+#include <iostream>
 
 using namespace sub;
 
-
 float
 VerticalPosition::fraction_from_screen_top () const
 {
@@ -34,7 +34,7 @@ VerticalPosition::fraction_from_screen_top () const
        switch (reference.get ()) {
        case TOP_OF_SCREEN:
                return prop;
-       case CENTRE_OF_SCREEN:
+       case VERTICAL_CENTRE_OF_SCREEN:
                return prop + 0.5;
        case BOTTOM_OF_SCREEN:
                return 1 - prop;
@@ -49,9 +49,11 @@ bool
 VerticalPosition::operator== (VerticalPosition const & other) const
 {
        if (proportional && reference && other.proportional && other.reference) {
-               return proportional.get() == other.proportional.get() && reference.get() == other.reference.get();
+               return proportional == other.proportional && reference == other.reference;
        } else if (reference && line && lines && other.reference && other.line && other.lines) {
-               return line.get() == other.line.get() && lines.get() == other.lines.get() && reference.get() == other.reference.get();
+               return line == other.line && lines == other.lines && reference == other.reference;
+       } else if (reference && line && other.reference && other.line) {
+               return reference == other.reference && line == other.line;
        }
 
        return false;