projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename _texture -> _video_texture.
[dcpomatic.git]
/
src
/
wx
/
audio_plot.h
diff --git
a/src/wx/audio_plot.h
b/src/wx/audio_plot.h
index 989f15edc04546e52f3decbb7e1c2a482d223d6a..9edabf8ec70b5cc605bfd932c07fb2b1e9083db0 100644
(file)
--- a/
src/wx/audio_plot.h
+++ b/
src/wx/audio_plot.h
@@
-24,7
+24,6
@@
DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
DCPOMATIC_ENABLE_WARNINGS
DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
DCPOMATIC_ENABLE_WARNINGS
-#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <vector>
#include <boost/signals2.hpp>
#include <vector>
@@
-34,9
+33,9
@@
class FilmViewer;
class AudioPlot : public wxPanel
{
public:
class AudioPlot : public wxPanel
{
public:
- explicit AudioPlot (wxWindow *,
boost
::weak_ptr<FilmViewer> viewer);
+ explicit AudioPlot (wxWindow *,
std
::weak_ptr<FilmViewer> viewer);
- void set_analysis (
boost
::shared_ptr<AudioAnalysis>);
+ void set_analysis (
std
::shared_ptr<AudioAnalysis>);
void set_channel_visible (int c, bool v);
void set_type_visible (int t, bool v);
void set_smoothing (int);
void set_channel_visible (int c, bool v);
void set_type_visible (int t, bool v);
void set_smoothing (int);
@@
-77,10
+76,9
@@
private:
void left_down ();
void mouse_moved (wxMouseEvent& ev);
void mouse_leave (wxMouseEvent& ev);
void left_down ();
void mouse_moved (wxMouseEvent& ev);
void mouse_leave (wxMouseEvent& ev);
- void search (std::map<int, PointList> const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const;
-
boost
::weak_ptr<FilmViewer> _viewer;
-
boost
::shared_ptr<AudioAnalysis> _analysis;
+
std
::weak_ptr<FilmViewer> _viewer;
+
std
::shared_ptr<AudioAnalysis> _analysis;
bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
bool _type_visible[AudioPoint::COUNT];
int _smoothing;
bool _channel_visible[MAX_DCP_AUDIO_CHANNELS];
bool _type_visible[AudioPoint::COUNT];
int _smoothing;
@@
-88,7
+86,9
@@
private:
wxString _message;
float _gain_correction;
wxString _message;
float _gain_correction;
+ /** peak values keyed by channel */
mutable std::map<int, PointList> _peak;
mutable std::map<int, PointList> _peak;
+ /** RMS values keyed by channel */
mutable std::map<int, PointList> _rms;
boost::optional<Point> _cursor;
mutable std::map<int, PointList> _rms;
boost::optional<Point> _cursor;