Merge branch '1.0' into 1.0-seek

9 files changed, 20 insertions, 17 deletions

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 7436dbf26..746b4f509 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -187,7 +187,7 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
 		return;
 	}
 
-	FILE* o = fopen (out.string().c_str(), "w");
+	FILE* o = fopen_boost (out, "w");
 	if (!o) {
 		log->log ("ffprobe call failed (could not create output file)");
 		return;
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 00dc1ac74..78d73ad00 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -111,7 +111,7 @@ DCPVideoFrame::DCPVideoFrame (shared_ptr<const Image> image, shared_ptr<const cx
 	_conversion = ColourConversion (node->node_child ("ColourConversion"));
 	_frames_per_second = node->number_child<int> ("FramesPerSecond");
 	_j2k_bandwidth = node->number_child<int> ("J2KBandwidth");
-	_resolution = Resolution (node->optional_number_child<int>("J2KBandwidth").get_value_or (RESOLUTION_2K));
+	_resolution = Resolution (node->optional_number_child<int>("Resolution").get_value_or (RESOLUTION_2K));
 }
 
 /** J2K-encode this frame on the local host.
@@ -352,7 +352,7 @@ EncodedData::EncodedData (boost::filesystem::path file)
 	_size = boost::filesystem::file_size (file);
 	_data = new uint8_t[_size];
 
-	FILE* f = fopen (file.string().c_str(), N_("rb"));
+	FILE* f = fopen_boost (file, "rb");
 	if (!f) {
 		throw FileError (_("could not open file for reading"), file);
 	}
@@ -381,7 +381,7 @@ EncodedData::write (shared_ptr<const Film> film, int frame, Eyes eyes) const
 {
 	boost::filesystem::path const tmp_j2c = film->j2c_path (frame, eyes, true);
 
-	FILE* f = fopen (tmp_j2c.string().c_str (), N_("wb"));
+	FILE* f = fopen_boost (tmp_j2c, "wb");
 	
 	if (!f) {
 		throw WriteFileError (tmp_j2c, errno);
diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc
index 9c2065141..dfe336b8f 100644
--- a/src/lib/file_group.cc
+++ b/src/lib/file_group.cc
@@ -21,6 +21,7 @@
 #include <sndfile.h>
 #include "file_group.h"
 #include "exceptions.h"
+#include "cross.h"
 
 using std::vector;
 using std::cout;
@@ -78,7 +79,7 @@ FileGroup::ensure_open_path (size_t p) const
 	}
 
 	_current_path = p;
-	_current_file = fopen (_paths[_current_path].string().c_str(), "rb");
+	_current_file = fopen_boost (_paths[_current_path], "rb");
 	if (_current_file == 0) {
 		throw OpenFileError (_paths[_current_path]);
 	}
diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 779c8dd44..310303c09 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -33,6 +33,7 @@
 #include "config.h"
 #include "log.h"
 #include "film.h"
+#include "cross.h"
 
 #include "i18n.h"
 
@@ -170,7 +171,7 @@ SCPDCPJob::run ()
 		boost::uintmax_t to_do = boost::filesystem::file_size (*i);
 		ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR);
 
-		FILE* f = fopen (boost::filesystem::path (*i).string().c_str(), N_("rb"));
+		FILE* f = fopen_boost (boost::filesystem::path (*i), "rb");
 		if (f == 0) {
 			throw NetworkError (String::compose (_("Could not open %1 to send"), *i));
 		}
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 109447f73..4129b7a82 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -478,7 +478,7 @@ Writer::check_existing_picture_mxf ()
 	boost::filesystem::path p;
 	p /= _film->internal_video_mxf_dir ();
 	p /= _film->internal_video_mxf_filename ();
-	FILE* mxf = fopen (p.string().c_str(), "rb");
+	FILE* mxf = fopen_boost (p, "rb");
 	if (!mxf) {
 		_film->log()->log (String::compose ("Could not open existing MXF at %1 (errno=%2)", p.string(), errno));
 		return;
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 6372503d1..b91c82ab1 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -43,9 +43,8 @@ enum {
 	ID_remove
 };
 
-ContentMenu::ContentMenu (shared_ptr<Film> f, wxWindow* p)
+ContentMenu::ContentMenu (wxWindow* p)
 	: _menu (new wxMenu)
-	, _film (f)
 	, _parent (p)
 {
 	_repeat = _menu->Append (ID_repeat, _("Repeat..."));
@@ -66,8 +65,9 @@ ContentMenu::~ContentMenu ()
 }
 
 void
-ContentMenu::popup (ContentList c, wxPoint p)
+ContentMenu::popup (weak_ptr<Film> f, ContentList c, wxPoint p)
 {
+	_film = f;
 	_content = c;
 	_repeat->Enable (!_content.empty ());
 
diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 9f4bd4cc4..a9f9093c6 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -30,10 +30,10 @@ class Film;
 class ContentMenu
 {
 public:
-	ContentMenu (boost::shared_ptr<Film>, wxWindow *);
+	ContentMenu (wxWindow *);
 	~ContentMenu ();
 
-	void popup (ContentList, wxPoint);
+	void popup (boost::weak_ptr<Film>, ContentList, wxPoint);
 
 private:
 	void repeat ();
@@ -43,6 +43,7 @@ private:
 	void maybe_found_missing (boost::weak_ptr<Job>, boost::weak_ptr<Content>, boost::weak_ptr<Content>);
 	
 	wxMenu* _menu;
+	/** Film that we are working with; set up by popup() */
 	boost::weak_ptr<Film> _film;
 	wxWindow* _parent;
 	ContentList _content;
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 1818fb451..e5cb5371c 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -72,7 +72,7 @@ using boost::lexical_cast;
 /** @param f Film to edit */
 FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	: wxPanel (parent)
-	, _menu (f, this)
+	, _menu (this)
 	, _generally_sensitive (true)
 	, _timeline_dialog (0)
 {
@@ -284,7 +284,7 @@ FilmEditor::make_content_panel ()
 
 		s->Add (b, 0, wxALL, 4);
 
-		_content_sizer->Add (s, 1, wxEXPAND | wxALL, 6);
+		_content_sizer->Add (s, 0, wxEXPAND | wxALL, 6);
 	}
 
 	_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
@@ -966,7 +966,7 @@ FilmEditor::sequence_video_changed ()
 void
 FilmEditor::content_right_click (wxListEvent& ev)
 {
-	_menu.popup (selected_content (), ev.GetPoint ());
+	_menu.popup (_film, selected_content (), ev.GetPoint ());
 }
 
 void
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 9d2aee76c..2119e7813 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -336,7 +336,7 @@ DCPTimeline::DCPTimeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> fil
 	, _left_down (false)
 	, _down_view_position (0)
 	, _first_move (false)
-	, _menu (film, this)
+	, _menu (this)
 	, _snap (true)
 {
 #ifndef __WXOSX__
@@ -574,7 +574,7 @@ DCPTimeline::right_down (wxMouseEvent& ev)
 		cv->set_selected (true);
 	}
 
-	_menu.popup (selected_content (), ev.GetPosition ());
+	_menu.popup (_film, selected_content (), ev.GetPosition ());
 }
 
 void