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
/
audio_panel.h
diff --git
a/src/wx/audio_panel.h
b/src/wx/audio_panel.h
index e1dc283e2852debd1d021baa2900567b7b7112fa..b0218575a7f0f12ca6c5a6b59f3107626e79dbe7 100644
(file)
--- a/
src/wx/audio_panel.h
+++ b/
src/wx/audio_panel.h
@@
-18,38
+18,42
@@
*/
#include "lib/audio_mapping.h"
*/
#include "lib/audio_mapping.h"
-#include "film_editor_panel.h"
+#include "content_sub_panel.h"
+#include "content_widget.h"
-class wxSpinCtrl;
+class wxSpinCtrl
Double
;
class wxButton;
class wxChoice;
class wxStaticText;
class AudioMappingView;
class AudioDialog;
class wxButton;
class wxChoice;
class wxStaticText;
class AudioMappingView;
class AudioDialog;
-class AudioPanel : public
FilmEditor
Panel
+class AudioPanel : public
ContentSub
Panel
{
public:
{
public:
- AudioPanel (
FilmEditor
*);
+ AudioPanel (
ContentPanel
*);
void film_changed (Film::Property);
void film_changed (Film::Property);
- void film_content_changed (boost::shared_ptr<Content>, int);
+ void film_content_changed (int);
+ void content_selection_changed ();
private:
private:
- void gain_changed ();
void gain_calculate_button_clicked ();
void show_clicked ();
void gain_calculate_button_clicked ();
void show_clicked ();
- void delay_changed ();
void stream_changed ();
void mapping_changed (AudioMapping);
void stream_changed ();
void mapping_changed (AudioMapping);
- void setup_stream_description ();
+ void processor_changed ();
+ void setup_processors ();
+ void setup_description ();
-
wxSpinCtrl
* _gain;
+
ContentSpinCtrlDouble<AudioContent>
* _gain;
wxButton* _gain_calculate_button;
wxButton* _show;
wxButton* _gain_calculate_button;
wxButton* _show;
-
wxSpinCtrl
* _delay;
+
ContentSpinCtrl<AudioContent>
* _delay;
wxChoice* _stream;
wxChoice* _stream;
- wxStaticText* _description;
+ wxChoice* _processor;
+ wxStaticText* _stream_description;
AudioMappingView* _mapping;
AudioMappingView* _mapping;
+ wxStaticText* _description;
AudioDialog* _audio_dialog;
};
AudioDialog* _audio_dialog;
};