projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make show audio work on the whole DCP, not individual content.
[dcpomatic.git]
/
src
/
wx
/
audio_panel.h
diff --git
a/src/wx/audio_panel.h
b/src/wx/audio_panel.h
index 8cb94f0fa6efdf6ad8ba4f7797946962abf2b98c..edd3dfcd49d1ed9666680fc1ec85010f06015ed5 100644
(file)
--- a/
src/wx/audio_panel.h
+++ b/
src/wx/audio_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
3
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
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
@@
-18,39
+18,34
@@
*/
#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 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_content_changed (int);
void content_selection_changed ();
private:
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
private:
- void gain_changed ();
void gain_calculate_button_clicked ();
void gain_calculate_button_clicked ();
- void show_clicked ();
- void delay_changed ();
- void stream_changed ();
void mapping_changed (AudioMapping);
void mapping_changed (AudioMapping);
- void setup_
stream_
description ();
+ void setup_description ();
-
wxSpinCtrl
* _gain;
+
ContentSpinCtrlDouble<AudioContent>
* _gain;
wxButton* _gain_calculate_button;
wxButton* _gain_calculate_button;
- wxButton* _show;
- wxSpinCtrl* _delay;
- wxChoice* _stream;
- wxStaticText* _description;
+ ContentSpinCtrl<AudioContent>* _delay;
AudioMappingView* _mapping;
AudioMappingView* _mapping;
- AudioDialog* _audio_dialog;
+ wxStaticText* _description;
+
+ boost::signals2::scoped_connection _mapping_connection;
};
};