Thumbs sort of have subs.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 95dc7b82590946cc353ca2699d0c459f86d3c97c..1e23c4d6b932646c086bc1215b6a75c722a12ac6 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -27,6 +27,7 @@
 #include <unistd.h>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
 #include "film.h"
 #include "format.h"
 #include "tiff_encoder.h"
@@ -668,3 +669,47 @@ Film::set_with_subtitles (bool w)
        _state.with_subtitles = w;
        signal_changed (WITH_SUBTITLES);
 }
+
+list<pair<Position, string> >
+Film::thumb_subtitles (int n) const
+{
+       string sub_file = _state.thumb_base(n) + ".sub";
+       if (!filesystem::exists (sub_file)) {
+               return list<pair<Position, string> > ();
+       }
+
+       ifstream f (sub_file.c_str ());
+       string line;
+
+       int sub_number;
+       int sub_x;
+       list<pair<Position, string> > subs;
+       
+       while (getline (f, line)) {
+               if (line.empty ()) {
+                       continue;
+               }
+
+               if (line[line.size() - 1] == '\r') {
+                       line = line.substr (0, line.size() - 1);
+               }
+
+               size_t const s = line.find (' ');
+               if (s == string::npos) {
+                       continue;
+               }
+
+               string const k = line.substr (0, s);
+               int const v = lexical_cast<int> (line.substr(s + 1));
+
+               if (k == "image") {
+                       sub_number = v;
+               } else if (k == "x") {
+                       sub_x = v;
+               } else if (k == "y") {
+                       subs.push_back (make_pair (Position (sub_x, v), String::compose ("%1.sub.%2.tiff", _state.thumb_base(n), sub_number)));
+               }
+       }
+
+       return subs;
+}

diff --git a/src/lib/film.h b/src/lib/film.h
index 919cecc220c552688931148f0ffced1efa55ceda..1e01747a23bc6bb98d8f3abebe7e2a92a873bb2a 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -193,6 +193,7 @@ public:
        int num_thumbs () const;
        int thumb_frame (int) const;
        std::string thumb_file (int) const;
+       std::list<std::pair<Position, std::string> > thumb_subtitles (int) const;
 
        void copy_from_dvd_post_gui ();
        void examine_content ();

diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc
index 03d4cae832751ea0d37258248a6da250e085841a..2847ea51323593740d0a66db1823caee78e9c985 100644 (file)
--- a/src/lib/film_state.cc
+++ b/src/lib/film_state.cc
@@ -190,10 +190,22 @@ FilmState::thumb_file (int n) const
  */
 string
 FilmState::thumb_file_for_frame (int n) const
+{
+       return thumb_base_for_frame(n) + ".tiff";
+}
+
+string
+FilmState::thumb_base (int n) const
+{
+       return thumb_base_for_frame (thumb_frame (n));
+}
+
+string
+FilmState::thumb_base_for_frame (int n) const
 {
        stringstream s;
        s.width (8);
-       s << setfill('0') << n << ".tiff";
+       s << setfill('0') << n;
        
        filesystem::path p;
        p /= dir ("thumbs");

diff --git a/src/lib/film_state.h b/src/lib/film_state.h
index 2b792694c59e77edde928297022a18e91e679716..5b3ef83679ddfa01fa855010f5900d71a378755b 100644 (file)
--- a/src/lib/film_state.h
+++ b/src/lib/film_state.h
@@ -79,6 +79,7 @@ public:
        bool content_is_dvd () const;
 
        std::string thumb_file (int) const;
+       std::string thumb_base (int) const;
        int thumb_frame (int) const;
 
        int bytes_per_sample () const;
@@ -151,6 +152,7 @@ public:
 
 private:
        std::string thumb_file_for_frame (int) const;
+       std::string thumb_base_for_frame (int) const;
 };
 
 #endif

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 935566440276f563ba5adcb86c44075c06eb5fa7..82aaf8ff5ca17ac208f67ca0b897756b106405a3 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -600,3 +600,16 @@ Socket::read_indefinite (uint8_t* data, int size, int timeout)
        assert (size >= _buffer_data);
        memcpy (data, _buffer, size);
 }
+
+Rectangle
+Rectangle::intersection (Rectangle const & other) const
+{
+       int const tx = max (x, other.x);
+       int const ty = max (y, other.y);
+       
+       return Rectangle (
+               tx, ty,
+               min (x + w, other.x + other.w) - tx,
+               min (y + h, other.y + other.h) - ty
+               );
+}

diff --git a/src/lib/util.h b/src/lib/util.h
index ed13cd43cba51bf95f2cad930381bf81f24d7d5a..e1ad7fd642707ee546b8374e4dc879f9c792e871 100644 (file)
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -121,6 +121,31 @@ struct Position
        int y;
 };
 
+/** A rectangle */
+struct Rectangle
+{
+       Rectangle ()
+               : x (0)
+               , y (0)
+               , w (0)
+               , h (0)
+       {}
+
+       Rectangle (int x_, int y_, int w_, int h_)
+               : x (x_)
+               , y (y_)
+               , w (w_)
+               , h (h_)
+       {}
+
+       int x;
+       int y;
+       int w;
+       int h;
+
+       Rectangle intersection (Rectangle const & other) const;
+};
+
 extern std::string crop_string (Position, Size);
 extern int dcp_audio_sample_rate (int);
 extern std::string colour_lut_index_to_name (int index);

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 6ffe4e66a847f2f92aa4ccd7a9638df2c2d797a0..8c298ea57d3087915204efaa2b5f826ff5c0a150 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -42,18 +42,24 @@ public:
        ThumbPanel (wxPanel* parent, Film* film)
                : wxPanel (parent)
                , _film (film)
-               , _image (0)
-               , _bitmap (0)
        {
        }
 
        /** Handle a paint event */
        void paint_event (wxPaintEvent& ev)
        {
-               if (_current_image != _pending_image) {
-                       delete _image;
-                       _image = new wxImage (std_to_wx (_pending_image));
-                       _current_image = _pending_image;
+               if (_current_index != _pending_index) {
+                       _image.reset (new wxImage (std_to_wx (_film->thumb_file (_pending_index))));
+                       _current_index = _pending_index;
+
+                       _subtitles.clear ();
+
+                       cout << "=== SUBS for " << _film->thumb_frame (_pending_index) << "\n";
+                       list<pair<Position, string> > s = _film->thumb_subtitles (_pending_index);
+                       for (list<pair<Position, string> >::iterator i = s.begin(); i != s.end(); ++i) {
+                               _subtitles.push_back (SubtitleView (i->first, std_to_wx (i->second)));
+                       }
+
                        setup ();
                }
 
@@ -64,8 +70,14 @@ public:
 
                wxPaintDC dc (this);
                if (_bitmap) {
+                       cout << "frame bm " << _bitmap->GetWidth() << " " << _bitmap->GetHeight() << "\n";
                        dc.DrawBitmap (*_bitmap, 0, 0, false);
                }
+
+               for (list<SubtitleView>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+                       dc.DrawBitmap (*i->bitmap, i->position.x, i->position.y, true);
+                       cout << "\tsub bm at " << i->position.x << " " << i->position.y << " size " << i->bitmap->GetWidth() << " by " << i->bitmap->GetHeight() << "\n";
+               }
        }
 
        /** Handle a size event */
@@ -79,9 +91,10 @@ public:
                Refresh ();
        }
 
-       void set (string f)
+       /** @param n Thumbnail index */
+       void set (int n)
        {
-               _pending_image = f;
+               _pending_index = n;
                Refresh ();
        }
 
@@ -106,10 +119,9 @@ public:
        /** Clear our thumbnail image */
        void clear ()
        {
-               delete _bitmap;
-               _bitmap = 0;
-               delete _image;
-               _image = 0;
+               _bitmap.reset ();
+               _image.reset ();
+               _subtitles.clear ();
        }
 
        void refresh ()
@@ -127,41 +139,95 @@ private:
                if (!_film || !_image) {
                        return;
                }
-               
+
+               /* Size of the view */
                int vw, vh;
                GetSize (&vw, &vh);
 
+               /* Cropped rectangle */
+               Rectangle cropped (
+                       _current_crop.left,
+                       _current_crop.top,
+                       _image->GetWidth() - (_current_crop.left + _current_crop.right),
+                       _image->GetHeight() - (_current_crop.top + _current_crop.bottom)
+                       );
+
+               /* Target ratio */
                float const target = _film->format() ? _film->format()->ratio_as_float (_film) : 1.78;
 
-               _cropped_image = _image->GetSubImage (
-                       wxRect (
-                               _current_crop.left,
-                               _current_crop.top,
-                               _image->GetWidth() - (_current_crop.left + _current_crop.right),
-                               _image->GetHeight() - (_current_crop.top + _current_crop.bottom)
-                               )
-                       );
+               _cropped_image = _image->GetSubImage (wxRect (cropped.x, cropped.y, cropped.w, cropped.h));
+
+               float x_scale = 1;
+               float y_scale = 1;
 
                if ((float (vw) / vh) > target) {
                        /* view is longer (horizontally) than the ratio; fit height */
                        _cropped_image.Rescale (vh * target, vh, wxIMAGE_QUALITY_HIGH);
+                       x_scale = vh * target / _image->GetWidth ();
+                       y_scale = float (vh) / _image->GetHeight ();  
                } else {
                        /* view is shorter (horizontally) than the ratio; fit width */
                        _cropped_image.Rescale (vw, vw / target, wxIMAGE_QUALITY_HIGH);
+                       x_scale = float (vw) / _image->GetWidth ();
+                       y_scale = (vw / target) / _image->GetHeight ();
                }
 
-               delete _bitmap;
-               _bitmap = new wxBitmap (_cropped_image);
+               _bitmap.reset (new wxBitmap (_cropped_image));
+
+               for (list<SubtitleView>::iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
+                       Rectangle sub_rect (i->position.x, i->position.y, i->image.GetWidth(), i->image.GetHeight());
+                       Rectangle cropped_sub_rect = sub_rect.intersection (cropped);
+
+                       cout << "sub " << sub_rect.x << " " << sub_rect.y << " " << sub_rect.w << " " << sub_rect.h << "\n";
+                       cout << "cropped " << cropped_sub_rect.x << " " << cropped_sub_rect.y << " " << cropped_sub_rect.w << " " << cropped_sub_rect.h << "\n";
+
+                       i->cropped_image = i->image.GetSubImage (
+                               wxRect (
+                                       cropped_sub_rect.x - sub_rect.x,
+                                       cropped_sub_rect.y - sub_rect.y,
+                                       cropped_sub_rect.w,
+                                       cropped_sub_rect.h
+                                       )
+                               );
+                       
+                       i->cropped_image.Rescale (cropped_sub_rect.w * x_scale, cropped_sub_rect.h * y_scale, wxIMAGE_QUALITY_HIGH);
+
+                       i->position = Position (
+                               cropped_sub_rect.x * x_scale,
+                               cropped_sub_rect.y * y_scale
+                               );
+
+                       cout << "scales are " << x_scale << " " << y_scale << "\n";
+                       cout << "scaled to " << (cropped_sub_rect.w * x_scale) << " " << (cropped_sub_rect.h * y_scale) << "\n";
+
+                       i->bitmap.reset (new wxBitmap (i->cropped_image));
+               }
        }
 
        Film* _film;
-       wxImage* _image;
-       std::string _current_image;
-       std::string _pending_image;
+       shared_ptr<wxImage> _image;
        wxImage _cropped_image;
-       wxBitmap* _bitmap;
+       /** currently-displayed thumbnail index */
+       int _current_index;
+       int _pending_index;
+       shared_ptr<wxBitmap> _bitmap;
        Crop _current_crop;
        Crop _pending_crop;
+
+       struct SubtitleView
+       {
+               SubtitleView (Position p, wxString const & i)
+                       : position (p)
+                       , image (i)
+               {}
+                             
+               Position position;
+               wxImage image;
+               wxImage cropped_image;
+               shared_ptr<wxBitmap> bitmap;
+       };
+
+       list<SubtitleView> _subtitles;
 };
 
 BEGIN_EVENT_TABLE (ThumbPanel, wxPanel)
@@ -196,7 +262,7 @@ FilmViewer::set_thumbnail (int n)
                return;
        }
 
-       _thumb_panel->set (_film->thumb_file(n));
+       _thumb_panel->set (n);
 }
 
 void