projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move Film::make_kdms to the call sites.
[dcpomatic.git]
/
src
/
wx
/
playlist_controls.h
diff --git
a/src/wx/playlist_controls.h
b/src/wx/playlist_controls.h
index 4609242172badef0dfc7d7075059c0fe8ad25ba9..4f144834ab342c0cb3ee4c90dfa7ce3197d80dd1 100644
(file)
--- a/
src/wx/playlist_controls.h
+++ b/
src/wx/playlist_controls.h
@@
-37,10
+37,8
@@
public:
*/
boost::signals2::signal<void (boost::weak_ptr<Film>)> ResetFilm;
*/
boost::signals2::signal<void (boost::weak_ptr<Film>)> ResetFilm;
-#ifdef DCPOMATIC_PLAYER_STRESS_TEST
void play ();
void stop ();
void play ();
void stop ();
-#endif
private:
void play_clicked ();
private:
void play_clicked ();
@@
-81,6
+79,4
@@
private:
std::vector<SPL> _playlists;
boost::optional<int> _selected_playlist;
int _selected_playlist_position;
std::vector<SPL> _playlists;
boost::optional<int> _selected_playlist;
int _selected_playlist_position;
-
- wxTimer _timer;
};
};