Merge master.

[dcpomatic.git] / src / wx / film_editor.h

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 49b09146875b8367b39eeafd2f87aa5efb116d36..25749fffaf10ec8d3120ee1f02a442fa31ecde11 100644 (file)
--- 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-2014 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
@@ -22,21 +22,15 @@
  */
 
 #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 wxSpinCtrl;
 class wxNotebook;
-class wxListCtrl;
-class wxListEvent;
 class Film;
-class TimelineDialog;
 class Ratio;
-class Timecode;
-class FilmEditorPanel;
+class ContentPanel;
+class DCPPanel;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -44,105 +38,33 @@ class FilmEditorPanel;
 class FilmEditor : public wxPanel
 {
 public:
-       FilmEditor (boost::shared_ptr<Film>, wxWindow *);
+       FilmEditor (wxWindow *);
 
        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 ();
-       
-private:
-       void make_dcp_panel ();
-       void make_content_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 content_selection_changed (wxListEvent &);
-       void content_add_clicked (wxCommandEvent &);
-       void content_remove_clicked (wxCommandEvent &);
-       void container_changed (wxCommandEvent &);
-       void dcp_content_type_changed (wxCommandEvent &);
-       void scaler_changed (wxCommandEvent &);
-       void j2k_bandwidth_changed (wxCommandEvent &);
-       void frame_rate_changed (wxCommandEvent &);
-       void best_frame_rate_clicked (wxCommandEvent &);
-       void content_timeline_clicked (wxCommandEvent &);
-       void audio_channels_changed (wxCommandEvent &);
-       void resolution_changed (wxCommandEvent &);
-       void sequence_video_changed (wxCommandEvent &);
-       void content_right_click (wxListEvent &);
-       void three_d_changed ();
-
        /* Handle changes to the model */
        void film_changed (Film::Property);
-       void film_content_changed (boost::weak_ptr<Content>, int);
+       void film_content_changed (int);
 
        void set_general_sensitivity (bool);
-       void setup_dcp_name ();
-       void setup_content ();
-       void setup_container ();
-       void setup_content_sensitivity ();
-       
        void active_jobs_changed (bool);
 
-       FilmEditorPanel* _video_panel;
-       FilmEditorPanel* _audio_panel;
-       FilmEditorPanel* _subtitle_panel;
-       FilmEditorPanel* _timing_panel;
-       std::list<FilmEditorPanel *> _panels;
-
        wxNotebook* _main_notebook;
-       wxNotebook* _content_notebook;
-       wxPanel* _dcp_panel;
-       wxSizer* _dcp_sizer;
-       wxPanel* _content_panel;
-       wxSizer* _content_sizer;
+       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* _scaler;
-       wxSpinCtrl* _j2k_bandwidth;
-       wxChoice* _dcp_content_type;
-       wxChoice* _frame_rate;
-       wxSpinCtrl* _audio_channels;
-       wxButton* _best_frame_rate;
-       wxCheckBox* _three_d;
-       wxChoice* _resolution;
-
-       ContentMenu _menu;
-
-       std::vector<Ratio const *> _ratios;
-
-       bool _generally_sensitive;
-       TimelineDialog* _timeline_dialog;
 };