X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=e19fcabdf81cd45db2fe0fd0ac8551a08b7c33d5;hb=3a7c4ef4f35960702522642c496b561be138d322;hp=ff9198be42a60fc910110ea88b52ca054596097b;hpb=eceeb0c13cdaf08204968047269b49d8d493f741;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index ff9198be4..e19fcabdf 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,29 +16,20 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
- 
-/** @file src/film_editor.h
- *  @brief A wx widget to edit a film's metadata, and perform various functions.
+
+/** @file src/wx/film_editor.h
+ *  @brief FilmEditor class.
  */
 
+#include "lib/film.h"
 #include <wx/wx.h>
-#include <wx/spinctrl.h>
-#include <wx/filepicker.h>
-#include <wx/collpane.h>
 #include <boost/signals2.hpp>
-#include "lib/film.h"
-#include "content_menu.h"
 
 class wxNotebook;
-class wxListCtrl;
-class wxListEvent;
 class Film;
-class TimelineDialog;
-class Ratio;
-class Timecode;
-class TimingPanel;
-class SubtitlePanel;
-class AudioPanel;
+class ContentPanel;
+class DCPPanel;
+class FilmViewer;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -46,126 +37,33 @@ class AudioPanel;
 class FilmEditor : public wxPanel
 {
 public:
-	FilmEditor (boost::shared_ptr<Film>, wxWindow *);
+	FilmEditor (wxWindow *, FilmViewer* viewer);
 
 	void set_film (boost::shared_ptr<Film>);
-	void set_selection (boost::weak_ptr<Content>);
 
-	boost::signals2::signal<void (std::string)> FileChanged;
+	boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
 
 	/* Stuff for panels */
-	
-	wxNotebook* content_notebook () const {
-		return _content_notebook;
+
+	ContentPanel* content_panel () const {
+		return _content_panel;
 	}
 
 	boost::shared_ptr<Film> film () const {
 		return _film;
 	}
 
-	boost::shared_ptr<Content> selected_content ();
-	boost::shared_ptr<VideoContent> selected_video_content ();
-	boost::shared_ptr<AudioContent> selected_audio_content ();
-	boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
-	
-	bool generally_sensitive () const {
-		return _generally_sensitive;
-	}
-
-private:
-	void make_dcp_panel ();
-	void make_content_panel ();
-	void make_video_panel ();
-	void connect_to_widgets ();
-	
-	/* Handle changes to the view */
-	void name_changed (wxCommandEvent &);
-	void use_dci_name_toggled (wxCommandEvent &);
-	void edit_dci_button_clicked (wxCommandEvent &);
-	void left_crop_changed (wxCommandEvent &);
-	void right_crop_changed (wxCommandEvent &);
-	void top_crop_changed (wxCommandEvent &);
-	void bottom_crop_changed (wxCommandEvent &);
-	void trust_content_headers_changed (wxCommandEvent &);
-	void content_selection_changed (wxListEvent &);
-	void content_add_clicked (wxCommandEvent &);
-	void content_remove_clicked (wxCommandEvent &);
-	void imagemagick_video_length_changed (wxCommandEvent &);
-	void container_changed (wxCommandEvent &);
-	void dcp_content_type_changed (wxCommandEvent &);
-	void scaler_changed (wxCommandEvent &);
-	void j2k_bandwidth_changed (wxCommandEvent &);
-	void dcp_frame_rate_changed (wxCommandEvent &);
-	void best_dcp_frame_rate_clicked (wxCommandEvent &);
-	void edit_filters_clicked (wxCommandEvent &);
-	void content_timeline_clicked (wxCommandEvent &);
-	void ratio_changed (wxCommandEvent &);
-	void dcp_audio_channels_changed (wxCommandEvent &);
-	void dcp_resolution_changed (wxCommandEvent &);
-	void sequence_video_changed (wxCommandEvent &);
-	void content_right_click (wxListEvent &);
-
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
-	void film_content_changed (boost::weak_ptr<Content>, int);
-
-	void set_things_sensitive (bool);
-	void setup_ratios ();
-	void setup_dcp_name ();
-	void setup_scaling_description ();
-	void setup_content ();
-	void setup_container ();
-	void setup_content_sensitivity ();
-	
-	void active_jobs_changed (bool);
-
-	AudioPanel* _audio_panel;
-	SubtitlePanel* _subtitle_panel;
-	TimingPanel* _timing_panel;
+	void film_content_changed (int);
+
+	void set_general_sensitivity (bool);
+	void active_jobs_changed (boost::optional<std::string>);
 
 	wxNotebook* _main_notebook;
-	wxNotebook* _content_notebook;
-	wxPanel* _dcp_panel;
-	wxSizer* _dcp_sizer;
-	wxPanel* _content_panel;
-	wxSizer* _content_sizer;
-	wxPanel* _video_panel;
+	ContentPanel* _content_panel;
+	DCPPanel* _dcp_panel;
 
 	/** The film we are editing */
 	boost::shared_ptr<Film> _film;
-	wxTextCtrl* _name;
-	wxStaticText* _dcp_name;
-	wxCheckBox* _use_dci_name;
-	wxChoice* _container;
-	wxListCtrl* _content;
-	wxButton* _content_add;
-	wxButton* _content_remove;
-	wxButton* _content_earlier;
-	wxButton* _content_later;
-	wxButton* _content_timeline;
-	wxCheckBox* _sequence_video;
-	wxButton* _edit_dci_button;
-	wxChoice* _ratio;
-	wxStaticText* _ratio_description;
-	wxStaticText* _scaling_description;
-	wxSpinCtrl* _left_crop;
-	wxSpinCtrl* _right_crop;
-	wxSpinCtrl* _top_crop;
-	wxSpinCtrl* _bottom_crop;
-	wxStaticText* _filters;
-	wxButton* _filters_button;
-	wxChoice* _scaler;
- 	wxSpinCtrl* _j2k_bandwidth;
-	wxChoice* _dcp_content_type;
-	wxChoice* _dcp_frame_rate;
-	wxSpinCtrl* _dcp_audio_channels;
-	wxButton* _best_dcp_frame_rate;
-	wxChoice* _dcp_resolution;
-
-	ContentMenu _menu;
-
-	std::vector<Ratio const *> _ratios;
-
-	bool _generally_sensitive;
-	TimelineDialog* _timeline_dialog;
 };