Remove unnecessary stuff.

diff --git a/src/subtitle_asset.cc b/src/subtitle_asset.cc
index 5238e56a9c250dcf56c4bf5ffd0aa5e9326139fd..8f0c48abb69b254f7106d0102d99196b5d096061 100644 (file)
--- a/src/subtitle_asset.cc
+++ b/src/subtitle_asset.cc
@@ -34,14 +34,14 @@ SubtitleAsset::SubtitleAsset (string directory, string xml)
 
        ignore_node ("LoadFont");
 
-       _font_nodes = sub_nodes<FontNode> ("Font");
+       list<shared_ptr<FontNode> > font_nodes = sub_nodes<FontNode> ("Font");
        list<shared_ptr<LoadFontNode> > load_font_nodes = sub_nodes<LoadFontNode> ("LoadFont");
 
        /* Now make Subtitle objects to represent the raw XML nodes
           in a sane way.
        */
 
-       for (list<shared_ptr<FontNode> >::iterator i = _font_nodes.begin(); i != _font_nodes.end(); ++i) {
+       for (list<shared_ptr<FontNode> >::iterator i = font_nodes.begin(); i != font_nodes.end(); ++i) {
                for (list<shared_ptr<SubtitleNode> >::iterator j = (*i)->subtitle_nodes.begin(); j != (*i)->subtitle_nodes.end(); ++j) {
                        for (list<shared_ptr<TextNode> >::iterator k = (*j)->text_nodes.begin(); k != (*j)->text_nodes.end(); ++k) {
                                _subtitles.push_back (

diff --git a/src/subtitle_asset.h b/src/subtitle_asset.h
index 71ae1401c6924acf5ca6b6a57971f7beec46d372..038ff1fa98b4fcf96316683948901d639a8b81e9 100644 (file)
--- a/src/subtitle_asset.h
+++ b/src/subtitle_asset.h
@@ -127,10 +127,6 @@ public:
 
        std::list<boost::shared_ptr<Subtitle> > subtitles_at (Time t) const;
 
-       std::list<boost::shared_ptr<FontNode> > font_nodes () const {
-               return _font_nodes;
-       }
-
 private:
        std::string font_id_to_name (std::string id, std::list<boost::shared_ptr<LoadFontNode> > const & load_font_nodes) const;
        
@@ -138,7 +134,6 @@ private:
        std::string _movie_title;
        int64_t _reel_number;
        std::string _language;
-       std::list<boost::shared_ptr<FontNode> > _font_nodes;
 
        std::list<boost::shared_ptr<Subtitle> > _subtitles;
 };