projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove old symlink.
[dcpomatic.git]
/
src
/
wx
/
video_waveform_plot.h
diff --git
a/src/wx/video_waveform_plot.h
b/src/wx/video_waveform_plot.h
index 440be32e23ee6070b2680f77a29635652164797f..7e9dbf70999691da6ca2ee793a2bae1c8814d3cc 100644
(file)
--- a/
src/wx/video_waveform_plot.h
+++ b/
src/wx/video_waveform_plot.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-28,23
+29,33
@@
namespace dcp {
class PlayerVideo;
class Image;
class PlayerVideo;
class Image;
+class Film;
class FilmViewer;
class VideoWaveformPlot : public wxPanel
{
public:
class FilmViewer;
class VideoWaveformPlot : public wxPanel
{
public:
- VideoWaveformPlot (wxWindow* parent, FilmViewer* viewer);
+ VideoWaveformPlot (wxWindow* parent,
boost::weak_ptr<const Film> film,
FilmViewer* viewer);
void set_enabled (bool e);
void set_component (int c);
void set_contrast (int b);
void set_enabled (bool e);
void set_component (int c);
void set_contrast (int b);
+ /** Emitted when the mouse is moved over the waveform. The parameters
+ are:
+ - (int, int): image x range
+ - (int, int): component value range
+ */
+ boost::signals2::signal<void (int, int, int, int)> MouseMoved;
+
private:
void paint ();
void sized (wxSizeEvent &);
void create_waveform ();
void set_image (boost::weak_ptr<PlayerVideo>);
private:
void paint ();
void sized (wxSizeEvent &);
void create_waveform ();
void set_image (boost::weak_ptr<PlayerVideo>);
+ void mouse_moved (wxMouseEvent &);
+ boost::weak_ptr<const Film> _film;
boost::shared_ptr<dcp::OpenJPEGImage> _image;
boost::shared_ptr<const Image> _waveform;
bool _dirty;
boost::shared_ptr<dcp::OpenJPEGImage> _image;
boost::shared_ptr<const Image> _waveform;
bool _dirty;
@@
-53,6
+64,8
@@
private:
int _contrast;
static int const _vertical_margin;
int _contrast;
static int const _vertical_margin;
+ static int const _pixel_values;
+ static int const _x_axis_width;
boost::signals2::connection _viewer_connection;
};
boost::signals2::connection _viewer_connection;
};