projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FFmpegContent does not need audio_length().
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index 1f64d51c63bd8bf86332f9574b32efb54e0c60af..0f5e28ac491f8317ed30c39a0418c17f3de0ec95 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-33,7
+33,7
@@
class FilmEditor;
class ContentSubPanel;
class Film;
class ContentSubPanel;
class Film;
-class ContentPanel
+class ContentPanel
: public boost::noncopyable
{
public:
ContentPanel (wxNotebook *, boost::shared_ptr<Film>);
{
public:
ContentPanel (wxNotebook *, boost::shared_ptr<Film>);
@@
-63,10
+63,10
@@
public:
SubtitleContentList selected_subtitle ();
FFmpegContentList selected_ffmpeg ();
SubtitleContentList selected_subtitle ();
FFmpegContentList selected_ffmpeg ();
+ void add_file_clicked ();
+
private:
private:
- void sequence_video_changed ();
void selection_changed ();
void selection_changed ();
- void add_file_clicked ();
void add_folder_clicked ();
void remove_clicked ();
void earlier_clicked ();
void add_folder_clicked ();
void remove_clicked ();
void earlier_clicked ();
@@
-78,6
+78,8
@@
private:
void setup ();
void setup_sensitivity ();
void setup ();
void setup_sensitivity ();
+ void add_files (std::list<boost::filesystem::path>);
+
wxPanel* _panel;
wxSizer* _sizer;
wxNotebook* _notebook;
wxPanel* _panel;
wxSizer* _sizer;
wxNotebook* _notebook;
@@
-88,7
+90,6
@@
private:
wxButton* _earlier;
wxButton* _later;
wxButton* _timeline;
wxButton* _earlier;
wxButton* _later;
wxButton* _timeline;
- wxCheckBox* _sequence_video;
ContentSubPanel* _video_panel;
ContentSubPanel* _audio_panel;
ContentSubPanel* _subtitle_panel;
ContentSubPanel* _video_panel;
ContentSubPanel* _audio_panel;
ContentSubPanel* _subtitle_panel;