Some unnecessary boost:: removal.

7 files changed, 18 insertions, 17 deletions

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 2a8d8cc16..568307462 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -48,7 +48,8 @@ using std::vector;
 using std::list;
 using std::cout;
 using std::make_pair;
-using namespace boost;
+using boost::shared_ptr;
+using boost::optional;
 
 int const Encoder::_history_size = 25;
 
@@ -231,7 +232,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Subtitle> sub)
+Encoder::process_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
 {
 	FrameRateConversion frc (_film->video_frame_rate(), _film->dcp_frame_rate());
 	
@@ -269,7 +270,7 @@ Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
 		/* Queue this new frame for encoding */
 		pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 		TIMING ("adding to queue of %1", _queue.size ());
-		_queue.push_back (boost::shared_ptr<DCPVideoFrame> (
+		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 						  _film->subtitle_offset(), _film->subtitle_scale(),
@@ -360,7 +361,7 @@ Encoder::encoder_thread (ServerDescription* server)
 		}
 
 		TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
-		boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
+		shared_ptr<DCPVideoFrame> vf = _queue.front ();
 		_film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
 		_queue.pop_front ();
 		
diff --git a/src/lib/film.cc b/src/lib/film.cc
index a9d7b7381..976f65313 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1178,7 +1178,7 @@ Film::ffmpeg () const
 vector<FFmpegSubtitleStream>
 Film::ffmpeg_subtitle_streams () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->subtitle_streams ();
 	}
@@ -1189,7 +1189,7 @@ Film::ffmpeg_subtitle_streams () const
 boost::optional<FFmpegSubtitleStream>
 Film::ffmpeg_subtitle_stream () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->subtitle_stream ();
 	}
@@ -1200,7 +1200,7 @@ Film::ffmpeg_subtitle_stream () const
 vector<FFmpegAudioStream>
 Film::ffmpeg_audio_streams () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->audio_streams ();
 	}
@@ -1211,7 +1211,7 @@ Film::ffmpeg_audio_streams () const
 boost::optional<FFmpegAudioStream>
 Film::ffmpeg_audio_stream () const
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		return f->audio_stream ();
 	}
@@ -1222,7 +1222,7 @@ Film::ffmpeg_audio_stream () const
 void
 Film::set_ffmpeg_subtitle_stream (FFmpegSubtitleStream s)
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		f->set_subtitle_stream (s);
 	}
@@ -1231,7 +1231,7 @@ Film::set_ffmpeg_subtitle_stream (FFmpegSubtitleStream s)
 void
 Film::set_ffmpeg_audio_stream (FFmpegAudioStream s)
 {
-	boost::shared_ptr<FFmpegContent> f = ffmpeg ();
+	shared_ptr<FFmpegContent> f = ffmpeg ();
 	if (f) {
 		f->set_audio_stream (s);
 	}
diff --git a/src/lib/matcher.cc b/src/lib/matcher.cc
index 48f6ed912..77ed9b651 100644
--- a/src/lib/matcher.cc
+++ b/src/lib/matcher.cc
@@ -37,7 +37,7 @@ Matcher::Matcher (shared_ptr<Log> log, int sample_rate, float frames_per_second)
 }
 
 void
-Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr<Subtitle> s)
+Matcher::process_video (shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
 {
 	Video (i, same, s);
 	_video_frames++;
@@ -47,7 +47,7 @@ Matcher::process_video (boost::shared_ptr<Image> i, bool same, boost::shared_ptr
 }
 
 void
-Matcher::process_audio (boost::shared_ptr<AudioBuffers> b)
+Matcher::process_audio (shared_ptr<AudioBuffers> b)
 {
 	Audio (b);
 	_audio_frames += b->frames ();
diff --git a/src/lib/video_source.cc b/src/lib/video_source.cc
index 8101a6d36..1c4d6466c 100644
--- a/src/lib/video_source.cc
+++ b/src/lib/video_source.cc
@@ -27,7 +27,7 @@ using boost::bind;
 static void
 process_video_proxy (weak_ptr<VideoSink> sink, shared_ptr<Image> i, bool same, shared_ptr<Subtitle> s)
 {
-	boost::shared_ptr<VideoSink> p = sink.lock ();
+	shared_ptr<VideoSink> p = sink.lock ();
 	if (p) {
 		p->process_video (i, same, s);
 	}
diff --git a/src/wx/audio_dialog.cc b/src/wx/audio_dialog.cc
index 242d37b1e..1241c2e76 100644
--- a/src/wx/audio_dialog.cc
+++ b/src/wx/audio_dialog.cc
@@ -84,7 +84,7 @@ AudioDialog::AudioDialog (wxWindow* parent)
 }
 
 void
-AudioDialog::set_film (boost::shared_ptr<Film> f)
+AudioDialog::set_film (shared_ptr<Film> f)
 {
 	_film_changed_connection.disconnect ();
 	_film_audio_analysis_succeeded_connection.disconnect ();
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index f6d0f77dc..316a42a66 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -290,7 +290,7 @@ FilmViewer::raw_to_display ()
 		old_size = _display_frame->size();
 	}
 
-	boost::shared_ptr<Image> input = _raw_frame;
+	shared_ptr<Image> input = _raw_frame;
 
 	pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
 	if (!s.second.empty ()) {
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index f7d2315cc..a7788ddd0 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -135,7 +135,7 @@ JobManagerView::details_clicked (wxCommandEvent& ev)
 {
 	wxObject* o = ev.GetEventObject ();
 
-	for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+	for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
 		if (i->second.details == o) {
 			string s = i->first->error_summary();
 			s[0] = toupper (s[0]);
@@ -149,7 +149,7 @@ JobManagerView::cancel_clicked (wxCommandEvent& ev)
 {
 	wxObject* o = ev.GetEventObject ();
 
-	for (map<boost::shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
+	for (map<shared_ptr<Job>, JobRecord>::iterator i = _job_records.begin(); i != _job_records.end(); ++i) {
 		if (i->second.cancel == o) {
 			i->first->cancel ();
 		}