projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace May/Done/NotDone signal sets with one signal and extend
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 0e0fc4315ad7a58ff339d32c8cf4df4590718952..463854992f16347c875e738565d74221501b65e1 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-225,7
+225,7
@@
FilmViewer::set_film (shared_ptr<Film> film)
_player->set_play_referenced ();
_film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
_player->set_play_referenced ();
_film->Changed.connect (boost::bind (&FilmViewer::film_changed, this, _1));
- _player->Change
d.connect (boost::bind (&FilmViewer::player_changed, this, _1, _2
));
+ _player->Change
.connect (boost::bind (&FilmViewer::player_change, this, _1, _2, _3
));
/* Keep about 1 second's worth of history samples */
_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
/* Keep about 1 second's worth of history samples */
_latency_history_count = _film->audio_frame_rate() / _audio_block_size;
@@
-665,9
+665,9
@@
FilmViewer::forward_clicked (wxKeyboardState& ev)
}
void
}
void
-FilmViewer::player_change
d (
int property, bool frequent)
+FilmViewer::player_change
(ChangeType type,
int property, bool frequent)
{
{
- if (frequent) {
+ if (
type != CHANGE_TYPE_DONE ||
frequent) {
return;
}
return;
}
@@
-780,7
+780,7
@@
FilmViewer::set_coalesce_player_changes (bool c)
if (!c) {
BOOST_FOREACH (int i, _pending_player_changes) {
if (!c) {
BOOST_FOREACH (int i, _pending_player_changes) {
- player_change
d (
i, false);
+ player_change
(CHANGE_TYPE_DONE,
i, false);
}
_pending_player_changes.clear ();
}
}
_pending_player_changes.clear ();
}