Lots of #include <iostream>s for Arch.

[dcpomatic.git] / src / wx / content_menu.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 159239345296dd8bad7cbac4e48509ffbcbb8381..c643602bdca548828e4719145119092d1ded8ccc 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -31,8 +31,11 @@
 #include "lib/job_manager.h"
 #include "lib/exceptions.h"
 #include "lib/dcp_content.h"
+#include "lib/ffmpeg_content.h"
 #include <wx/wx.h>
 #include <wx/dirdlg.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::cout;
 using std::vector;
@@ -87,8 +90,8 @@ ContentMenu::popup (weak_ptr<Film> film, ContentList c, TimelineContentViewList
        _repeat->Enable (!_content.empty ());
 
        int n = 0;
-       for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-               if (dynamic_pointer_cast<FFmpegContent> (*i)) {
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               if (dynamic_pointer_cast<FFmpegContent> (i)) {
                        ++n;
                }
        }
@@ -139,8 +142,8 @@ void
 ContentMenu::join ()
 {
        vector<shared_ptr<Content> > fc;
-       for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-               shared_ptr<FFmpegContent> f = dynamic_pointer_cast<FFmpegContent> (*i);
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               shared_ptr<FFmpegContent> f = dynamic_pointer_cast<FFmpegContent> (i);
                if (f) {
                        fc.push_back (f);
                }
@@ -155,8 +158,8 @@ ContentMenu::join ()
 
        try {
                shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
-               for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) {
-                       film->remove_content (*i);
+               BOOST_FOREACH (shared_ptr<Content> i, _content) {
+                       film->remove_content (i);
                }
                film->add_content (joined);
        } catch (JoinError& e) {
@@ -182,8 +185,8 @@ ContentMenu::remove ()
                /* Special case: we only remove FFmpegContent if its video view is selected;
                   if not, and its audio view is selected, we unmap the audio.
                */
-               for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-                       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (*i);
+               BOOST_FOREACH (shared_ptr<Content> i, _content) {
+                       shared_ptr<FFmpegContent> fc = dynamic_pointer_cast<FFmpegContent> (i);
                        if (!fc) {
                                continue;
                        }
@@ -191,9 +194,9 @@ ContentMenu::remove ()
                        shared_ptr<TimelineVideoContentView> video;
                        shared_ptr<TimelineAudioContentView> audio;
 
-                       for (TimelineContentViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-                               shared_ptr<TimelineVideoContentView> v = dynamic_pointer_cast<TimelineVideoContentView> (*i);
-                               shared_ptr<TimelineAudioContentView> a = dynamic_pointer_cast<TimelineAudioContentView> (*i);
+                       BOOST_FOREACH (shared_ptr<TimelineContentView> j, _views) {
+                               shared_ptr<TimelineVideoContentView> v = dynamic_pointer_cast<TimelineVideoContentView> (j);
+                               shared_ptr<TimelineAudioContentView> a = dynamic_pointer_cast<TimelineAudioContentView> (j);
                                if (v && v->content() == fc) {
                                        video = v;
                                } else if (a && a->content() == fc) {
@@ -282,8 +285,8 @@ ContentMenu::re_examine ()
                return;
        }
 
-       for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-               film->examine_content (*i);
+       BOOST_FOREACH (shared_ptr<Content> i, _content) {
+               film->examine_content (i);
        }
 }