Merge master.

[dcpomatic.git] / src / lib / subrip.cc

diff --git a/src/lib/subrip.cc b/src/lib/subrip.cc
index 50931e12af030dfdfb383093a14cb9ee46dcf107..3eac98e638d22c17a1940a2355abee33a3fe1649 100644 (file)
--- a/src/lib/subrip.cc
+++ b/src/lib/subrip.cc
@@ -29,11 +29,12 @@
 using std::string;
 using std::list;
 using std::vector;
+using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
 using boost::algorithm::trim;
 
-SubRip::SubRip (shared_ptr<SubRipContent> content)
+SubRip::SubRip (shared_ptr<const SubRipContent> content)
 {
        FILE* f = fopen_boost (content->path (0), "r");
        if (!f) {
@@ -54,8 +55,12 @@ SubRip::SubRip (shared_ptr<SubRipContent> content)
        
        while (!feof (f)) {
                fgets (buffer, sizeof (buffer), f);
+               if (feof (f)) {
+                       break;
+               }
+               
                string line (buffer);
-               trim (line);
+               trim_right_if (line, boost::is_any_of ("\n\r"));
                
                switch (state) {
                case COUNTER:
@@ -93,6 +98,7 @@ SubRip::SubRip (shared_ptr<SubRipContent> content)
                                current->y1 = convert_coordinate (p[5]);
                                current->y2 = convert_coordinate (p[6]);
                        }
+                       state = CONTENT;
                        break;
                }
                case CONTENT:
@@ -109,24 +115,29 @@ SubRip::SubRip (shared_ptr<SubRipContent> content)
                }
        }
 
+       if (state == CONTENT) {
+               current->pieces = convert_content (lines);
+               _subtitles.push_back (current.get ());
+       }
+
        fclose (f);
 }
 
-Time
+ContentTime
 SubRip::convert_time (string t)
 {
-       Time r = 0;
+       ContentTime r;
 
        vector<string> a;
        boost::algorithm::split (a, t, boost::is_any_of (":"));
        assert (a.size() == 3);
-       r += lexical_cast<int> (a[0]) * 60 * 60 * TIME_HZ;
-       r += lexical_cast<int> (a[1]) * 60 * TIME_HZ;
+       r += ContentTime::from_seconds (lexical_cast<int> (a[0]) * 60 * 60);
+       r += ContentTime::from_seconds (lexical_cast<int> (a[1]) * 60);
 
        vector<string> b;
        boost::algorithm::split (b, a[2], boost::is_any_of (","));
-       r += lexical_cast<int> (b[0]) * TIME_HZ;
-       r += lexical_cast<int> (b[1]) * TIME_HZ / 1000;
+       r += ContentTime::from_seconds (lexical_cast<int> (b[0]));
+       r += ContentTime::from_seconds (lexical_cast<float> (b[1]) / 1000);
 
        return r;
 }
@@ -213,3 +224,13 @@ SubRip::convert_content (list<string> t)
 
        return pieces;
 }
+
+ContentTime
+SubRip::length () const
+{
+       if (_subtitles.empty ()) {
+               return ContentTime ();
+       }
+
+       return _subtitles.back().to;
+}