projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index dadb583ae07b028f1c8324b1a0f30db6513c426e..96cae3900d66d1b9aea29a4043e285f28dc81f2a 100644
(file)
--- a/
src/wx/film_editor.h
+++ b/
src/wx/film_editor.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
4
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
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
@@
-33,9
+33,9
@@
class wxNotebook;
class wxListCtrl;
class wxListEvent;
class Film;
class wxListCtrl;
class wxListEvent;
class Film;
-class
DCP
TimelineDialog;
+class TimelineDialog;
class Ratio;
class Ratio;
-class
DCP
Timecode;
+class Timecode;
class FilmEditorPanel;
class SubtitleContent;
class FilmEditorPanel;
class SubtitleContent;
@@
-75,8
+75,8
@@
private:
/* Handle changes to the view */
void name_changed ();
/* Handle changes to the view */
void name_changed ();
- void use_
dci
_name_toggled ();
- void edit_
dci
_button_clicked ();
+ void use_
isdcf
_name_toggled ();
+ void edit_
isdcf
_button_clicked ();
void content_selection_changed ();
void content_add_file_clicked ();
void content_add_folder_clicked ();
void content_selection_changed ();
void content_add_file_clicked ();
void content_add_folder_clicked ();
@@
-87,7
+87,8
@@
private:
void dcp_content_type_changed ();
void scaler_changed ();
void j2k_bandwidth_changed ();
void dcp_content_type_changed ();
void scaler_changed ();
void j2k_bandwidth_changed ();
- void frame_rate_changed ();
+ void frame_rate_choice_changed ();
+ void frame_rate_spin_changed ();
void best_frame_rate_clicked ();
void content_timeline_clicked ();
void audio_channels_changed ();
void best_frame_rate_clicked ();
void content_timeline_clicked ();
void audio_channels_changed ();
@@
-108,8
+109,10
@@
private:
void setup_content ();
void setup_container ();
void setup_content_sensitivity ();
void setup_content ();
void setup_container ();
void setup_content_sensitivity ();
+ void setup_frame_rate_widget ();
void active_jobs_changed (bool);
void active_jobs_changed (bool);
+ void config_changed ();
FilmEditorPanel* _video_panel;
FilmEditorPanel* _audio_panel;
FilmEditorPanel* _video_panel;
FilmEditorPanel* _audio_panel;
@@
-128,7
+131,7
@@
private:
boost::shared_ptr<Film> _film;
wxTextCtrl* _name;
wxStaticText* _dcp_name;
boost::shared_ptr<Film> _film;
wxTextCtrl* _name;
wxStaticText* _dcp_name;
- wxCheckBox* _use_
dci
_name;
+ wxCheckBox* _use_
isdcf
_name;
wxChoice* _container;
wxListCtrl* _content;
wxButton* _content_add_file;
wxChoice* _container;
wxListCtrl* _content;
wxButton* _content_add_file;
@@
-138,11
+141,13
@@
private:
wxButton* _content_later;
wxButton* _content_timeline;
wxCheckBox* _sequence_video;
wxButton* _content_later;
wxButton* _content_timeline;
wxCheckBox* _sequence_video;
- wxButton* _edit_
dci
_button;
+ wxButton* _edit_
isdcf
_button;
wxChoice* _scaler;
wxSpinCtrl* _j2k_bandwidth;
wxChoice* _dcp_content_type;
wxChoice* _scaler;
wxSpinCtrl* _j2k_bandwidth;
wxChoice* _dcp_content_type;
- wxChoice* _frame_rate;
+ wxChoice* _frame_rate_choice;
+ wxSpinCtrl* _frame_rate_spin;
+ wxSizer* _frame_rate_sizer;
wxSpinCtrl* _audio_channels;
wxButton* _best_frame_rate;
wxCheckBox* _three_d;
wxSpinCtrl* _audio_channels;
wxButton* _best_frame_rate;
wxCheckBox* _three_d;
@@
-156,5
+161,5
@@
private:
std::vector<Ratio const *> _ratios;
bool _generally_sensitive;
std::vector<Ratio const *> _ratios;
bool _generally_sensitive;
-
DCP
TimelineDialog* _timeline_dialog;
+ TimelineDialog* _timeline_dialog;
};
};