Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;

allow "deletion" of the audio part of a FFmpeg file from the
timeline; delete unmaps the audio (#316).

1 files changed, 3 insertions, 1 deletions

diff --git a/src/wx/content_menu.h b/src/wx/content_menu.h
index 996091f0c..5f2a7f7b6 100644
--- a/src/wx/content_menu.h
+++ b/src/wx/content_menu.h
@@ -23,6 +23,7 @@
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include "timeline_content_view.h"
 #include "lib/types.h"
 
 class Film;
@@ -33,7 +34,7 @@ public:
 	ContentMenu (wxWindow* p);
 	~ContentMenu ();
 	
-	void popup (boost::weak_ptr<Film>, ContentList, wxPoint);
+	void popup (boost::weak_ptr<Film>, ContentList, TimelineContentViewList, wxPoint);
 
 private:
 	void repeat ();
@@ -49,6 +50,7 @@ private:
 	boost::weak_ptr<Film> _film;
 	wxWindow* _parent;
 	ContentList _content;
+	TimelineContentViewList _views;
 	wxMenuItem* _repeat;
 	wxMenuItem* _join;
 	wxMenuItem* _find_missing;